From eb0f34a1566a0f3d091ea4b848cdaaf117825dce Mon Sep 17 00:00:00 2001
From: amel <amel@amel.local>
Date: Mon, 9 Sep 2024 17:06:01 +0800
Subject: [PATCH] upd: fix api

No Issues
---
 src/app/api/calender/route.ts             | 16 ++++++---
 src/app/api/division/[id]/detail/route.ts |  5 ++-
 src/app/api/home/route.ts                 | 42 ++++++++++++++++-------
 src/module/home/ui/list_event.tsx         |  4 +--
 4 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/src/app/api/calender/route.ts b/src/app/api/calender/route.ts
index 0f0210e..8e08d38 100644
--- a/src/app/api/calender/route.ts
+++ b/src/app/api/calender/route.ts
@@ -37,7 +37,7 @@ export async function GET(request: Request) {
                     isActive: true,
                     idDivision: idDivision,
                     dateStart: new Date(String(isDate)),
-                    DivisionCalendar:{
+                    DivisionCalendar: {
                         isActive: true
                     }
                 },
@@ -62,9 +62,17 @@ export async function GET(request: Request) {
                         }
                     }
                 },
-                orderBy: {
-                    createdAt: 'desc'
-                }
+                orderBy: [
+                    {
+                        dateStart: 'asc'
+                    },
+                    {
+                        timeStart: 'asc'
+                    },
+                    {
+                        timeEnd: 'asc'
+                    }
+                ]
             });
 
             const allOmit = data.map((v: any) => ({
diff --git a/src/app/api/division/[id]/detail/route.ts b/src/app/api/division/[id]/detail/route.ts
index c76cb6d..af4fd71 100644
--- a/src/app/api/division/[id]/detail/route.ts
+++ b/src/app/api/division/[id]/detail/route.ts
@@ -58,12 +58,15 @@ export async function GET(request: Request, context: { params: { id: string } })
             }
          })
 
-         const kalender = await prisma.divisionCalendar.count({
+         const kalender = await prisma.divisionCalendarReminder.count({
             where: {
                idDivision: String(id),
                isActive: true,
                dateStart: {
                   lte: new Date()
+               },
+               DivisionCalendar: {
+                  isActive: true
                }
             }
          })
diff --git a/src/app/api/home/route.ts b/src/app/api/home/route.ts
index ef8da4d..765bcb8 100644
--- a/src/app/api/home/route.ts
+++ b/src/app/api/home/route.ts
@@ -242,7 +242,10 @@ export async function GET(request: Request) {
                   Group: {
                      isActive: true,
                   }
-               }
+               },
+               DivisionCalendar: {
+                  isActive: true
+               },
             }
          } else {
             kondisi = {
@@ -250,35 +253,50 @@ export async function GET(request: Request) {
                dateStart: new Date(),
                Division: {
                   idGroup: idGroup
-               }
+               },
+               DivisionCalendar: {
+                  isActive: true
+               },
             }
          }
 
 
-         const data = await prisma.divisionCalendar.findMany({
+         const data = await prisma.divisionCalendarReminder.findMany({
             skip: 0,
             take: 5,
             where: kondisi,
             select: {
                id: true,
-               idDivision: true,
-               title: true,
-               desc: true,
-               status: true,
+               idCalendar: true,
                timeStart: true,
                dateStart: true,
                timeEnd: true,
                dateEnd: true,
                createdAt: true,
-               User: {
+               status: true,
+               DivisionCalendar: {
                   select: {
-                     name: true
+                     title: true,
+                     desc: true,
+                     User: {
+                        select: {
+                           name: true
+                        }
+                     }
                   }
                }
             },
-            orderBy: {
-               createdAt: 'desc'
-            }
+            orderBy: [
+               {
+                  dateStart: 'asc'
+               },
+               {
+                  timeStart: 'asc'
+               },
+               {
+                  timeEnd: 'asc'
+               }
+            ]
          })
 
          allData = data.map((v: any) => ({
diff --git a/src/module/home/ui/list_event.tsx b/src/module/home/ui/list_event.tsx
index d4431b9..0763ab4 100644
--- a/src/module/home/ui/list_event.tsx
+++ b/src/module/home/ui/list_event.tsx
@@ -42,7 +42,7 @@ export default function ListEventHome() {
 
    return (
       <Box pt={10}>
-         <Text c={WARNA.biruTua} mb={10} fw={'bold'} fz={16}>Event Hari Ini</Text>
+         <Text c={WARNA.biruTua} mb={10} fw={'bold'} fz={16}>Acara Hari Ini</Text>
          <Box bg={"white"} style={{
             borderRadius: 10,
             border: `1px solid ${"#D6D8F6"}`,
@@ -60,7 +60,7 @@ export default function ListEventHome() {
                _.isEmpty(isData)
                   ?
                   <Box style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '20vh' }}>
-                     <Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada event</Text>
+                     <Text c="dimmed" ta={"center"} fs={"italic"}>Tidak ada acara</Text>
                   </Box>
                   :
                   isData.map((event, index) => {