upd: fitur baru task divisi

Deskripsi;
- tampilan list detail tugas task divisi
- tampilan tambah detail tugas task divisi
- tampilan edit detail tugas task divisi
- tampilan tambah data task divisi > detail tugas
- integrasi api get data list detail tugas task divisi
- integrasi api tambah dtail tugas task divisi
- integrasi api edit detail tugas task divisi
- integrasi api tambah data task divisi > detail tugas

NO Issues'
This commit is contained in:
2025-08-20 17:09:15 +08:00
parent 72fa18565d
commit e2c8f1db39
7 changed files with 473 additions and 32 deletions

View File

@@ -1,25 +1,28 @@
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
import Text from "@/components/Text";
import Styles from "@/constants/Styles";
import { apiCreateTaskTugas } from "@/lib/api";
import { formatDateOnly } from "@/lib/fun_formatDateOnly";
import { getDatesInRange } from "@/lib/fun_getDatesInRange";
import { setUpdateTask } from "@/lib/taskUpdate";
import { useAuthSession } from "@/providers/AuthProvider";
import dayjs from "dayjs";
import { useHeaderHeight } from '@react-navigation/elements';
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,
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";
import { useHeaderHeight } from '@react-navigation/elements';
export default function TaskDivisionAddTask() {
const { token, decryptToken } = useAuthSession();
@@ -38,12 +41,13 @@ export default function TaskDivisionAddTask() {
endDate: false,
title: false,
});
const [title, setTitle] = useState("");
const [title, setTitle] = useState("")
const [dataDetail, setDataDetail] = useState<any>([])
const [modalDetail, setModalDetail] = 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 (
@@ -72,21 +76,49 @@ export default function TaskDivisionAddTask() {
}
}
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 apiCreateTaskTugas({
data: {
title,
dateStart: dayjs(range.startDate).format("YYYY-MM-DD"),
dateEnd: dayjs(range.endDate).format("YYYY-MM-DD"),
dateStart: formatDateOnly(range.startDate, "YYYY-MM-DD"),
dateEnd: formatDateOnly(range.endDate, "YYYY-MM-DD"),
user: hasil,
idDivision: id,
dataDetail: dataDetailFix,
},
id: detail,
});
@@ -177,6 +209,13 @@ export default function TaskDivisionAddTask() {
{
(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"
@@ -194,7 +233,14 @@ export default function TaskDivisionAddTask() {
</View>
</ScrollView>
</KeyboardAvoidingView>
<ModalAddDetailTugasTask
isVisible={modalDetail}
setVisible={setModalDetail}
dataTanggal={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
}}
/>
</SafeAreaView>
);
}

View File

@@ -1,17 +1,22 @@
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
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 dayjs from "dayjs";
import { useHeaderHeight } from '@react-navigation/elements';
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
@@ -20,7 +25,6 @@ import DateTimePicker, {
DateType
} from "react-native-ui-datepicker";
import { useDispatch, useSelector } from "react-redux";
import { useHeaderHeight } from '@react-navigation/elements';
export default function CreateTaskAddTugas() {
const headerHeight = useHeaderHeight();
@@ -37,11 +41,12 @@ export default function CreateTaskAddTugas() {
})
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 CreateTaskAddTugas() {
}
}
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 CreateTaskAddTugas() {
{
(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 CreateTaskAddTugas() {
</View>
</ScrollView>
</KeyboardAvoidingView>
<ModalAddDetailTugasTask
isVisible={modalDetail}
setVisible={setModalDetail}
dataTanggal={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
}}
/>
</SafeAreaView>
);
}

View File

@@ -1,20 +1,24 @@
import ButtonBackHeader from "@/components/buttonBackHeader";
import ButtonSaveHeader from "@/components/buttonSaveHeader";
import { InputForm } from "@/components/inputForm";
import ModalAddDetailTugasTask from "@/components/task/modalAddDetailTugasTask";
import Text from "@/components/Text";
import Styles from "@/constants/Styles";
import { apiEditTaskTugas, apiGetTaskTugas } from "@/lib/api";
import { formatDateOnly } from "@/lib/fun_formatDateOnly";
import { getDatesInRange } from "@/lib/fun_getDatesInRange";
import { setUpdateTask } from "@/lib/taskUpdate";
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,
Pressable,
SafeAreaView,
ScrollView,
View
@@ -38,6 +42,9 @@ export default function UpdateProjectTaskDivision() {
const [year, setYear] = useState<any>();
const [loading, setLoading] = useState(true);
const [disableBtn, setDisableBtn] = 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({
startDate: false,
@@ -45,10 +52,8 @@ export default function UpdateProjectTaskDivision() {
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 {
@@ -65,6 +70,22 @@ export default function UpdateProjectTaskDivision() {
});
setMonth(new Date(response.data.dateStart).getMonth());
setYear(new Date(response.data.dateStart).getFullYear());
const response2 = await apiGetTaskTugas({
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 {
@@ -79,8 +100,22 @@ export default function UpdateProjectTaskDivision() {
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 apiEditTaskTugas({ 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 apiEditTaskTugas({
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(setUpdateTask({ ...update, task: !update.task }))
Toast.show({ type: 'small', text1: 'Berhasil mengubah data', })
@@ -123,10 +158,33 @@ export default function UpdateProjectTaskDivision() {
}
}
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
@@ -205,6 +263,13 @@ export default function UpdateProjectTaskDivision() {
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"
@@ -222,7 +287,14 @@ export default function UpdateProjectTaskDivision() {
</View>
</ScrollView>
</KeyboardAvoidingView>
<ModalAddDetailTugasTask
isVisible={modalDetail}
setVisible={setModalDetail}
dataTanggal={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
}}
/>
</SafeAreaView>
);
}