From 262a2056bc6fbe25477b124353dfefffbb32bd07 Mon Sep 17 00:00:00 2001
From: Rinaldy Adin <16521390@mahasiswa.itb.ac.id>
Date: Sun, 5 May 2024 23:15:53 +0700
Subject: [PATCH] feat: check based on sidsem status
---
src/dashboard/dashboard.module.ts | 15 +++++++++++----
src/dashboard/dashboard.service.ts | 7 ++++---
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/dashboard/dashboard.module.ts b/src/dashboard/dashboard.module.ts
index 4f310dc..ad95d2f 100644
--- a/src/dashboard/dashboard.module.ts
+++ b/src/dashboard/dashboard.module.ts
@@ -1,14 +1,21 @@
import { Module } from "@nestjs/common";
import { TypeOrmModule } from "@nestjs/typeorm";
-import { DashboardController } from "./dashboard.controller";
-import { DashboardService } from "./dashboard.service";
+import { BimbinganModule } from "src/bimbingan/bimbingan.module";
+import { DosenBimbingan } from "src/entities/dosenBimbingan.entity";
+import { PendaftaranSidsem } from "src/entities/pendaftaranSidsem";
import { PendaftaranTesis } from "../entities/pendaftaranTesis.entity";
import { Pengguna } from "../entities/pengguna.entity";
-import { BimbinganModule } from "src/bimbingan/bimbingan.module";
+import { DashboardController } from "./dashboard.controller";
+import { DashboardService } from "./dashboard.service";
@Module({
imports: [
- TypeOrmModule.forFeature([PendaftaranTesis, Pengguna]),
+ TypeOrmModule.forFeature([
+ PendaftaranTesis,
+ Pengguna,
+ PendaftaranSidsem,
+ DosenBimbingan,
+ ]),
BimbinganModule,
],
controllers: [DashboardController],
diff --git a/src/dashboard/dashboard.service.ts b/src/dashboard/dashboard.service.ts
index 80fe742..24d107c 100644
--- a/src/dashboard/dashboard.service.ts
+++ b/src/dashboard/dashboard.service.ts
@@ -4,6 +4,7 @@ import { BimbinganService } from "src/bimbingan/bimbingan.service";
import { DosenBimbingan } from "src/entities/dosenBimbingan.entity";
import {
PendaftaranSidsem,
+ SidsemStatus,
TipeSidsemEnum,
} from "src/entities/pendaftaranSidsem";
import { ArrayContains, Brackets, In, Like, Repository } from "typeorm";
@@ -199,7 +200,7 @@ export class DashboardService {
},
where: {
tipe: TipeSidsemEnum.SEMINAR_1,
- ditolak: false,
+ status: SidsemStatus.APPROVED,
pendaftaranTesis: {
mahasiswaId: In(foundMahasiswa.map(({ id }) => id)),
},
@@ -217,7 +218,7 @@ export class DashboardService {
},
where: {
tipe: TipeSidsemEnum.SEMINAR_2,
- ditolak: false,
+ status: SidsemStatus.APPROVED,
pendaftaranTesis: {
mahasiswaId: In(foundMahasiswa.map(({ id }) => id)),
},
@@ -235,7 +236,7 @@ export class DashboardService {
},
where: {
tipe: TipeSidsemEnum.SIDANG,
- ditolak: false,
+ status: SidsemStatus.APPROVED,
pendaftaranTesis: {
mahasiswaId: In(foundMahasiswa.map(({ id }) => id)),
},
--
GitLab