wibu/sistem-desa-mandiri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-on: #35
This commit is contained in:
amaliadwiy
2026-04-17 17:39:26 +08:00
parent abcbb3cd7f 73b19e0dd1
commit ad6c5157e9
2 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/app/api/mobile/division/report/route.ts
View File

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

2
src/app/api/version-app/route.ts
View File

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