amalia/16-okt-25 #1

Merged
amaliadwiy merged 25 commits from amalia/16-okt-25 into join 2025-10-27 11:00:00 +08:00
11 changed files with 86 additions and 20 deletions
Showing only changes of commit 150151e823 - Show all commits

View File

@@ -71,7 +71,7 @@ export async function GET(request: Request, context: { params: { id: string } })
createdAt: true
},
orderBy: {
createdAt: 'asc'
dateStart: 'asc'
}
})

View File

@@ -76,7 +76,7 @@ export async function GET(request: Request, context: { params: { id: string } })
dateEnd: true,
},
orderBy: {
createdAt: 'asc'
dateStart: 'asc'
}
})

View File

@@ -68,7 +68,7 @@ export async function GET(request: Request, context: { params: { id: string } })
createdAt: true
},
orderBy: {
createdAt: 'asc'
dateStart: 'asc'
}
})
@@ -78,8 +78,8 @@ export async function GET(request: Request, context: { params: { id: string } })
dateEnd: moment(v.dateEnd).format("DD-MM-YYYY"),
createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"),
}))
const dataFix = _.orderBy(formatData, 'createdAt', 'asc')
allData = dataFix
// const dataFix = _.orderBy(formatData, 'createdAt', 'asc')
allData = formatData
} else if (kategori == "file") {
const dataFile = await prisma.projectFile.findMany({

View File

@@ -75,7 +75,7 @@ export async function GET(request: Request, context: { params: { id: string } })
dateEnd: true,
},
orderBy: {
createdAt: 'asc'
dateStart: 'asc'
}
})