From b75e45a87f3355b7ad9bed6cdce5c541481268ec Mon Sep 17 00:00:00 2001
From: Rinaldy Adin <16521390@mahasiswa.itb.ac.id>
Date: Mon, 6 May 2024 03:21:52 +0700
Subject: [PATCH] fix: dashboard tim tesis
---
src/dashboard/dashboard.dto.ts | 3 +++
src/dashboard/dashboard.service.ts | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/dashboard/dashboard.dto.ts b/src/dashboard/dashboard.dto.ts
index 22d667d..adfb93e 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 24d107c..29e867e 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] ?? [],
--
GitLab