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

Merge pull request #336 from bipproduction/amalia/12-nov-24

Browse Source 
Amalia/12 nov 24
This commit is contained in:
Amalia
2024-11-12 11:47:17 +08:00
committed by GitHub
parent 63a8d3cbd6 3b17339221
commit eb19425bee
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,8 +142,8 @@ export async function GET(request: Request) {
extension: v.DivisionDocumentFolderFile.extension, extension: v.DivisionDocumentFolderFile.extension,
path: v.DivisionDocumentFolderFile.path, path: v.DivisionDocumentFolderFile.path,
createdBy: v.DivisionDocumentFolderFile.User.name, createdBy: v.DivisionDocumentFolderFile.User.name,
createdAt: moment(v.DivisionDocumentFolderFile.createdAt).format("DD-MM-YYYY HH:mm"), createdAt: v.DivisionDocumentFolderFile.createdAt,
updatedAt: moment(v.DivisionDocumentFolderFile.updatedAt).format("DD-MM-YYYY HH:mm"), updatedAt: v.DivisionDocumentFolderFile.updatedAt,
share: true share: true
})) }))
@@ -181,8 +181,8 @@ export async function GET(request: Request) {
const allData = data.map((v: any) => ({ const allData = data.map((v: any) => ({
..._.omit(v, ["User", "createdAt", "updatedAt"]), ..._.omit(v, ["User", "createdAt", "updatedAt"]),
createdBy: v.User.name, createdBy: v.User.name,
createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"), createdAt: v.createdAt,
updatedAt: moment(v.updatedAt).format("DD-MM-YYYY HH:mm"), updatedAt: v.updatedAt,
share: false share: false
})) }))
@@ -190,7 +190,13 @@ export async function GET(request: Request) {
allData.push(...formatDataShare) allData.push(...formatDataShare)
} }
const formatData = _.orderBy(allData, ['category', 'createdAt'], ['desc', 'asc']); const formatData = _.orderBy(allData, ['category', 'createdAt'], ['desc', 'desc']);
const fixData = formatData.map((v: any) => ({
..._.omit(v, ["createdAt", "updatedAt"]),
createdAt: moment(v.createdAt).format("DD-MM-YYYY HH:mm"),
updatedAt: moment(v.updatedAt).format("DD-MM-YYYY HH:mm"),
}))
let pathNow = path let pathNow = path
let jalur = [] let jalur = []
@@ -221,7 +227,7 @@ export async function GET(request: Request) {
jalur.push({ id: 'home', name: 'home' }) jalur.push({ id: 'home', name: 'home' })
jalur = [...jalur].reverse() jalur = [...jalur].reverse()
return NextResponse.json({ success: true, message: "Berhasil mendapatkan item", data: formatData, jalur }, { status: 200 }); return NextResponse.json({ success: true, message: "Berhasil mendapatkan item", data: fixData, jalur }, { status: 200 });
} catch (error) { } catch (error) {
console.error(error); console.error(error);

7
src/app/api/position/route.ts
View File

@@ -68,11 +68,14 @@ export async function GET(request: Request) {
}); });
const allData = positions.map((v: any) => ({ const allData = positions.map((v: any) => ({
..._.omit(v, ["Group"]), ..._.omit(v, ["Group", "name"]),
name: v.name,
group: v.Group.name group: v.Group.name
})) }))
return NextResponse.json({ success: true, message: "Berhasil mendapatkan jabatan", data: allData, filter }, { status: 200 }); const dataFix = _.orderBy(allData, [data => data.name.toLowerCase()], ['asc']);
return NextResponse.json({ success: true, message: "Berhasil mendapatkan jabatan", data: dataFix, filter }, { status: 200 });
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return NextResponse.json({ success: false, message: "Gagal mendapatkan jabatan, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 }); return NextResponse.json({ success: false, message: "Gagal mendapatkan jabatan, coba lagi nanti (error: 500)", reason: (error as Error).message, }, { status: 500 });