Merge pull request 'upd: fix route laporan divisi' (#35) from amalia/17-apr-26 into join

Reviewed-on: #35

src/app/api/mobile/division/report/route.ts

@@ -2,6 +2,7 @@ import { prisma } from "@/module/_global";
 import { funGetUserById } from "@/module/auth";
 import _, { ceil } from "lodash";
 import { NextResponse } from "next/server";
+import moment from "moment";
 
 export async function GET(request: Request) {
    try {
@@ -38,10 +39,10 @@ export async function GET(request: Request) {
                DivisionProjectTask: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date))
+                        gte: moment(String(date)).startOf('day').toDate()
                      },
                      dateEnd: {
-                        lte: new Date(String(dateAkhir))
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -54,10 +55,10 @@ export async function GET(request: Request) {
                DivisionProjectTask: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date))
+                        gte: moment(String(date)).startOf('day').toDate()
                      },
                      dateEnd: {
-                        lte: new Date(String(dateAkhir))
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -102,10 +103,10 @@ export async function GET(request: Request) {
                DivisionProjectTask: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date))
+                        gte: moment(String(date)).startOf('day').toDate()
                      },
                      dateEnd: {
-                        lte: new Date(String(dateAkhir))
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -117,10 +118,10 @@ export async function GET(request: Request) {
                DivisionProjectTask: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date))
+                        gte: moment(String(date)).startOf('day').toDate()
                      },
                      dateEnd: {
-                        lte: new Date(String(dateAkhir))
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -171,8 +172,8 @@ export async function GET(request: Request) {
                   idGroup: String(grup)
                },
                createdAt: {
-                  gte: new Date(String(date)),
-                  lte: new Date(String(dateAkhir))
+                  gte: moment(String(date)).startOf('day').toDate(),
+                  lte: moment(String(dateAkhir)).endOf('day').toDate()
                },
             }
          } else {
@@ -181,8 +182,8 @@ export async function GET(request: Request) {
                category: 'FILE',
                idDivision: String(division),
                createdAt: {
-                  gte: new Date(String(date)),
-                  lte: new Date(String(dateAkhir))
+                  gte: moment(String(date)).startOf('day').toDate(),
+                  lte: moment(String(dateAkhir)).endOf('day').toDate()
                },
             }
          }
@@ -252,8 +253,8 @@ export async function GET(request: Request) {
                DivisionCalendarReminder: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date)),
-                        lte: new Date()
+                        gte: moment(String(date)).startOf('day').toDate(),
+                        lte: moment().toDate()
                      }
                   }
                }
@@ -267,8 +268,8 @@ export async function GET(request: Request) {
                DivisionCalendarReminder: {
                   some: {
                      dateStart: {
-                        gt: new Date(),
-                        lte: new Date(String(dateAkhir))
+                        gt: moment().toDate(),
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }
@@ -293,8 +294,8 @@ export async function GET(request: Request) {
                DivisionCalendarReminder: {
                   some: {
                      dateStart: {
-                        gte: new Date(String(date)),
-                        lte: new Date()
+                        gte: moment(String(date)).startOf('day').toDate(),
+                        lte: moment().toDate()
                      }
                   }
                }
@@ -306,8 +307,8 @@ export async function GET(request: Request) {
                DivisionCalendarReminder: {
                   some: {
                      dateStart: {
-                        gt: new Date(),
-                        lte: new Date(String(dateAkhir))
+                        gt: moment().toDate(),
+                        lte: moment(String(dateAkhir)).endOf('day').toDate()
                      }
                   }
                }

src/app/api/version-app/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 
 export async function GET(request: Request) {
    try {
-      return NextResponse.json({ success: true, version: "2.1.9", tahap: "beta", update: "-api untuk dashboard monitoring" }, { status: 200 });
+      return NextResponse.json({ success: true, version: "2.1.10", tahap: "beta", update: "-perbaikan grafik divisi" }, { status: 200 });
    } catch (error) {
       console.error(error);
       return NextResponse.json({ success: false, version: "Gagal mendapatkan version, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });

src/lib/formatDateTime.ts

@@ -0,0 +1,11 @@
+function formatDateTime(date: Date) {
+  return new Intl.DateTimeFormat('id-ID', {
+    hour: '2-digit',
+    minute: '2-digit',
+    day: '2-digit',
+    month: 'short',
+    year: 'numeric',
+  }).format(date);
+}
+
+export default formatDateTime

src/lib/timeAgo.ts

@@ -0,0 +1,38 @@
+function timeAgo(date: Date) {
+   const now = new Date();
+   const d = new Date(date);
+
+   const diffMs = now.getTime() - d.getTime();
+   const seconds = Math.floor(diffMs / 1000);
+   const minutes = Math.floor(seconds / 60);
+   const hours = Math.floor(minutes / 60);
+
+   // 🔥 cek apakah masih hari yang sama
+   const isToday =
+      now.getDate() === d.getDate() &&
+      now.getMonth() === d.getMonth() &&
+      now.getFullYear() === d.getFullYear();
+
+   if (isToday) {
+      if (seconds < 60) return `${seconds} detik lalu`;
+      if (minutes < 60) return `${minutes} menit lalu`;
+      return `${hours} jam lalu`;
+   }
+
+   // 🔥 kalau bukan hari ini → tampil tanggal + jam
+   const time = d.toLocaleTimeString("id-ID", {
+      hour: "2-digit",
+      minute: "2-digit",
+   });
+
+   const datePart = d.toLocaleDateString("id-ID", {
+      day: "2-digit",
+      month: "short",
+      year: "numeric",
+   });
+
+   return `${time} ${datePart}`;
+}
+
+
+export default timeAgo