join #19

Merged
amaliadwiy merged 222 commits from join into v1 2026-02-09 11:18:03 +08:00
209 changed files with 4862 additions and 1711 deletions
Showing only changes of commit 95121d0442 - Show all commits

View File

@@ -99,14 +99,18 @@ export default function CreateTaskAddTugas() {
timeStart: item.timeStart, timeStart: item.timeStart,
timeEnd: item.timeEnd, timeEnd: item.timeEnd,
})) }))
dispatch(setTaskCreate([...taskCreate, { const hasilOrder = [...taskCreate, {
title: title, title: title,
dateStart: from, dateStart: from,
dateEnd: to, dateEnd: to,
dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"), dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"),
dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"), dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"),
dataDetail: dataDetailFix dataDetail: dataDetailFix
}])) }].sort((a, b) => {
return new Date(a.dateStartFix).getTime() - new Date(b.dateStartFix).getTime();
});
dispatch(setTaskCreate(hasilOrder))
router.back(); router.back();
} catch (error) { } catch (error) {
console.error(error); console.error(error);

View File

@@ -99,14 +99,19 @@ export default function CreateProjectAddTask() {
timeStart: item.timeStart, timeStart: item.timeStart,
timeEnd: item.timeEnd, timeEnd: item.timeEnd,
})) }))
dispatch(setTaskCreate([...taskCreate, {
const hasilOrder = [...taskCreate, {
title: title, title: title,
dateStart: from, dateStart: from,
dateEnd: to, dateEnd: to,
dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"), dateStartFix: formatDateOnly(range.startDate, "YYYY-MM-DD"),
dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"), dateEndFix: formatDateOnly(range.endDate, "YYYY-MM-DD"),
dataDetail: dataDetailFix dataDetail: dataDetailFix
}])) }].sort((a, b) => {
return new Date(a.dateStartFix).getTime() - new Date(b.dateStartFix).getTime();
});
dispatch(setTaskCreate(hasilOrder))
router.back(); router.back();
} catch (error) { } catch (error) {
console.error(error); console.error(error);