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

upd: fitur bary

Browse Source 
Deskripsi:
- tambah data project detail jam task
- edit detail task jam pada fitur project
- api tambah data
- api edit data
- tampilan edit data
- tampilan tambah data

No Issues
This commit is contained in:
amal
2025-08-19 11:38:56 +08:00
parent 4e64f041e9
commit bcbdc4c02b
8 changed files with 92 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/api/project/[id]/route.ts
View File

@@ -197,10 +197,10 @@ export async function POST(request: Request, context: { params: { id: string } }
...v,
idTask: dataCreate.id,
date: new Date(v.date),
timeStart: new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
const dataDetailCreate = await prisma.projectTaskDetail.createMany({
data: dataDetailFix
})

8
src/app/api/project/detail/[id]/route.ts
View File

@@ -261,8 +261,7 @@ export async function POST(request: Request, context: { params: { id: string } }
}
})
if (moment(dataTaskLama.dateStart).format('YYYY-MM-DD') != dateStart || moment(dataTaskLama.dateEnd).format('YYYY-MM-DD') != dateEnd) {
const dataDetailDelete = await prisma.projectTaskDetail.deleteMany({
const dataDetailDelete = await prisma.projectTaskDetail.deleteMany({
where: {
idTask: id
}
@@ -273,15 +272,14 @@ export async function POST(request: Request, context: { params: { id: string } }
...v,
idTask: id,
date: new Date(v.date),
timeStart: new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
const dataDetailCreate = await prisma.projectTaskDetail.createMany({
data: dataDetailFix
})
}
}
// create log user
const log = await createLogUser({ act: 'UPDATE', desc: 'User mengupdate tahapan kegiatan', table: 'projectTask', data: String(id) })

25
src/app/api/project/route.ts
View File

@@ -169,15 +169,34 @@ export async function POST(request: Request) {
if (task.length > 0) {
const dataProject = task.map((v: any) => ({
..._.omit(v, ["dateStart", "dateEnd", "name"]),
..._.omit(v, ["dateStart", "dateEnd", "name", "dataDetail"]),
idProject: data.id,
title: v.title,
dateStart: new Date(v.dateStart),
dateEnd: new Date(v.dateEnd),
}))
const insertTask = await prisma.projectTask.createMany({
data: dataProject
let dataDetailFix = []
for (let i = 0; i < dataProject.length; i++) {
const insertTask = await prisma.projectTask.create({
data: dataProject[i],
select:{
id: true
}
})
const dataDetail = task[i].dataDetail.map((v: any) => ({
...v,
idTask: insertTask.id,
date: new Date(v.date),
timeStart: v.timeStart == null ? null : new Date(new Date('1970-01-01 ' + v.timeStart).getTime() - (new Date('1970-01-01 ' + v.timeStart).getTimezoneOffset() * 60000)).toISOString(),
timeEnd: v.timeEnd == null ? null : new Date(new Date('1970-01-01 ' + v.timeEnd).getTime() - (new Date('1970-01-01 ' + v.timeEnd).getTimezoneOffset() * 60000)).toISOString(),
}))
dataDetailFix.push(...dataDetail)
}
const insertDetail = await prisma.projectTaskDetail.createMany({
data: dataDetailFix
})
}

1
src/module/project/lib/type_project.ts
View File

@@ -56,6 +56,7 @@ export interface NewIFormDateProject {
dateStart: string,
dateEnd: string,
title: string,
dataDetail: any[]
}
export interface IFormMemberProject {

39
src/module/project/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,6 +10,7 @@ import { useState } from "react";
import toast from "react-hot-toast";
import { HiChevronLeft } from "react-icons/hi2";
import { NewIFormDateProject } from "../lib/type_project";
import { ModalAddDetailTaskProject } from "./modal_add_detail_task_project";
export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boolean) => void, onSet: (val: NewIFormDateProject) => void }) {
@@ -16,6 +18,8 @@ export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boo
const [title, setTitle] = useState("")
const tema = useHookstate(TEMA)
const [acuan, setAcuan] = useState(false)
const [openModalDetailTask, setOpenModalDetailTask] = useState(false)
const [dataDetail, setDataDetail] = useState<any[]>([])
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,
dataDetail: dataDetailFix
})
}
@@ -72,8 +82,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
})))
}
}
}
@@ -144,6 +161,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} pb={100}>
<TextInput
styles={{
@@ -184,6 +211,16 @@ export default function ViewDateEndTask({ onClose, onSet }: { onClose: (val: boo
Simpan
</Button>
</Box>
<ModalAddDetailTaskProject
open={openModalDetailTask}
onClose={() => setOpenModalDetailTask(false)}
data={dataDetail}
onSubmit={(data) => {
setDataDetail(data)
setOpenModalDetailTask(false)
}}
/>
</Box>
);
}

2
src/module/project/ui/create_project.tsx
View File

@@ -299,7 +299,7 @@ export default function CreateProject() {
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>
)
})

23
src/module/project/ui/edit_detail_task_project.tsx
View File

@@ -44,11 +44,15 @@ export default function EditDetailTaskProject() {
try {
setLoadingModal(true)
const dataDetailFix = dataDetail.map((v: any) => ({
...v,
date: moment(v.date).format("YYYY-MM-DD"),
}))
const res = await funEditDetailProject(param.id, {
title: name,
dateStart: moment(value[0]).format('YYYY-MM-DD'),
dateEnd: moment(value[1]).format('YYYY-MM-DD'),
dataDetail: dataDetailFix
})
if (res.success) {
@@ -83,8 +87,16 @@ export default function EditDetailTaskProject() {
])
const res2 = await funGetDetailProject(param.id, 'detailTask');
console.log('detail task',res2)
setDataDetail(res2.data)
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);
}
@@ -260,8 +272,7 @@ export default function EditDetailTaskProject() {
</Box>
{/* TODO */}
{/* <ModalAddDetailTaskProject
<ModalAddDetailTaskProject
open={openModalDetailTask}
onClose={() => setOpenModalDetailTask(false)}
data={dataDetail}
@@ -269,7 +280,7 @@ export default function EditDetailTaskProject() {
setDataDetail(data)
setOpenModalDetailTask(false)
}}
/> */}
/>
<LayoutModal loading={loadingModal} opened={openModal} onClose={() => setOpenModal(false)}
description="Apakah Anda yakin ingin mengubah data?"

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

@@ -1,6 +1,7 @@
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";
@@ -19,6 +20,12 @@ export function ModalAddDetailTaskProject({ open, onClose, data, onSubmit }: { o
}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) => {