wibu/sistem-desa-mandiri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

upd: fitur baru task divisi

Browse Source 
Deskripsi:
- api tambah detail detail task divisi
- api tambah task detail
- api edit task detail
- tampilan list detail task
- tampilan form tambah data task
- tampilan form tambah tugas detail task divisi
- tampilan form edit tugas detail task divisi

No Issues
This commit is contained in:
amal
2025-08-19 14:08:06 +08:00
parent bcbdc4c02b
commit 60215f49a5
15 changed files with 465 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/module/project/ui/modal_add_detail_task_project.tsx
View File

@@ -1,7 +1,6 @@
import { TEMA } from "@/module/_global";
import { Box, Button, Grid, Modal, SimpleGrid, Text } from "@mantine/core";
import { TimeInput } from "@mantine/dates";
import { timeEnd } from "console";
import moment from "moment";
import { useEffect, useState } from "react";
@@ -17,13 +16,13 @@ export function ModalAddDetailTaskProject({ open, onClose, data, onSubmit }: { o
if (cat == "timeEnd") {
if (value == "" || dataDetail.find((data: any) => data.date == date)?.timeStart > value) {
setTouched((touched: any) => [...touched, { date: date, timeEnd: true }])
}else{
} else {
setTouched((touched: any) => touched.filter((item: any) => item.date != date))
}
}else{
} else {
if (value == "" || dataDetail.find((data: any) => data.date == date)?.timeEnd < value) {
setTouched((touched: any) => [...touched, { date: date, timeEnd: true }])
}else{
} else {
setTouched((touched: any) => touched.filter((item: any) => item.date != date))
}
}

4
src/module/task/lib/api_task.ts
View File

@@ -44,8 +44,8 @@ export const funUpdateStatusDetailTask = async (path: string, data: { status: nu
};
export const funGetDetailTask = async (path: string) => {
const response = await fetch(`/api/task/detail/${path}`);
export const funGetDetailTask = async (path: string, kat?:string) => {
const response = await fetch(`/api/task/detail/${path}${(kat) ? `?cat=${kat}` : ''}`);
return await response.json().catch(() => null);
}

6
src/module/task/lib/type_task.ts
View File

@@ -16,14 +16,16 @@ export interface IFormMemberTask {
export interface IFormDateTask {
dateStart: string,
dateEnd: string,
title: string
title: string,
dataDetail: any[]
}
export interface IFormAddDetailTask {
dateStart: string,
dateEnd: string,
title: string
idDivision: string
idDivision: string,
dataDetail: any[]
}

38
src/module/task/ui/add_detail_task.tsx
View File

@@ -1,4 +1,5 @@
"use client";
import { getDatesInRange } from "@/lib/getDatesInRange";
import { keyWibu, LayoutNavbarNew, TEMA } from "@/module/_global";
import LayoutModal from "@/module/_global/layout/layout_modal";
import { useHookstate } from "@hookstate/core";
@@ -11,6 +12,7 @@ import { useState } from "react";
import toast from "react-hot-toast";
import { useWibuRealtime } from "wibu-realtime";
import { funCreateDetailTask } from "../lib/api_task";
import { ModalAddDetailTugasTask } from "./modal_add_detail_tugas_task";
export default function AddDetailTask() {
const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
@@ -18,6 +20,8 @@ export default function AddDetailTask() {
const [title, setTitle] = useState("")
const [openModal, setOpenModal] = useState(false)
const [loadingModal, setLoadingModal] = useState(false)
const [openModalDetailTask, setOpenModalDetailTask] = useState(false)
const [dataDetail, setDataDetail] = useState<any>([])
const param = useParams<{ id: string, detail: string }>()
const tema = useHookstate(TEMA)
const [acuan, setAcuan] = useState(false)
@@ -57,11 +61,17 @@ export default function AddDetailTask() {
async function onSubmit() {
try {
setLoadingModal(true)
const dataDetailFix = dataDetail.map((v: any) => ({
...v,
date: moment(v.date).format("YYYY-MM-DD"),
}))
const res = await funCreateDetailTask(param.detail, {
title,
dateStart: (value[0] != null) ? moment(value[0]).format('YYYY-MM-DD') : moment(new Date).format('YYYY-MM-DD'),
dateEnd: (value[1] != null) ? moment(value[1]).format('YYYY-MM-DD') : moment(new Date).format('YYYY-MM-DD'),
idDivision: param.id
idDivision: param.id,
dataDetail: dataDetailFix
})
if (res.success) {
@@ -96,8 +106,15 @@ export default function AddDetailTask() {
const array = val.split(",")
if (array[0] == '' || array[1] == '') {
setTouched({ ...touched, date: true })
setDataDetail([])
} else {
setTouched({ ...touched, date: false })
const datanya = getDatesInRange(value[0]!, value[1]!)
setDataDetail(datanya.map((data: any) => ({
date: data,
timeStart: null,
timeEnd: null
})))
}
}
}
@@ -163,6 +180,16 @@ export default function AddDetailTask() {
? <Text size="sm" c={"red"}>Tanggal Tidak Boleh Kosong</Text>
: <></>
}
<Button
variant="light"
size="compact-md"
radius={5}
onClick={() => { setOpenModalDetailTask(true) }}
mt={5}
disabled={value[0] == null || value[1] == null || touched.date}
>
Detail
</Button>
<Stack pt={15} pb={100}>
<TextInput
styles={{
@@ -202,6 +229,15 @@ export default function AddDetailTask() {
</Button>
</Box>
<ModalAddDetailTugasTask
open={openModalDetailTask}
onClose={() => setOpenModalDetailTask(false)}
data={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
setOpenModalDetailTask(false)
}} />
<LayoutModal loading={loadingModal} opened={openModal} onClose={() => setOpenModal(false)}
description="Apakah Anda yakin ingin menambahkan tugas?"
onYes={(val) => {

39
src/module/task/ui/create_date_end_task.tsx
View File

@@ -1,4 +1,5 @@
"use client";
import { getDatesInRange } from "@/lib/getDatesInRange";
import { LayoutNavbarNew, TEMA } from "@/module/_global";
import { useHookstate } from "@hookstate/core";
import { ActionIcon, Box, Button, Flex, Group, rem, SimpleGrid, Stack, Text, TextInput } from "@mantine/core";
@@ -9,13 +10,16 @@ import { useState } from "react";
import toast from "react-hot-toast";
import { HiChevronLeft } from "react-icons/hi2";
import { IFormDateTask } from "../lib/type_task";
import { ModalAddDetailTugasTask } from "./modal_add_detail_tugas_task";
export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boolean) => void, onSet: (val: IFormDateTask) => void }) {
const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
const [title, setTitle] = useState("")
const [acuan, setAcuan] = useState(false)
const [dataDetail, setDataDetail] = useState<any[]>([])
const tema = useHookstate(TEMA)
const [openModalDetailTask, setOpenModalDetailTask] = useState(false)
const [touched, setTouched] = useState({
title: false,
date: false
@@ -28,10 +32,16 @@ export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boo
if (title == "")
return toast.error("Error! harus memasukkan judul tugas")
const dataDetailFix = dataDetail.map((v: any) => ({
...v,
date: moment(v.date).format("YYYY-MM-DD"),
}))
onSet({
dateStart: moment(value[0]).format('YYYY-MM-DD'),
dateEnd: moment(value[1]).format('YYYY-MM-DD'),
title: title
title: title,
dataDetail: dataDetailFix
})
}
@@ -73,8 +83,15 @@ export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boo
const array = val.split(",")
if (array[0] == '' || array[1] == '') {
setTouched({ ...touched, date: true })
setDataDetail([])
} else {
setTouched({ ...touched, date: false })
const datanya = getDatesInRange(value[0]!, value[1]!)
setDataDetail(datanya.map((data: any) => ({
date: data,
timeStart: null,
timeEnd: null
})))
}
}
}
@@ -145,6 +162,16 @@ export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boo
? <Text size="sm" c={"red"}>Tanggal Tidak Boleh Kosong</Text>
: <></>
}
<Button
variant="light"
size="compact-md"
radius={5}
onClick={() => { setOpenModalDetailTask(true) }}
mt={5}
disabled={value[0] == null || value[1] == null || touched.date}
>
Detail
</Button>
<Stack pt={15} mb={100}>
<TextInput
styles={{
@@ -181,6 +208,16 @@ export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boo
Simpan
</Button>
</Box>
<ModalAddDetailTugasTask
open={openModalDetailTask}
onClose={() => setOpenModalDetailTask(false)}
data={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
setOpenModalDetailTask(false)
}}
/>
</Box>
);
}

2
src/module/task/ui/create_task.tsx
View File

@@ -223,7 +223,7 @@ export default function CreateTask() {
setIndexDelTask(i)
setOpenDrawerTask(true)
}}>
<ResultsDateAndTask dateStart={v.dateStart} dateEnd={v.dateEnd} title={v.title} />
<ResultsDateAndTask dateStart={v.dateStart} dateEnd={v.dateEnd} title={v.title} dataDetail={v.dataDetail} />
</Box>
)
})

18
src/module/task/ui/detail_list_tugas_task.tsx
View File

@@ -1,8 +1,9 @@
'use client'
import { globalRole, keyWibu, LayoutDrawer, SkeletonDetailListTugasTask, TEMA } from "@/module/_global"
import LayoutModal from "@/module/_global/layout/layout_modal"
import { globalIsMemberDivision } from "@/module/division_new"
import { useHookstate } from "@hookstate/core"
import { Box, Center, Checkbox, Divider, Flex, Grid, Group, SimpleGrid, Stack, Text, Loader } from "@mantine/core"
import { Box, Center, Checkbox, Divider, Flex, Grid, Group, Loader, SimpleGrid, Stack, Text } from "@mantine/core"
import { useShallowEffect } from "@mantine/hooks"
import "moment/locale/id"
import { useParams, useRouter } from "next/navigation"
@@ -10,15 +11,17 @@ import { useState } from "react"
import toast from "react-hot-toast"
import { AiOutlineFileDone, AiOutlineFileSync } from "react-icons/ai"
import { FaCheck, FaPencil, FaTrash } from "react-icons/fa6"
import { IoTimeOutline } from "react-icons/io5"
import { useWibuRealtime } from "wibu-realtime"
import { funDeleteDetailTask, funGetTaskDivisionById, funUpdateStatusDetailTask } from "../lib/api_task"
import { IDataListTaskDivision } from "../lib/type_task"
import { globalRefreshTask, valStatusDetailTask } from "../lib/val_task"
import { globalIsMemberDivision } from "@/module/division_new"
import { ModalListDetailTugasTask } from "./modal_list_tugas_task"
export default function ListTugasDetailTask() {
const roleLogin = useHookstate(globalRole)
const memberDivision = useHookstate(globalIsMemberDivision)
const [openModalDetailTask, setOpenModalDetailTask] = useState(false)
const [openDrawer, setOpenDrawer] = useState(false)
const [openDrawerStatus, setOpenDrawerStatus] = useState(false)
const [isOpenModal, setOpenModal] = useState(false)
@@ -268,6 +271,15 @@ export default function ListTugasDetailTask() {
</Box>
</Flex>
<Flex onClick={() => { setOpenModalDetailTask(true) }} justify={'center'} align={'center'} direction={'column'} >
<Box>
<IoTimeOutline size={30} color={tema.get().utama} />
</Box>
<Box>
<Text c={tema.get().utama}>Detail Waktu</Text>
</Box>
</Flex>
<Flex onClick={() => { setOpenModal(true) }} justify={'center'} align={'center'} direction={'column'} >
<Box>
<FaTrash size={30} color={tema.get().utama} />
@@ -281,6 +293,8 @@ export default function ListTugasDetailTask() {
</Box>
</LayoutDrawer>
<ModalListDetailTugasTask open={openModalDetailTask} onClose={() => setOpenModalDetailTask(false)} task={idData} />
<LayoutModal loading={loadingHapus} opened={isOpenModal} onClose={() => setOpenModal(false)}
description="Apakah Anda yakin ingin menghapus tugas ini?"
onYes={(val) => {

49
src/module/task/ui/edit_detail_task.tsx
View File

@@ -1,4 +1,5 @@
"use client";
import { getDatesInRange } from "@/lib/getDatesInRange";
import { LayoutNavbarNew, TEMA } from "@/module/_global";
import LayoutModal from "@/module/_global/layout/layout_modal";
import { useHookstate } from "@hookstate/core";
@@ -10,11 +11,14 @@ import { useParams, useRouter } from "next/navigation";
import { useState } from "react";
import toast from "react-hot-toast";
import { funEditDetailTask, funGetDetailTask } from "../lib/api_task";
import { ModalAddDetailTugasTask } from "./modal_add_detail_tugas_task";
export default function EditDetailTask() {
const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
const router = useRouter()
const [openModalDetailTask, setOpenModalDetailTask] = useState(false)
const [dataDetail, setDataDetail] = useState<any>([])
const [title, setTitle] = useState("")
const param = useParams<{ id: string, detail: string }>()
const [openModal, setOpenModal] = useState(false)
@@ -36,10 +40,15 @@ export default function EditDetailTask() {
try {
setLoadingModal(true)
const dataDetailFix = dataDetail.map((v: any) => ({
...v,
date: moment(v.date).format("YYYY-MM-DD"),
}))
const res = await funEditDetailTask(param.detail, {
title: title,
dateStart: moment(value[0]).format('YYYY-MM-DD'),
dateEnd: moment(value[1]).format('YYYY-MM-DD'),
dataDetail: dataDetailFix
})
if (res.success) {
@@ -69,6 +78,18 @@ export default function EditDetailTask() {
new Date(moment(res.data.dateStart).format('YYYY-MM-DD')),
new Date(moment(res.data.dateEnd).format('YYYY-MM-DD')),
])
const res2 = await funGetDetailTask(param.detail, 'detailTask');
if (res2.data.length == 0) {
const datanya = getDatesInRange(new Date(moment(res.data.dateStart).format('YYYY-MM-DD')), new Date(moment(res.data.dateEnd).format('YYYY-MM-DD')))
setDataDetail(datanya.map((data: any) => ({
date: data,
timeStart: null,
timeEnd: null
})))
} else {
setDataDetail(res2.data)
}
} else {
toast.error(res.message);
}
@@ -104,8 +125,15 @@ export default function EditDetailTask() {
const array = val.split(",")
if (array[0] == '' || array[1] == '') {
setTouched({ ...touched, date: true })
setDataDetail([])
} else {
setTouched({ ...touched, date: false })
const datanya = getDatesInRange(value[0]!, value[1]!)
setDataDetail(datanya.map((data: any) => ({
date: data,
timeStart: null,
timeEnd: null
})))
}
}
}
@@ -180,7 +208,16 @@ export default function EditDetailTask() {
? <Text size="sm" c={"red"}>Tanggal Tidak Boleh Kosong</Text>
: <></>
}
<Button
variant="light"
size="compact-md"
radius={5}
onClick={() => { setOpenModalDetailTask(true) }}
mt={5}
disabled={value[0] == null || value[1] == null || touched.date}
>
Detail
</Button>
<Stack pt={15} pb={100}>
{loading ?
<Skeleton height={40} mt={20} radius={10} />
@@ -229,6 +266,16 @@ export default function EditDetailTask() {
}
</Box>
<ModalAddDetailTugasTask
open={openModalDetailTask}
onClose={() => setOpenModalDetailTask(false)}
data={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
setOpenModalDetailTask(false)
}}
/>
<LayoutModal loading={loadingModal} opened={openModal} onClose={() => setOpenModal(false)}
description="Apakah Anda yakin ingin mengubah data?"
onYes={(val) => {

100
src/module/task/ui/modal_add_detail_tugas_task.tsx Normal file
View File

@@ -0,0 +1,100 @@
import { TEMA } from "@/module/_global";
import { Box, Button, Grid, Modal, SimpleGrid, Text } from "@mantine/core";
import { TimeInput } from "@mantine/dates";
import moment from "moment";
import { useEffect, useState } from "react";
export function ModalAddDetailTugasTask({ open, onClose, data, onSubmit }: { open: boolean, onClose: () => void, data: any[], onSubmit: (data: any) => void }) {
const [dataDetail, setDataDetail] = useState(data)
const [touched, setTouched] = useState<any>([])
useEffect(() => {
setDataDetail(data)
}, [data])
function onInputTime(date: any, value: any, cat: 'timeStart' | 'timeEnd') {
if (cat == "timeEnd") {
if (value == "" || dataDetail.find((data: any) => data.date == date)?.timeStart > value) {
setTouched((touched: any) => [...touched, { date: date, timeEnd: true }])
} else {
setTouched((touched: any) => touched.filter((item: any) => item.date != date))
}
} else {
if (value == "" || dataDetail.find((data: any) => data.date == date)?.timeEnd < value) {
setTouched((touched: any) => [...touched, { date: date, timeEnd: true }])
} else {
setTouched((touched: any) => touched.filter((item: any) => item.date != date))
}
}
setDataDetail(dataDetail.map((data: any) => {
if (data.date == date) {
return {
...data,
[cat]: value
}
}
return data
}))
}
return (
<Modal styles={{
body: {
borderRadius: 20
},
content: {
borderRadius: 20,
border: `2px solid ${"#828AFC"}`
}
}} opened={open} onClose={() => onClose()} centered withCloseButton={false} title={"Detail Tanggal dan Waktu Tugas"}>
<Box p={10}>
<Box>
{
dataDetail.map((data: any, index: any) => (
<Box key={index} py={10} style={{ borderBottom: `1px solid ${"#D6D8F6"}` }}>
<Text fw={"bold"}>{moment(data.date).format('DD-MM-YYYY')}</Text>
<SimpleGrid cols={{ base: 2, sm: 2, lg: 2 }}>
<TimeInput
styles={{
input: {
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
},
}}
size="md"
label="Waktu Awal"
value={data.timeStart}
onChange={(event) => onInputTime(data.date, event.target.value, 'timeStart')}
/>
<TimeInput
styles={{
input: {
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
},
}}
size="md"
label="Waktu Akhir"
value={data.timeEnd}
onChange={(event) => onInputTime(data.date, event.target.value, 'timeEnd')}
error={touched.find((item: any) => item.date == data.date)?.timeEnd ? "Waktu akhir harus lebih dari waktu awal" : ""}
/>
</SimpleGrid>
</Box>
))
}
</Box>
<Grid mt={10}>
<Grid.Col span={6}>
<Button variant="light" fullWidth color='#969494' onClick={() => onClose()}>Batalkan</Button>
</Grid.Col>
<Grid.Col span={6}>
<Button variant="light" disabled={touched.length > 0} fullWidth color={TEMA.get().utama} onClick={() => { onSubmit(dataDetail) }}>Simpan</Button>
</Grid.Col>
</Grid>
</Box>
</Modal>
)
}

99
src/module/task/ui/modal_list_tugas_task.tsx Normal file
View File

@@ -0,0 +1,99 @@
import { Box, Modal, SimpleGrid, Skeleton, Text } from "@mantine/core";
import { TimeInput } from "@mantine/dates";
import { useShallowEffect } from "@mantine/hooks";
import moment from "moment";
import { useState } from "react";
import toast from "react-hot-toast";
import { funGetDetailTask } from "../lib/api_task";
export function ModalListDetailTugasTask({ open, onClose, task, }: { open: boolean, onClose: () => void, task: string }) {
const [dataDetail, setDataDetail] = useState([])
const [loading, setLoading] = useState(false)
async function getData() {
try {
setLoading(true)
const response = await funGetDetailTask(task, 'detailTask')
if (response.success) {
setDataDetail(response.data)
} else {
toast.error(response.message)
}
} catch (error) {
console.error(error);
toast.error("Gagal mendapatkan detail tugas Kegiatan, coba lagi nanti");
} finally {
setLoading(false)
}
}
useShallowEffect(() => {
if(task!=""){
getData()
}
}, [task])
return (
<Modal styles={{
body: {
borderRadius: 20
},
content: {
borderRadius: 20,
border: `2px solid ${"#828AFC"}`
}
}} opened={open} onClose={() => onClose()} centered withCloseButton={false} title={"Detail Tanggal dan Waktu Tugas"}>
<Box p={10}>
<Box>
{
loading ?
Array(5)
.fill(null)
.map((_, i) => (
<Box key={i}>
<Box>
<Skeleton width={"100%"} mb={15} height={30} radius={"md"} />
</Box>
</Box>
))
:
dataDetail.length > 0 ?
dataDetail.map((data: any, index: any) => (
<Box key={index} py={10} style={{ borderBottom: `1px solid ${"#D6D8F6"}` }}>
<Text fw={"bold"}>{moment(data.date).format('DD-MM-YYYY')}</Text>
<SimpleGrid cols={{ base: 2, sm: 2, lg: 2 }}>
<TimeInput
styles={{
input: {
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
},
}}
size="md"
label="Waktu Awal"
value={data.timeStart}
readOnly
/>
<TimeInput
styles={{
input: {
border: `1px solid ${"#D6D8F6"}`,
borderRadius: 10,
},
}}
size="md"
label="Waktu Akhir"
value={data.timeEnd}
readOnly
/>
</SimpleGrid>
</Box>
))
:
<Text ta="center" c={"gray"}>Tidak ada detail tugas</Text>
}
</Box>
</Box>
</Modal>
)
}