diff --git a/src/app/api/mobile/division/report/route.ts b/src/app/api/mobile/division/report/route.ts index 873e0af..5b7ae59 100644 --- a/src/app/api/mobile/division/report/route.ts +++ b/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() } } } diff --git a/src/app/api/version-app/route.ts b/src/app/api/version-app/route.ts index 54962f4..bebb874 100644 --- a/src/app/api/version-app/route.ts +++ b/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 });