diff --git a/src/dashboard/dashboard.dto.ts b/src/dashboard/dashboard.dto.ts index 22d667de53d46fd14fd84d98baa2caf73e92644e..adfb93e0e0a210e077c1704e260e90c164e15e7e 100644 --- a/src/dashboard/dashboard.dto.ts +++ b/src/dashboard/dashboard.dto.ts @@ -78,6 +78,9 @@ export enum DashboardTimTesisStatusEnum { } class GetDashboardTimTesisDataDto { + @ApiProperty() + id_mahasiswa: string; + @ApiProperty() nim_mahasiswa: string; diff --git a/src/dashboard/dashboard.service.ts b/src/dashboard/dashboard.service.ts index 24d107c8e62fb06a6f7964beadac80ad5a325794..29e867e2227ed68513532f4fe109daf7c30fe550 100644 --- a/src/dashboard/dashboard.service.ts +++ b/src/dashboard/dashboard.service.ts @@ -145,10 +145,12 @@ export class DashboardService { { nim: Like(`%${query.search ?? ""}%`), roles: ArrayContains([RoleEnum.S2_MAHASISWA]), + aktif: true, }, { nama: Like(`%${query.search ?? ""}%`), roles: ArrayContains([RoleEnum.S2_MAHASISWA]), + aktif: true, }, ], order: { @@ -284,12 +286,13 @@ export class DashboardService { }); mhsSidangAccepted.forEach(({ pendaftaranTesis: { mahasiswaId } }) => { - mhsStatusMap[mahasiswaId].push(DashboardTimTesisStatusEnum.SEMINAR_2); + mhsStatusMap[mahasiswaId].push(DashboardTimTesisStatusEnum.SIDANG); }); return { maxPage: !!query.limit ? Math.ceil(total / query.limit) : 1, data: foundMahasiswa.map(({ nim, id, nama }) => ({ + id_mahasiswa: id, nim_mahasiswa: nim, nama_mahasiswa: nama, status: mhsStatusMap[id] ?? [],