diff --git a/src/app.module.ts b/src/app.module.ts index 954b6366eef3e7b377d9be3b448da7831cac5f35..ac61f162e90af37ebb90743288aac6f6060881d9 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -11,9 +11,9 @@ import { Kelas } from "./entities/kelas.entity"; import { MahasiswaKelas } from "./entities/mahasiswaKelas"; import { PengajarKelas } from "./entities/pengajarKelas.entity"; import { PendaftaranTesis } from "./entities/pendaftaranTesis.entity"; -import { Ruangan } from "./entities/ruangan.entity"; +// import { Ruangan } from "./entities/ruangan.entity"; import { Tugas } from "./entities/tugas.entity"; -import { PengujiSidang } from "./entities/pengujiSidsem.entity"; +import { PengujiSidsem } from "./entities/pengujiSidsem.entity"; import { RegistrasiTesisModule } from "./registrasi-tesis/registrasi-tesis.module"; import { ConfigModule } from "@nestjs/config"; import { AuthModule } from "./auth/auth.module"; @@ -54,9 +54,9 @@ import { PendaftaranSidsem } from "./entities/pendaftaranSidsem"; MahasiswaKelas, PengajarKelas, PendaftaranTesis, - Ruangan, + // Ruangan, Tugas, - PengujiSidang, + PengujiSidsem, Konfigurasi, MataKuliah, SubmisiTugas, diff --git a/src/entities/pendaftaranSidsem.ts b/src/entities/pendaftaranSidsem.ts index 12e0b79034e10d8339c81aa8f966a8c5434247dd..a733c9cd7aedf8825202a92c3b509e271486847f 100644 --- a/src/entities/pendaftaranSidsem.ts +++ b/src/entities/pendaftaranSidsem.ts @@ -6,9 +6,9 @@ import { PrimaryGeneratedColumn, } from "typeorm"; import { PendaftaranTesis } from "./pendaftaranTesis.entity"; -import { Ruangan } from "./ruangan.entity"; +// import { Ruangan } from "./ruangan.entity"; import { ApiProperty } from "@nestjs/swagger"; -import { PengujiSidang } from "./pengujiSidsem.entity"; +import { PengujiSidsem } from "./pengujiSidsem.entity"; export enum TipeSidsemEnum { SEMINAR_1 = "SEMINAR_1", @@ -27,11 +27,11 @@ export class PendaftaranSidsem { tipe: TipeSidsemEnum; @ApiProperty() - @Column({ type: "boolean" }) + @Column({ type: "boolean", default: false }) ditolak: boolean; @ApiProperty() - @Column({ type: "boolean" }) + @Column({ type: "boolean", nullable: true }) lulus: boolean; @ApiProperty() @@ -49,10 +49,14 @@ export class PendaftaranSidsem { @ManyToOne(() => PendaftaranTesis, (pendaftaranTesis) => pendaftaranTesis.id) pendaftaranTesis: PendaftaranTesis; - @ApiProperty({ type: Ruangan, nullable: true }) - @ManyToOne(() => Ruangan, (ruangan) => ruangan.id) - ruangan: Ruangan; + // @ApiProperty({ type: Ruangan, nullable: true }) + // @ManyToOne(() => Ruangan, (ruangan) => ruangan.id) + // ruangan: Ruangan; - @OneToMany(() => PengujiSidang, (pengujiSidsem) => pengujiSidsem.sidsem) - penguji: PengujiSidang[]; + @ApiProperty() + @Column({ type: "text", nullable: true }) + ruangan: string; + + @OneToMany(() => PengujiSidsem, (pengujiSidsem) => pengujiSidsem.sidsem) + penguji: PengujiSidsem[]; } diff --git a/src/entities/pengujiSidsem.entity.ts b/src/entities/pengujiSidsem.entity.ts index 9a652b70459a5e4ffcb542ac22032e17a0e7f2ee..09aebe7c16acbb068ae8a26c341b02e996e6a7a3 100644 --- a/src/entities/pengujiSidsem.entity.ts +++ b/src/entities/pengujiSidsem.entity.ts @@ -3,7 +3,7 @@ import { Pengguna } from "./pengguna.entity"; import { PendaftaranSidsem } from "./pendaftaranSidsem"; @Entity() -export class PengujiSidang { +export class PengujiSidsem { @PrimaryGeneratedColumn("uuid") id: string; diff --git a/src/entities/ruangan.entity.ts b/src/entities/ruangan.entity.ts index 0c7683d8265a61cb56fd600d2d0ebe326c54bd90..86dfaf804683751d50f397df3a55f00488dc0bfa 100644 --- a/src/entities/ruangan.entity.ts +++ b/src/entities/ruangan.entity.ts @@ -1,13 +1,13 @@ -import { ApiProperty } from "@nestjs/swagger"; -import { Column, Entity, PrimaryGeneratedColumn } from "typeorm"; +// import { ApiProperty } from "@nestjs/swagger"; +// import { Column, Entity, PrimaryGeneratedColumn } from "typeorm"; -@Entity() -export class Ruangan { - @ApiProperty({ example: "550e8400-e29b-41d4-a716-446655440000" }) - @PrimaryGeneratedColumn("uuid") - id: string; +// @Entity() +// export class Ruangan { +// @ApiProperty({ example: "550e8400-e29b-41d4-a716-446655440000" }) +// @PrimaryGeneratedColumn("uuid") +// id: string; - @ApiProperty() - @Column({ type: "text" }) - nama: string; -} +// @ApiProperty() +// @Column({ type: "text" }) +// nama: string; +// }