From 46cfd0fbc55ab552d01c5f1ec8d327d31b7722f4 Mon Sep 17 00:00:00 2001
From: amel <amel@amel.local>
Date: Fri, 27 Sep 2024 12:04:14 +0800
Subject: [PATCH] upd

Deskripsi:
- tugas hari ini di halaman detail divisi

No Issues
---
 src/app/api/division/[id]/detail/route.ts    | 22 ++++++++++++++++----
 src/module/division_new/lib/type_division.ts |  3 ++-
 src/module/division_new/ui/list_task.tsx     |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/app/api/division/[id]/detail/route.ts b/src/app/api/division/[id]/detail/route.ts
index 1f8d403..730e272 100644
--- a/src/app/api/division/[id]/detail/route.ts
+++ b/src/app/api/division/[id]/detail/route.ts
@@ -86,7 +86,12 @@ export async function GET(request: Request, context: { params: { id: string } })
                idDivision: String(id),
                status: 0,
                isActive: true,
-               dateStart: new Date(),
+               dateStart: {
+                  lte: new Date()
+               },
+               dateEnd: {
+                  gte: new Date()
+               },
                DivisionProject: {
                   status: {
                      lt: 3
@@ -98,13 +103,22 @@ export async function GET(request: Request, context: { params: { id: string } })
                title: true,
                dateStart: true,
                dateEnd: true,
+               DivisionProject: {
+                  select: {
+                     title: true
+                  }
+               }
+            },
+            orderBy: {
+               dateEnd: "asc"
             }
          })
 
          allData = tugas.map((v: any) => ({
-            ..._.omit(v, ["dateStart", "dateEnd"]),
-            dateStart: moment(v.dateStart).format("LL"),
-            dateEnd: moment(v.dateEnd).format("LL")
+            ..._.omit(v, ["dateStart", "dateEnd", "DivisionProject"]),
+            dateStart: moment(v.dateStart).format("ll"),
+            dateEnd: moment(v.dateEnd).format("ll"),
+            projectTitle: v.DivisionProject.title
          }))
       } else if (kategori == "new-file") {
          allData = await prisma.divisionDocumentFolderFile.findMany({
diff --git a/src/module/division_new/lib/type_division.ts b/src/module/division_new/lib/type_division.ts
index 6487148..4bd051a 100644
--- a/src/module/division_new/lib/type_division.ts
+++ b/src/module/division_new/lib/type_division.ts
@@ -33,7 +33,8 @@ export interface IDataTaskOnDetailDivision {
    id: string,
    title: string,
    dateStart: string,
-   dateEnd: string
+   dateEnd: string,
+   projectTitle: string
 }
 
 export interface IDataKalenderOnDetailDivision {
diff --git a/src/module/division_new/ui/list_task.tsx b/src/module/division_new/ui/list_task.tsx
index 9ae596f..b989569 100644
--- a/src/module/division_new/ui/list_task.tsx
+++ b/src/module/division_new/ui/list_task.tsx
@@ -73,11 +73,11 @@ export default function ListTaskOnDetailDivision() {
                      base: isMobile ? 230 : 300,
                      md: 400
                   }} onClick={() => router.push(`/task/${v.id}`)} bg={"white"}  style={{ borderRadius: 10, border: `1px solid ${"#D6D8F6"}` }}>
-                     <Text fw={'bold'} c={tema.get().utama} lineClamp={1}>{_.startCase(v.title)}</Text>
+                     <Text fw={'bold'} c={tema.get().utama} lineClamp={1}>{v.title+' - '+ v.projectTitle}</Text>
                      <Group justify="space-between" mt={20}>
                         <Group gap={5} align="center">
                            <CiClock2 size={18} />
-                           <Text fz={13}>{v.dateStart}</Text>
+                           <Text fz={13}>{v.dateStart} - {v.dateEnd}</Text>
                         </Group >
                      </Group>
                   </Box>