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

Merge pull request #260 from bipproduction/amalia/26-september-24

Browse Source 
Amalia/26 september 24
This commit is contained in:
Amalia
2024-09-26 15:27:41 +08:00
committed by GitHub
parent 17e737ed24 4d37248040
commit fea241d3bd
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/api/calender/history/route.ts
View File

@@ -5,7 +5,7 @@ import { funGetUserByCookies } from "@/module/auth";
import { prisma } from "@/module/_global"; import { prisma } from "@/module/_global";
import _ from "lodash"; import _ from "lodash";
// GET HSITORY // GET HISTORY
export async function GET(request: Request) { export async function GET(request: Request) {
try { try {
const user = await funGetUserByCookies() const user = await funGetUserByCookies()
@@ -33,6 +33,9 @@ export async function GET(request: Request) {
where: { where: {
isActive: true, isActive: true,
idDivision: idDivision, idDivision: idDivision,
dateEnd: {
lte: new Date()
},
DivisionCalendar: { DivisionCalendar: {
title: { title: {
contains: (name == undefined || name == "null") ? "" : name, contains: (name == undefined || name == "null") ? "" : name,

3
src/app/api/document/route.ts
View File

@@ -110,6 +110,7 @@ export async function GET(request: Request) {
select: { select: {
DivisionDocumentFolderFile: { DivisionDocumentFolderFile: {
select: { select: {
idStorage: true,
id: true, id: true,
category: true, category: true,
name: true, name: true,
@@ -129,7 +130,7 @@ export async function GET(request: Request) {
formatDataShare = dataShare.map((v: any) => ({ formatDataShare = dataShare.map((v: any) => ({
..._.omit(v, ["DivisionDocumentFolderFile"]), ..._.omit(v, ["DivisionDocumentFolderFile"]),
idStorage: '', idStorage: v.DivisionDocumentFolderFile.idStorage,
id: v.DivisionDocumentFolderFile.id, id: v.DivisionDocumentFolderFile.id,
category: v.DivisionDocumentFolderFile.category, category: v.DivisionDocumentFolderFile.category,
name: v.DivisionDocumentFolderFile.name, name: v.DivisionDocumentFolderFile.name,