From 021cb743029f7d7de568ad885b0e03a6ef7382a5 Mon Sep 17 00:00:00 2001 From: amel Date: Wed, 25 Sep 2024 17:02:14 +0800 Subject: [PATCH 1/2] fix: kegiatan Deskripsi: - edit tahapan - hapus console log No Issues --- src/app/api/project/detail/[id]/route.ts | 6 +- .../project/ui/edit_detail_task_project.tsx | 62 ++++++++++--------- .../ui/list_anggota_detail_project.tsx | 1 - .../project/ui/list_file_detail_project.tsx | 1 - .../project/ui/list_tugas_detail_project.tsx | 1 - .../project/ui/progress_detail_project.tsx | 1 - 6 files changed, 37 insertions(+), 35 deletions(-) diff --git a/src/app/api/project/detail/[id]/route.ts b/src/app/api/project/detail/[id]/route.ts index 52f7b22..bdfb0f7 100644 --- a/src/app/api/project/detail/[id]/route.ts +++ b/src/app/api/project/detail/[id]/route.ts @@ -206,7 +206,9 @@ export async function POST(request: Request, context: { params: { id: string } } } const { id } = context.params; - const { name, dateStart, dateEnd } = (await request.json()); + const { title, dateStart, dateEnd } = (await request.json()); + + const dataTask = await prisma.projectTask.count({ where: { @@ -228,7 +230,7 @@ export async function POST(request: Request, context: { params: { id: string } } id }, data: { - title: name, + title, dateStart: new Date(moment(dateStart).format('YYYY-MM-DD')), dateEnd: new Date(moment(dateEnd).format('YYYY-MM-DD')), } diff --git a/src/module/project/ui/edit_detail_task_project.tsx b/src/module/project/ui/edit_detail_task_project.tsx index ce8c9a9..5421bb8 100644 --- a/src/module/project/ui/edit_detail_task_project.tsx +++ b/src/module/project/ui/edit_detail_task_project.tsx @@ -1,5 +1,5 @@ "use client" -import { useParams } from 'next/navigation'; +import { useParams, useRouter } from 'next/navigation'; import React, { useState } from 'react'; import toast from 'react-hot-toast'; import { funEditDetailProject, funGetDetailProject } from '../lib/api_project'; @@ -14,6 +14,7 @@ import { useHookstate } from '@hookstate/core'; export default function EditDetailTaskProject() { const [value, setValue] = useState<[Date | null, Date | null]>([null, null]); const [name, setName] = useState("") + const [idProject, setIdProject] = useState("") const param = useParams<{ id: string }>() const [openModal, setOpenModal] = useState(false) const [loading, setLoading] = useState(true) @@ -21,6 +22,7 @@ export default function EditDetailTaskProject() { const [touched, setTouched] = useState({ title: false, }); + const router = useRouter() async function onSubmit() { if (value[0] == null || value[1] == null) @@ -39,6 +41,7 @@ export default function EditDetailTaskProject() { if (res.success) { toast.success(res.message); + router.push('/project/' + idProject) } else { toast.error(res.message); } @@ -53,6 +56,7 @@ export default function EditDetailTaskProject() { setLoading(true) const res = await funGetDetailProject(param.id); if (res.success) { + setIdProject(res.data.idProject) setName(res.data.title) setValue([ new Date(moment(res.data.dateStart).format('YYYY-MM-DD')), @@ -98,16 +102,16 @@ export default function EditDetailTaskProject() { {loading ? : - <> - Tanggal Mulai - - {value[0] ? `${moment(value[0]).format('DD-MM-YYYY')}` : ""} - + <> + Tanggal Mulai + + {value[0] ? `${moment(value[0]).format('DD-MM-YYYY')}` : ""} + } @@ -164,24 +168,24 @@ export default function EditDetailTaskProject() { {loading ? : - + } diff --git a/src/module/project/ui/list_anggota_detail_project.tsx b/src/module/project/ui/list_anggota_detail_project.tsx index 80a8e01..a02ab60 100644 --- a/src/module/project/ui/list_anggota_detail_project.tsx +++ b/src/module/project/ui/list_anggota_detail_project.tsx @@ -28,7 +28,6 @@ export default function ListAnggotaDetailProject() { async function getOneDataCancel() { try { const res = await funGetOneProjectById(param.id, 'data'); - console.log(res.data) if (res.success) { setReason(res.data.reason); } else { diff --git a/src/module/project/ui/list_file_detail_project.tsx b/src/module/project/ui/list_file_detail_project.tsx index d0628bc..1f99e32 100644 --- a/src/module/project/ui/list_file_detail_project.tsx +++ b/src/module/project/ui/list_file_detail_project.tsx @@ -30,7 +30,6 @@ export default function ListFileDetailProject() { async function getOneDataCancel() { try { const res = await funGetOneProjectById(param.id, 'data'); - console.log(res.data) if (res.success) { setReason(res.data.reason); } else { diff --git a/src/module/project/ui/list_tugas_detail_project.tsx b/src/module/project/ui/list_tugas_detail_project.tsx index 6cf303a..5babd36 100644 --- a/src/module/project/ui/list_tugas_detail_project.tsx +++ b/src/module/project/ui/list_tugas_detail_project.tsx @@ -30,7 +30,6 @@ export default function ListTugasDetailProject() { async function getOneDataCancel() { try { const res = await funGetOneProjectById(param.id, 'data'); - console.log(res.data) if (res.success) { setReason(res.data.reason); } else { diff --git a/src/module/project/ui/progress_detail_project.tsx b/src/module/project/ui/progress_detail_project.tsx index aea3707..c772cc1 100644 --- a/src/module/project/ui/progress_detail_project.tsx +++ b/src/module/project/ui/progress_detail_project.tsx @@ -42,7 +42,6 @@ export default function ProgressDetailProject() { async function getOneDataCancel() { try { const res = await funGetOneProjectById(param.id, 'data'); - console.log(res.data) if (res.success) { setReason(res.data.reason); } else { From 79a487e356355387432f26c7883259644bc6d72d Mon Sep 17 00:00:00 2001 From: amel Date: Wed, 25 Sep 2024 17:36:08 +0800 Subject: [PATCH 2/2] fix : Deskripsi: - laporan divisi grup - order by divisi No Issues --- src/app/api/division/route.ts | 3 +++ src/module/division_new/ui/create_report.tsx | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/app/api/division/route.ts b/src/app/api/division/route.ts index f7be952..5a7e8c4 100644 --- a/src/app/api/division/route.ts +++ b/src/app/api/division/route.ts @@ -77,6 +77,9 @@ export async function GET(request: Request) { idUser: true } } + }, + orderBy: { + createdAt: 'desc' } }); diff --git a/src/module/division_new/ui/create_report.tsx b/src/module/division_new/ui/create_report.tsx index 2dccbc4..766a0ef 100644 --- a/src/module/division_new/ui/create_report.tsx +++ b/src/module/division_new/ui/create_report.tsx @@ -66,13 +66,23 @@ export default function CreateReport() { onReport(val, value) } + if (val == null || val == "") { + setTampil(false) + toast.error("Error! harus memilih grup") + } setIsGroup(String(val)) } function onChangeDate(val: any) { - if (val != null && val != "" && isGroup != "" && isGroup != null) { + if (val != null && val != "" && isGroup != "" && isGroup != "null") { onReport(isGroup, val) } + + if (isGroup == null || isGroup == "") { + setTampil(false) + toast.error("Error! harus memilih grup") + } + setValue(val) }