Merge pull request #257 from bipproduction/amalia/25-september-24

Amalia/25 september 24

src/app/api/division/route.ts

@@ -77,6 +77,9 @@ export async function GET(request: Request) {
                   idUser: true
                }
             }
+         },
+         orderBy: {
+            createdAt: 'desc'
          }
       });
 

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')),
             }

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)
   }
 

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 ?
                      <Skeleton height={45} mt={20} radius={10} />
                      :
-                     <> 
-                     <Text>Tanggal Mulai</Text>
-                     <Group
-                        justify="center"
-                        bg={"white"}
-                        h={45}
-                        style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
-                     >
-                        <Text>{value[0] ? `${moment(value[0]).format('DD-MM-YYYY')}` : ""}</Text>
-                     </Group>
+                     <>
+                        <Text>Tanggal Mulai</Text>
+                        <Group
+                           justify="center"
+                           bg={"white"}
+                           h={45}
+                           style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}
+                        >
+                           <Text>{value[0] ? `${moment(value[0]).format('DD-MM-YYYY')}` : ""}</Text>
+                        </Group>
                      </>
                   }
                </Box>
@@ -164,24 +168,24 @@ export default function EditDetailTaskProject() {
             {loading ?
                <Skeleton height={50} radius={30} />
                :
-            <Button
-               c={"white"}
-               bg={tema.get().utama}
-               size="lg"
-               radius={30}
-               fullWidth
-               onClick={() => {
-                  if (
-                     name !== ""
-                  ) {
-                     setOpenModal(true)
-                  } else {
-                     toast.error("Judul Tidak Boleh Kosong")
-                  }
-               }}
-            >
-               Simpan
-            </Button>
+               <Button
+                  c={"white"}
+                  bg={tema.get().utama}
+                  size="lg"
+                  radius={30}
+                  fullWidth
+                  onClick={() => {
+                     if (
+                        name !== ""
+                     ) {
+                        setOpenModal(true)
+                     } else {
+                        toast.error("Judul Tidak Boleh Kosong")
+                     }
+                  }}
+               >
+                  Simpan
+               </Button>
             }
          </Box>
 

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 {

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 {

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 {

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 {