join #13

Merged
amaliadwiy merged 56 commits from join into staging 2026-02-09 11:12:29 +08:00
43 changed files with 337 additions and 176 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 createdAt: true
}, },
orderBy: { orderBy: {
createdAt: 'asc' dateStart: 'asc'
} }
}) })

View File

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

View File

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

View File

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