wibu/mobile-darmasaba
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upd: fitur baru project

Browse Source 
Deskripsi:
- tampilan list detail tugas project
- tampilan tambah detail tugas project
- tampilan edit detail tugas project
- tampilan form tambah data project > detail tugas
- integrasi api get list detail tugas project
- integrasi api tambah detail tugas project
- integrasi api edit detail tugas project
- integrasi api tambah data project > detail tugas

No Issues
This commit is contained in:
amaliadwiy
2025-08-20 15:17:10 +08:00
parent b0e959e3e1
commit 72fa18565d
11 changed files with 360 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/(application)/project/[id]/add-task.tsx
View File

@@ -1,16 +1,19 @@
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
import Text from "@/components/Text";
import Styles from "@/constants/Styles";
import { apiCreateProjectTask } from "@/lib/api";
import { formatDateOnly } from "@/lib/fun_formatDateOnly";
import { getDatesInRange } from "@/lib/fun_getDatesInRange";
import { setUpdateProject } from "@/lib/projectUpdate";
import { useAuthSession } from "@/providers/AuthProvider";
import { useHeaderHeight } from '@react-navigation/elements';
import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import moment from "moment";
import { useEffect, useState } from "react";
import {
KeyboardAvoidingView,
@@ -31,6 +34,8 @@ export default function ProjectAddTask() {
const { token, decryptToken } = useAuthSession()
const dispatch = useDispatch()
const update = useSelector((state: any) => state.projectUpdate)
const [dataDetail, setDataDetail] = useState<any>([])
const [modalDetail, setModalDetail] = useState(false)
const { id } = useLocalSearchParams<{ id: string }>();
const [disable, setDisable] = useState(true);
const [range, setRange] = useState<{
@@ -44,11 +49,10 @@ export default function ProjectAddTask() {
})
const [title, setTitle] = useState('');
const [loading, setLoading] = useState(false)
const [dsbButton, setDsbButton] = useState(true)
const from = range.startDate
? dayjs(range.startDate).format("DD-MM-YYYY")
: "";
const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
const from = formatDateOnly(range.startDate);
const to = formatDateOnly(range.endDate);
function checkAll() {
if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -69,15 +73,50 @@ export default function ProjectAddTask() {
}
}
function checkButton() {
if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
setDsbButton(true)
setDataDetail([])
} else {
setDsbButton(false)
const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
const datanya = getDatesInRange(awal, akhir)
setDataDetail(datanya.map((item: any) => ({
date: item,
timeStart: null,
timeEnd: null,
})))
}
}
useEffect(() => {
checkAll()
}, [from, to, title, error])
useEffect(() => {
checkButton()
}, [range])
async function handleCreate() {
try {
setLoading(true)
const dataDetailFix = dataDetail.map((item: any) => ({
date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
timeStart: item.timeStart,
timeEnd: item.timeEnd,
}))
const hasil = await decryptToken(String(token?.current));
const response = await apiCreateProjectTask({ data: { name: title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id });
const response = await apiCreateProjectTask({
data: {
name: title,
dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
user: hasil,
dataDetail: dataDetailFix
}, id
});
if (response.success) {
dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
Toast.show({ type: 'small', text1: 'Berhasil menambah data', })
@@ -126,7 +165,7 @@ export default function ProjectAddTask() {
mode="range"
startDate={range.startDate}
endDate={range.endDate}
onChange={(param) => setRange(param)}
onChange={(param) => { setRange(param) }}
styles={{
selected: Styles.selectedDate,
selected_label: Styles.cWhite,
@@ -163,9 +202,12 @@ export default function ProjectAddTask() {
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
{/* TODO */}
<Pressable style={[Styles.btnTab, Styles.btnLainnya]}>
<Text style={[Styles.cWhite]}>Detail</Text>
<Pressable
style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
disabled={dsbButton}
onPress={() => { setModalDetail(true) }}
>
<Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
</Pressable>
</View>
<InputForm
@@ -184,6 +226,14 @@ export default function ProjectAddTask() {
</View>
</ScrollView>
</KeyboardAvoidingView>
<ModalAddDetailTugasProject
isVisible={modalDetail}
setVisible={setModalDetail}
dataTanggal={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
}}
/>
</SafeAreaView>
);
}

6
app/(application)/project/create.tsx
View File

@@ -251,18 +251,12 @@ export default function CreateProject() {
onPress={() => {
if (entityUser.role == "supadmin" || entityUser.role == "developer") {
if (chooseGroup.val != "") {
// setSelect(true);
// setValSelect("member");
router.push(`/project/create/member`);
} else {
Toast.show({ type: 'small', text1: "Pilih Lembaga Desa terlebih dahulu", })
}
} else {
router.push(`/project/create/member`);
// validationForm('group', userLogin.idGroup, userLogin.group);
// setValChoose(userLogin.idGroup)
// setSelect(true);
// setValSelect("member");
}
}}
error={error.member}

61
app/(application)/project/create/task.tsx
View File

@@ -1,18 +1,22 @@
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
import Text from "@/components/Text";
import Styles from "@/constants/Styles";
import { formatDateOnly } from "@/lib/fun_formatDateOnly";
import { getDatesInRange } from "@/lib/fun_getDatesInRange";
import { setTaskCreate } from "@/lib/taskCreate";
import { useHeaderHeight } from '@react-navigation/elements';
import dayjs from "dayjs";
import { router, Stack } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import moment from "moment";
import { useEffect, useState } from "react";
import {
KeyboardAvoidingView,
Platform,
Pressable,
SafeAreaView,
ScrollView,
View
@@ -37,11 +41,12 @@ export default function CreateProjectAddTask() {
})
const [title, setTitle] = useState('');
const taskCreate = useSelector((state: any) => state.taskCreate)
const [dsbButton, setDsbButton] = useState(true)
const [dataDetail, setDataDetail] = useState<any>([])
const [modalDetail, setModalDetail] = useState(false)
const from = range.startDate
? dayjs(range.startDate).format("DD-MM-YYYY")
: "";
const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : "";
const from = formatDateOnly(range.startDate, "DD-MM-YYYY");
const to = formatDateOnly(range.endDate, "DD-MM-YYYY");
function checkAll() {
if (from == "" || to == "" || title == "" || title == "null" || error.startDate || error.endDate || error.title) {
@@ -62,18 +67,45 @@ export default function CreateProjectAddTask() {
}
}
function checkButton() {
if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
setDsbButton(true)
setDataDetail([])
} else {
setDsbButton(false)
const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
const datanya = getDatesInRange(awal, akhir)
setDataDetail(datanya.map((item: any) => ({
date: item,
timeStart: null,
timeEnd: null,
})))
}
}
useEffect(() => {
checkAll()
}, [from, to, title, error])
useEffect(() => {
checkButton()
}, [range])
async function handleCreate() {
try {
const dataDetailFix = dataDetail.map((item: any) => ({
date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
timeStart: item.timeStart,
timeEnd: item.timeEnd,
}))
dispatch(setTaskCreate([...taskCreate, {
title: title,
dateStart: from,
dateEnd: to,
dateStartFix: dayjs(range.startDate).format("YYYY-MM-DD"),
dateEndFix: dayjs(range.endDate).format("YYYY-MM-DD"),
dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"),
dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"),
dataDetail: dataDetailFix
}]))
router.back();
} catch (error) {
@@ -151,6 +183,13 @@ export default function CreateProjectAddTask() {
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
<Pressable
style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
disabled={dsbButton}
onPress={() => { setModalDetail(true) }}
>
<Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
</Pressable>
</View>
<InputForm
label="Judul Tugas"
@@ -168,6 +207,14 @@ export default function CreateProjectAddTask() {
</View>
</ScrollView>
</KeyboardAvoidingView>
<ModalAddDetailTugasProject
isVisible={modalDetail}
setVisible={setModalDetail}
dataTanggal={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
}}
/>
</SafeAreaView>
);
}

87
app/(application)/project/update/[detail].tsx
View File

@@ -1,18 +1,21 @@
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import ModalAddDetailTugasProject from "@/components/project/modalAddDetailTugasProject";
import Text from "@/components/Text";
import Styles from "@/constants/Styles";
import { apiEditProjectTask, apiGetProjectTask } from "@/lib/api";
import { formatDateOnly } from "@/lib/fun_formatDateOnly";
import { getDatesInRange } from "@/lib/fun_getDatesInRange";
import { setUpdateProject } from "@/lib/projectUpdate";
import { useAuthSession } from "@/providers/AuthProvider";
import { useHeaderHeight } from '@react-navigation/elements';
import dayjs from "dayjs";
import { router, Stack, useLocalSearchParams } from "expo-router";
import 'intl';
import 'intl/locale-data/jsonp/id';
import moment from "moment";
import { useEffect, useState } from "react";
import { KeyboardAvoidingView, Platform, SafeAreaView, ScrollView, View } from "react-native";
import { KeyboardAvoidingView, Platform, Pressable, SafeAreaView, ScrollView, View } from "react-native";
import Toast from "react-native-toast-message";
import DateTimePicker, { DateType } from "react-native-ui-datepicker";
import { useDispatch, useSelector } from "react-redux";
@@ -29,6 +32,9 @@ export default function UpdateProjectTask() {
const [loading, setLoading] = useState(true)
const [disableBtn, setDisableBtn] = useState(false)
const [loadingSubmit, setLoadingSubmit] = useState(false)
const [dataDetail, setDataDetail] = useState<any>([])
const [modalDetail, setModalDetail] = useState(false)
const [dsbButton, setDsbButton] = useState(true)
const [title, setTitle] = useState('')
const [error, setError] = useState({
@@ -37,10 +43,8 @@ export default function UpdateProjectTask() {
title: false,
})
const from = range.startDate
? dayjs(range.startDate).format("DD-MM-YYYY")
: '';
const to = range.endDate ? dayjs(range.endDate).format("DD-MM-YYYY") : '';
const from = formatDateOnly(range.startDate);
const to = formatDateOnly(range.endDate);
async function handleLoad() {
try {
@@ -57,6 +61,23 @@ export default function UpdateProjectTask() {
})
setMonth(new Date(response.data.dateStart).getMonth())
setYear(new Date(response.data.dateStart).getFullYear())
const response2 = await apiGetProjectTask({
user: hasil,
id: detail,
cat: "detailTask"
});
if (response2.data.length == 0) {
const datanya = getDatesInRange(response.data.dateStart, response.data.dateEnd)
setDataDetail(datanya.map((item: any) => ({
date: item,
timeStart: null,
timeEnd: null,
})))
} else {
setDataDetail(response2.data)
}
} catch (error) {
console.error(error);
} finally {
@@ -71,8 +92,22 @@ export default function UpdateProjectTask() {
async function handleEdit() {
try {
setLoadingSubmit(true)
const dataDetailFix = dataDetail.map((item: any) => ({
date: moment(item.date, "DD-MM-YYYY").format("YYYY-MM-DD"),
timeStart: item.timeStart,
timeEnd: item.timeEnd,
}))
const hasil = await decryptToken(String(token?.current));
const response = await apiEditProjectTask({ data: { title, dateStart: dayjs(range.startDate).format("YYYY-MM-DD"), dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"), user: hasil }, id: detail });
const response = await apiEditProjectTask({
data: {
title,
dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
user: hasil,
dataDetail: dataDetailFix
},
id: detail
});
if (response.success) {
dispatch(setUpdateProject({ ...update, task: !update.task, progress: !update.progress }))
Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
@@ -107,10 +142,32 @@ export default function UpdateProjectTask() {
}
}
function checkButton() {
if (range.startDate == null || range.endDate == null || range.startDate == undefined || range.endDate == undefined) {
setDsbButton(true)
setDataDetail([])
} else {
setDsbButton(false)
const awal = formatDateOnly(range.startDate, "YYYY-MM-DD")
const akhir = formatDateOnly(range.endDate, "YYYY-MM-DD")
const datanya = getDatesInRange(awal, akhir)
setDataDetail(datanya.map((item: any) => ({
date: item,
timeStart: null,
timeEnd: null,
})))
}
}
useEffect(() => {
checkAll()
}, [from, to, title, error])
useEffect(() => {
checkButton()
}, [range])
return (
<SafeAreaView>
<Stack.Screen
@@ -176,6 +233,13 @@ export default function UpdateProjectTask() {
{
(error.endDate || error.startDate) && <Text style={[Styles.textInformation, Styles.cError, Styles.mt05]}>Tanggal tidak boleh kosong</Text>
}
<Pressable
style={[Styles.btnTab, Styles.btnLainnya, dsbButton && Styles.btnDisabled]}
disabled={dsbButton}
onPress={() => { setModalDetail(true) }}
>
<Text style={[dsbButton ? Styles.cGray : Styles.cWhite]}>Detail</Text>
</Pressable>
</View>
<InputForm
label="Judul Tugas"
@@ -193,6 +257,15 @@ export default function UpdateProjectTask() {
</View>
</ScrollView>
</KeyboardAvoidingView>
<ModalAddDetailTugasProject
isVisible={modalDetail}
setVisible={setModalDetail}
dataTanggal={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
}}
/>
</SafeAreaView>
)
}

4
components/modalFloat.tsx
View File

@@ -33,10 +33,10 @@ export default function ModalFloat({ isVisible, setVisible, title, children, onS
!buttonHide && (
<View style={[Styles.rowItemsCenter, { justifyContent: 'flex-end' }]}>
<Pressable style={[Styles.ph15, Styles.pv05, Styles.round10, Styles.mr10]} onPress={() => { setVisible(false) }}>
<Text style={[Styles.textDefault]}>Batal</Text>
<Text style={[Styles.textDefaultSemiBold]}>Batal</Text>
</Pressable>
<Pressable style={[Styles.ph15, Styles.pv05, Styles.round10]} onPress={onSubmit} disabled={disableSubmit}>
<Text style={[Styles.textDefault, disableSubmit && Styles.cGray]}>Simpan</Text>
<Text style={[Styles.textDefaultSemiBold, disableSubmit && Styles.cGray]}>Simpan</Text>
</Pressable>
</View>
)

135
components/project/modalAddDetailTugasProject.tsx Normal file
View File

@@ -0,0 +1,135 @@
import Styles from "@/constants/Styles";
import { stringToDateTime } from "@/lib/fun_stringToDate";
import { useEffect, useState } from "react";
import { Dimensions, View, VirtualizedList } from "react-native";
import { InputDate } from "../inputDate";
import ModalFloat from "../modalFloat";
import Text from "../Text";
interface Props {
date: string;
timeStart: string;
timeEnd: string;
}
export default function ModalAddDetailTugasProject({ isVisible, setVisible, dataTanggal, onSubmit }: { isVisible: boolean, setVisible: (value: boolean) => void, dataTanggal: Props[], onSubmit: (data: Props[]) => void }) {
const [data, setData] = useState<Props[]>(dataTanggal)
const tinggiScreen = Dimensions.get("window").height;
const tinggiFix = tinggiScreen * 70 / 100;
const [error, setError] = useState<any>([])
useEffect(() => {
if (isVisible) {
setData(dataTanggal)
setError([])
}
}, [isVisible, dataTanggal])
const getItem = (_data: unknown, index: number): Props => ({
date: data[index].date,
timeStart: data[index].timeStart,
timeEnd: data[index].timeEnd,
})
function settingError(date: string, cat: 'timeStart' | 'timeEnd', val: boolean) {
const ada = error.find((item: any) => item.date == date)
if (ada) {
setError(error.map((item: any) => {
if (item.date == date) {
return { ...item, [cat]: val }
}
return item
}))
} else {
setError([...error, { date, [cat]: val }])
}
}
function validationForm(cat: "timeStart" | "timeEnd", val: string, date: string) {
if (cat == "timeEnd") {
const start = stringToDateTime("", String(data.find((item) => item.date == date)?.timeStart))
const end = stringToDateTime("", val)
const timestampAwal = start.getTime()
const timestampAkhir = end.getTime()
if (val == "" || val == null || timestampAwal > timestampAkhir) {
settingError(date, "timeEnd", true)
} else {
settingError(date, "timeEnd", false)
}
} else {
const end = stringToDateTime("", String(data.find((item) => item.date == date)?.timeEnd))
const start = stringToDateTime("", val)
const timestampAwal = start.getTime()
const timestampAkhir = end.getTime()
if (val == "" || val == null || timestampAwal > timestampAkhir) {
settingError(date, "timeEnd", true)
} else {
settingError(date, "timeEnd", false)
}
}
setData(data.map((item) => {
if (item.date == date) {
return { ...item, [cat]: val }
}
return item
}))
}
return (
<ModalFloat
title="Detail Tanggal dan Waktu Tugas"
isVisible={isVisible}
setVisible={setVisible}
disableSubmit={Object.values(error).some((val: any) => val.timeEnd == true || val.timeStart == true)}
onSubmit={() => {
onSubmit(data)
setVisible(false)
}}
>
<View style={[{ height: tinggiFix }]} >
<VirtualizedList
data={data}
getItemCount={() => data.length}
getItem={getItem}
renderItem={({ item, index }: { item: Props, index: number }) => {
return (
<View key={index} style={[Styles.borderBottom, Styles.pv05]}>
<Text style={[Styles.textDefaultSemiBold]}>{item.date}</Text>
<View style={[Styles.rowSpaceBetween]}>
<View style={[{ width: "48%" }]}>
<InputDate
mode="time"
onChange={(val) => { validationForm("timeStart", val, item.date) }}
value={item.timeStart}
label="Waktu Awal"
placeholder="--:--"
error={error.find((error: any) => error.date == item.date)?.timeStart}
errorText="Waktu awal tidak valid"
/>
</View>
<View style={[{ width: "48%" }]}>
<InputDate
onChange={(val) => { validationForm("timeEnd", val, item.date) }}
mode="time"
value={item.timeEnd}
label="Waktu Akhir"
placeholder="--:--"
error={error.find((error: any) => error.date == item.date)?.timeEnd}
errorText="Waktu akhir harus lebih dari waktu awal"
/>
</View>
</View>
</View>
)
}}
keyExtractor={(item, index) => String(index)}
showsVerticalScrollIndicator={false}
/>
</View>
</ModalFloat>
)
}

2
components/project/modalListDetailTugasProject.tsx
View File

@@ -16,7 +16,7 @@ interface Props {
}
export default function ModalListDetailTugasProject({ isVisible, setVisible, idTask }: { isVisible: boolean, setVisible: (value: boolean) => void, idTask: string }) {
const [data, setData] = useState([])
const [data, setData] = useState<Props[]>([])
const [loading, setLoading] = useState(false)
const { token, decryptToken } = useAuthSession()
const arrSkeleton = Array.from({ length: 3 }, (_, index) => index)

3
constants/Styles.ts
View File

@@ -275,6 +275,9 @@ const Styles = StyleSheet.create({
paddingVertical: 5,
marginVertical: 5
},
btnDisabled: {
backgroundColor: '#d6d8f6',
},
btnMenuRow: {
width: '33%',
alignItems: 'center'

4
lib/api.ts
View File

@@ -281,7 +281,7 @@ export const apiReportProject = async (data: { report: string, user: string }, i
return response.data;
};
export const apiCreateProjectTask = async ({ data, id }: { data: { name: string, dateStart: string, user: string, dateEnd: string }, id: string }) => {
export const apiCreateProjectTask = async ({ data, id }: { data: { name: string, dateStart: string, user: string, dateEnd: string, dataDetail: any[] }, id: string }) => {
const response = await api.post(`/mobile/project/${id}`, data)
return response.data;
};
@@ -306,7 +306,7 @@ export const apiGetProjectTask = async ({ user, id, cat }: { user: string, id: s
return response.data;
};
export const apiEditProjectTask = async ({ data, id }: { data: { title: string, dateStart: string, user: string, dateEnd: string }, id: string }) => {
export const apiEditProjectTask = async ({ data, id }: { data: { title: string, dateStart: string, user: string, dateEnd: string, dataDetail: any[] }, id: string }) => {
const response = await api.post(`/mobile/project/detail/${id}`, data)
return response.data;
};

9
lib/fun_formatDateOnly.ts Normal file
View File

@@ -0,0 +1,9 @@
import dayjs from 'dayjs';
import { DateType } from "react-native-ui-datepicker";
export function formatDateOnly(date?: DateType, format?: "DD-MM-YYYY" | "YYYY-MM-DD") {
if (!date) return "";
const dateObj = dayjs.isDayjs(date) ? date.toDate() : date;
const iso = new Date(dateObj).toISOString().split("T")[0];
return dayjs(iso).format(format || "DD-MM-YYYY");
}

14
lib/fun_getDatesInRange.ts Normal file
View File

@@ -0,0 +1,14 @@
import dayjs from "dayjs";
export function getDatesInRange(startDate: string, endDate: string) {
const dates = [];
const currentDate = new Date(startDate);
const endDateNew = new Date(endDate);
while (currentDate <= endDateNew) {
dates.push(dayjs(new Date(currentDate)).format("DD-MM-YYYY"));
currentDate.setDate(currentDate.getDate() + 1);
}
return dates;
}