|
- ๋
ผ๋ฌธ์ ์ถ์ - Dissertion - Submitter - |
-
- ํ๊ณผ - Dept. - |
- - $ํ๊ณผ - | -||
|
- ํ๋ฒ - Student ID - |
- - $ํ๋ฒ - | -
- ์ฑ๋ช
- Name - |
- - $์ด๋ฆ - | -|
|
- ์ฌ์ฌ๊ฒฐ๊ณผ - Result of Evaluation - |
- - ํฉ๊ฒฉ(PASS) - | -- $ํฉ๊ฒฉ - | -- ๋ถํฉ๊ฒฉ(FAIL) - | -- $๋ถํฉ๊ฒฉ - | -|
| - ์ฌ์ฌ์๊ฒฌ( Comments ) - | -
| - $์ฌ์ฌ์๊ฒฌ - | -
- ์์ ๊ฐ์ด ๋ณด๊ณ ํฉ๋๋ค.
- (I hereby report the result.) + + + + + + + + + +
- (I hereby report the result.) + + + + + + + + + +
+
+ ์์ฌํ์ ์ฒญ๊ตฌ๋
ผ๋ฌธ ์๋น์ฌ์ฌ ๋ณด๊ณ ์
+ Report on Pre Defense for Master's Thesis
- + Report on Pre Defense for Master's Thesis
-
- $year๋
$month์ $day์ผ
+
-
\ No newline at end of file
+
+
diff --git a/src/common/utils/convert-html-to-pdf.ts b/src/common/utils/convert-html-to-pdf.ts
new file mode 100644
index 0000000..2b64c5a
--- /dev/null
+++ b/src/common/utils/convert-html-to-pdf.ts
@@ -0,0 +1,42 @@
+import puppeteer from "puppeteer";
+
+export const convertHTMLToPDF = async (html, callback, options = null, puppeteerArgs = null, remoteContent = false) => {
+ if (typeof html !== "string") {
+ throw new Error(
+ "Invalid Argument: HTML expected as type of string and received a value of a different type. Check your request body and request headers."
+ );
+ }
+ let browser;
+ if (puppeteerArgs) {
+ browser = await puppeteer.launch(puppeteerArgs);
+ } else {
+ browser = await puppeteer.launch({
+ executablePath: "/usr/bin/chromium-browser",
+ args: [
+ "--no-sandbox",
+ "--disable-dev-shm-usage",
+ "--allow-file-access-from-files",
+ "--enable-local-file-accesses",
+ ],
+ });
+ }
+
+ const page = await browser.newPage();
+ if (!options) {
+ options = { width: "16.5in", height: "23.4in", preferCSSPageSize: false, printBackground: true };
+ }
+
+ if (remoteContent === true) {
+ await page.goto(`data:text/html;base64,${Buffer.from(html).toString("base64")}`, {
+ waitUntil: "networkidle0",
+ });
+ } else {
+ //page.setContent will be faster than page.goto if html is a static
+ await page.setContent(html);
+ }
+
+ await page.pdf(options).then(callback, function (error) {
+ console.log(error);
+ });
+ await browser.close();
+};
diff --git a/src/common/utils/readable-to-buf.ts b/src/common/utils/readable-to-buf.ts
new file mode 100644
index 0000000..de39955
--- /dev/null
+++ b/src/common/utils/readable-to-buf.ts
@@ -0,0 +1,20 @@
+import internal from "stream";
+
+// readable stream to buffer
+export const readableToBuffer = async (readable: internal.Readable) => {
+ let buffer: Buffer;
+ const chunks = [];
+
+ const streamToBuf = new Promise((resolve) => {
+ readable.on("data", (chunk) => {
+ chunks.push(chunk);
+ });
+ readable.on("end", () => {
+ buffer = Buffer.concat(chunks);
+ resolve(null);
+ });
+ });
+ await streamToBuf;
+
+ return buffer;
+};
diff --git a/src/modules/professors/dtos/create-professor.dto.ts b/src/modules/professors/dtos/create-professor.dto.ts
index ca758f6..40782a1 100644
--- a/src/modules/professors/dtos/create-professor.dto.ts
+++ b/src/modules/professors/dtos/create-professor.dto.ts
@@ -37,7 +37,7 @@ export class CreateProfessorDto {
required: false,
})
@IsOptional()
- @IsNotEmpty({ message: "์ด๋ฉ์ผ์ ์
๋ ฅํด์ฃผ์ธ์." })
+ @IsNotEmpty()
@IsEmail()
@Type(() => String)
email: string;
@@ -48,7 +48,7 @@ export class CreateProfessorDto {
required: false,
})
@IsOptional()
- @IsNotEmpty({ message: "์ฐ๋ฝ์ฒ๋ฅผ ์
๋ ฅํด์ฃผ์ธ์." })
+ @IsNotEmpty()
@IsString()
@IsKoreanPhoneNumber()
@Type(() => String)
@@ -58,7 +58,8 @@ export class CreateProfessorDto {
description: "ํ๊ณผ ์์ด๋",
example: 1,
})
- @IsNotEmpty({ message: "ํ๊ณผ ์์ด๋๋ฅผ ์
๋ ฅํด์ฃผ์ธ์." })
+ @IsOptional()
+ @IsNotEmpty()
@Type(() => Number)
deptId: number;
}
diff --git a/src/modules/professors/dtos/professor.dto.ts b/src/modules/professors/dtos/professor.dto.ts
index f02d367..25544eb 100644
--- a/src/modules/professors/dtos/professor.dto.ts
+++ b/src/modules/professors/dtos/professor.dto.ts
@@ -22,7 +22,7 @@ export class ProfessorDto {
@ApiProperty({ description: "์์ด๋" })
@Type(() => Number)
id: number;
- @ApiProperty({ description: "๋ด์ ๋ฒํธ" })
+ @ApiProperty({ description: "๋ก๊ทธ์ธ ์์ด๋" })
@Type(() => String)
loginId: string;
@ApiProperty({ description: "์ด๋ฆ" })
@@ -43,11 +43,11 @@ export class ProfessorDto {
converDtoToExcelRecord() {
return {
- ๋ด์ ๋ฒํธ: this.loginId,
+ ๋ก๊ทธ์ธ์์ด๋: this.loginId,
์ด๋ฆ: this.name,
์ด๋ฉ์ผ: this.email,
์ฐ๋ฝ์ฒ: this.phone,
- ํ๊ณผ: this.department.name,
+ ํ๊ณผ: this.department ? this.department.name : null,
};
}
}
diff --git a/src/modules/professors/dtos/professors-list-query.dto.ts b/src/modules/professors/dtos/professors-list-query.dto.ts
index b0aee9a..6941fc9 100644
--- a/src/modules/professors/dtos/professors-list-query.dto.ts
+++ b/src/modules/professors/dtos/professors-list-query.dto.ts
@@ -5,7 +5,7 @@ import { PageQuery } from "src/common/dtos/pagination.dto";
export class ProfessorListPaginationQuery extends PageQuery {
// ๋ค์ค ์์์ด ์๋จ....
- @ApiProperty({ description: "์์ด๋", required: false })
+ @ApiProperty({ description: "๋ก๊ทธ์ธ ์์ด๋", required: false })
@IsOptional()
@IsNotEmpty()
@Type(() => String)
@@ -39,7 +39,7 @@ export class ProfessorListPaginationQuery extends PageQuery {
}
export class ProfessorListQuery {
- @ApiProperty({ description: "์์ด๋", required: false })
+ @ApiProperty({ description: "๋ก๊ทธ์ธ ์์ด๋", required: false })
@IsOptional()
@IsNotEmpty()
@Type(() => String)
diff --git a/src/modules/professors/dtos/upload-professor.dto.ts b/src/modules/professors/dtos/upload-professor.dto.ts
index 6982db4..94f2f59 100644
--- a/src/modules/professors/dtos/upload-professor.dto.ts
+++ b/src/modules/professors/dtos/upload-professor.dto.ts
@@ -5,7 +5,7 @@ import { IsKoreanPhoneNumber } from "src/common/decorators/is-kr-phone-number.de
export class UploadProfessorDto {
constructor(excelRecord) {
- this.loginId = excelRecord["๋ด์ ๋ฒํธ"].toString();
+ this.loginId = excelRecord["๋ก๊ทธ์ธ์์ด๋"].toString();
this.name = excelRecord["์ด๋ฆ"];
this.password = excelRecord["๋น๋ฐ๋ฒํธ"] ? excelRecord["๋น๋ฐ๋ฒํธ"].toString() : undefined;
this.email = excelRecord["์ด๋ฉ์ผ"] ? excelRecord["์ด๋ฉ์ผ"].toString() : undefined;
@@ -13,7 +13,7 @@ export class UploadProfessorDto {
this.departmentName = excelRecord["ํ๊ณผ"];
}
- @ApiProperty({ description: "๋ด์ ๋ฒํธ" })
+ @ApiProperty({ description: "๋ก๊ทธ์ธ ์์ด๋" })
@Type(() => String)
loginId: string;
diff --git a/src/modules/professors/professors.service.ts b/src/modules/professors/professors.service.ts
index c1a3b57..646d02f 100644
--- a/src/modules/professors/professors.service.ts
+++ b/src/modules/professors/professors.service.ts
@@ -92,12 +92,13 @@ export class ProfessorsService {
}
}
- const checkDepartment = await this.prismaService.department.findUnique({
- where: { id: deptId },
- });
-
- if (!checkDepartment) {
- throw new BadRequestException("์กด์ฌํ์ง ์๋ ํ๊ณผ์
๋๋ค.");
+ if (deptId) {
+ const checkDepartment = await this.prismaService.department.findUnique({
+ where: { id: deptId },
+ });
+ if (!checkDepartment) {
+ throw new BadRequestException("์กด์ฌํ์ง ์๋ ํ๊ณผ์
๋๋ค.");
+ }
}
try {
@@ -220,12 +221,15 @@ export class ProfessorsService {
professors.map(async (professor, index) => {
const { loginId, name, password, email, phone, departmentName } = professor;
- const dept = await tx.department.findFirst({
- where: { name: departmentName },
- select: { id: true },
- });
+ let dept;
+ if (departmentName) {
+ dept = await tx.department.findFirst({
+ where: { name: departmentName },
+ select: { id: true },
+ });
- if (!dept) throw new BadRequestException(`${index + 2}๋ฒ์งธ ์ค์ ์์ํ๊ณผ๊ฐ ์กด์ฌํ์ง ์์ต๋๋ค.`);
+ if (!dept) throw new BadRequestException(`${index + 2}๋ฒ์งธ ์ค์ ์์ํ๊ณผ๊ฐ ์กด์ฌํ์ง ์์ต๋๋ค.`);
+ }
// ํด๋น ID๊ฐ ์กด์ฌํ ๊ฒฝ์ฐ ์
๋ฐ์ดํธ ์งํ
// ์๋ ๊ฒฝ์ฐ ์์ฑ ์งํ
@@ -269,14 +273,13 @@ export class ProfessorsService {
data: {
name,
phone,
- deptId: dept.id,
+ deptId: dept ? dept.id : undefined,
password: password ? await this.authService.createHash(password) : undefined,
},
include: { department: true },
});
} else {
// ์๋ก ์์ฑํ๋ ์ ์
- if (!departmentName) throw new BadRequestException(`${index + 2}๋ฒ์งธ ์ค์ ์์ํ๊ณผ๋ฅผ ์
๋ ฅํด์ฃผ์ธ์.`);
if (!name) throw new BadRequestException(`${index + 2}๋ฒ์งธ ์ค์ ์ด๋ฆ์ ์
๋ ฅํด์ฃผ์ธ์.`);
if (!password) throw new BadRequestException(`${index + 2}๋ฒ์งธ ์ค์ ๋น๋ฐ๋ฒํธ๋ฅผ ์
๋ ฅํด์ฃผ์ธ์.`);
if (existingEmail)
@@ -295,7 +298,7 @@ export class ProfessorsService {
name,
email,
phone,
- deptId: dept.id,
+ deptId: dept ? dept.id : undefined,
password: await this.authService.createHash(password),
type: UserType.PROFESSOR,
},
diff --git a/src/modules/reviews/reviews.service.ts b/src/modules/reviews/reviews.service.ts
index 67cb188..991fbf9 100644
--- a/src/modules/reviews/reviews.service.ts
+++ b/src/modules/reviews/reviews.service.ts
@@ -20,12 +20,13 @@ import { GetRevisionListResDto } from "./dtos/get-revision-list.res.dto";
import { SearchCurrentReqDto } from "./dtos/search-current.req.dto";
import { MinioClientService } from "src/config/file/minio-client.service";
import { v1 } from "uuid";
-import { readFile, createWriteStream, unlink } from "fs";
-import { create as createPdf } from "html-pdf";
+import { readFile } from "fs";
import * as path from "path";
import * as Zip from "jszip";
import { GetCurrentListResDto } from "./dtos/get-current-list.res.dto";
import { GetResultResDto } from "./dtos/get-result.res.dto";
+import { readableToBuffer } from "src/common/utils/readable-to-buf";
+import { convertHTMLToPDF } from "src/common/utils/convert-html-to-pdf";
@Injectable()
export class ReviewsService {
@@ -64,21 +65,9 @@ export class ReviewsService {
}
async buildResultPdf(tx, reviewId, replacer, isMain) {
- const options = {
- width: "16.5in",
- height: "23.4in",
- orientation: "portrait",
- border: {
- top: "2.8in",
- bottom: "2.8in",
- },
- base: "file:///" + path.resolve("./") + "/",
- localUrlAccess: true,
- };
const fileName = (isMain ? "" : "์๋น") + "์ฌ์ฌ๊ฒฐ๊ณผ๋ณด๊ณ ์_์์.html";
const filePath = path.join("resources", "format", fileName);
try {
- let signPath = "";
return new Promise((resolve, reject) => {
readFile(filePath, "utf8", async (err, formatHtml) => {
if (err) throw new InternalServerErrorException("reading format html file failed: " + filePath);
@@ -177,21 +166,12 @@ export class ReviewsService {
}
} else if (key == "$์๋ช
") {
const readable = await this.minioClientService.getFile(replacer[key]);
- signPath = path.join("resources", "img", "tmp", replacer[key]);
- const writeStream = new Promise((resolve) => {
- const ws = createWriteStream(signPath);
- readable.pipe(ws);
- readable.on("end", () => {
- resolve(null);
- });
- });
- await writeStream;
- formatHtml = formatHtml.replace(key, signPath);
+ const buf = await readableToBuffer(readable);
+ formatHtml = formatHtml.replace(key, `data:image/png;base64, ${buf.toString("base64")}`);
} else {
formatHtml = formatHtml.replace(key, replacer[key]);
}
}
- formatHtml = formatHtml.replaceAll("$row", "");
} else {
for (const key of replacerKeys) {
if (key == "$์ฌ์ฌ์์์ฅ") {
@@ -272,21 +252,19 @@ export class ReviewsService {
}
formatHtml = formatHtml.replaceAll("$row", "");
}
+
const key = v1();
const createdAt = new Date();
- await createPdf(formatHtml, options).toBuffer(async (err, buffer) => {
+ await convertHTMLToPDF(formatHtml, async (pdf) => {
if (err) throw new InternalServerErrorException("Creating PDF Buffer failed!");
await this.minioClientService.uploadFile(
key,
- buffer,
- Buffer.byteLength(buffer),
+ pdf,
+ Buffer.byteLength(pdf),
createdAt,
reviewId.toString() + "_" + fileName.replace(".html", ".pdf"),
"application/pdf"
);
- unlink(signPath, async (err) => {
- if (err) throw new InternalServerErrorException("Deleting temporary img file failed: " + signPath);
- });
});
return resolve(
@@ -308,21 +286,9 @@ export class ReviewsService {
}
async buildReportPdf(tx, reviewId, replacer, isMain) {
- const options = {
- width: "16.5in",
- height: "23.4in",
- orientation: "portrait",
- border: {
- top: "2.8in",
- bottom: "2.8in",
- },
- base: "file:///" + path.resolve("./") + "/",
- localUrlAccess: true,
- };
const fileName = (isMain ? "" : "์๋น") + "์ฌ์ฌ๋ณด๊ณ ์_์์.html";
const filePath = path.join("resources", "format", fileName);
try {
- let signPath = "";
return new Promise((resolve, reject) => {
readFile(filePath, "utf8", async (err, formatHtml) => {
if (err) throw new InternalServerErrorException("reading format html file failed: " + filePath);
@@ -330,36 +296,27 @@ export class ReviewsService {
for (const key of replacerKeys) {
if (key == "$์๋ช
") {
const readable = await this.minioClientService.getFile(replacer[key]);
- signPath = path.join("resources", "img", "tmp", replacer[key]);
- const writeStream = new Promise((resolve) => {
- const ws = createWriteStream(signPath);
- readable.pipe(ws);
- ws.on("close", () => {
- resolve(null);
- });
- });
- await writeStream;
- formatHtml = formatHtml.replace(key, signPath);
+ const buf = await readableToBuffer(readable);
+ formatHtml = formatHtml.replace(key, `data:image/png;base64, ${buf.toString("base64")}`);
} else {
formatHtml = formatHtml.replaceAll(key, replacer[key]);
}
}
+
const key = v1();
const createdAt = new Date();
- await createPdf(formatHtml, options).toBuffer(async (err, buffer) => {
+ await convertHTMLToPDF(formatHtml, async (pdf) => {
if (err) throw new InternalServerErrorException("Creating PDF Buffer failed!");
await this.minioClientService.uploadFile(
key,
- buffer,
- Buffer.byteLength(buffer),
+ pdf,
+ Buffer.byteLength(pdf),
createdAt,
reviewId.toString() + "_" + fileName.replace(".html", ".pdf"),
"application/pdf"
);
- unlink(signPath, async (err) => {
- if (err) throw new InternalServerErrorException("Deleting temporary img file failed: " + signPath);
- });
});
+
return resolve(
await tx.file.create({
data: {
@@ -458,16 +415,16 @@ export class ReviewsService {
...(searchQuery.department && { department: { id: searchQuery.department } }),
},
},
- ...(searchQuery.stage && { stage: searchQuery.stage }),
+ stage: { in: [Stage.MAIN, Stage.PRELIMINARY] },
...(searchQuery.title && { title: { contains: searchQuery.title } }),
},
reviewerId: id,
isFinal: false,
- NOT: {
- thesisInfo: {
- stage: Stage.REVISION,
- },
- },
+ // NOT: {
+ // thesisInfo: {
+ // stage: Stage.REVISION,
+ // },
+ // },
...(statusQuery && statusQuery),
},
include: {
@@ -860,9 +817,9 @@ export class ReviewsService {
},
...(searchQuery.stage && { stage: searchQuery.stage }),
...(searchQuery.title && { title: { contains: searchQuery.title } }),
+ ...(searchQuery.status && { status: searchQuery.status }),
},
isFinal: true,
- ...(searchQuery.status && { status: searchQuery.status }),
},
include: {
reviewer: {
diff --git a/src/modules/students/dtos/create-student.dto.ts b/src/modules/students/dtos/create-student.dto.ts
index d85e8fb..d64f58c 100644
--- a/src/modules/students/dtos/create-student.dto.ts
+++ b/src/modules/students/dtos/create-student.dto.ts
@@ -90,8 +90,8 @@ export class CreateStudentDto {
committeeIds: number[];
// ๋
ผ๋ฌธ ์ ๋ณด
- @ApiProperty({ description: "๋
ผ๋ฌธ ์ ๋ชฉ", example: "๋
ผ๋ฌธ ์ ๋ชฉ ์์" })
- @IsNotEmpty()
+ @ApiProperty({ description: "๋
ผ๋ฌธ ์ ๋ชฉ", example: "๋
ผ๋ฌธ ์ ๋ชฉ ์์", required: false })
+ @IsOptional()
@IsString()
thesisTitle: string;
}
diff --git a/src/modules/students/dtos/update-system.dto.ts b/src/modules/students/dtos/update-system.dto.ts
index f558a82..25fc1a5 100644
--- a/src/modules/students/dtos/update-system.dto.ts
+++ b/src/modules/students/dtos/update-system.dto.ts
@@ -1,6 +1,15 @@
import { ApiProperty } from "@nestjs/swagger";
import { Type } from "class-transformer";
-import { ArrayMaxSize, ArrayMinSize, IsArray, IsInt, IsNotEmpty, IsPositive, IsString } from "class-validator";
+import {
+ ArrayMaxSize,
+ ArrayMinSize,
+ IsArray,
+ IsInt,
+ IsNotEmpty,
+ IsOptional,
+ IsPositive,
+ IsString,
+} from "class-validator";
export class UpdateSystemDto {
// ์ฌ์ฌ ์์ ์ ๋ณด
@@ -30,8 +39,8 @@ export class UpdateSystemDto {
committeeIds: number[];
// ๋
ผ๋ฌธ ์ ๋ณด
- @ApiProperty({ description: "๋
ผ๋ฌธ ์ ๋ชฉ", example: "๋
ผ๋ฌธ ์ ๋ชฉ ์์" })
- @IsNotEmpty()
+ @ApiProperty({ description: "๋
ผ๋ฌธ ์ ๋ชฉ", example: "๋
ผ๋ฌธ ์ ๋ชฉ ์์", required: false })
+ @IsOptional()
@IsString()
thesisTitle: string;
}
diff --git a/src/modules/students/students.controller.ts b/src/modules/students/students.controller.ts
index 5b4274c..75ad21a 100644
--- a/src/modules/students/students.controller.ts
+++ b/src/modules/students/students.controller.ts
@@ -394,4 +394,18 @@ export class StudentsController {
const reviewersDto = new ReviewersDto(headReviewer, advisors, committees);
return new CommonResponseDto(reviewersDto);
}
+
+ @Delete("")
+ @ApiOperation({
+ summary: "ํ์ ๋ชฉ๋ก ์ญ์ ",
+ description: "ํ์ ๋ชฉ๋ก ์ญ์ ",
+ })
+ @UseUserTypeGuard([UserType.ADMIN])
+ @ApiUnauthorizedResponse({ description: "[๊ด๋ฆฌ์] ๋ก๊ทธ์ธ ํ ์ ๊ทผ ๊ฐ๋ฅ" })
+ @ApiInternalServerErrorResponse({ description: "์๋ฒ ๋ด๋ถ ์ค๋ฅ" })
+ async deleteStudentsList() {
+ await this.studentsService.deleteStudentsList();
+
+ return new CommonResponseDto();
+ }
}
diff --git a/src/modules/students/students.service.ts b/src/modules/students/students.service.ts
index 7d27bd7..062a596 100644
--- a/src/modules/students/students.service.ts
+++ b/src/modules/students/students.service.ts
@@ -291,7 +291,7 @@ export class StudentsService {
}
}
- // ๊ต์๋ค ๋ด์ ๋ฒํธ > Id๋ก ๋ณ๊ฒฝ
+ // ๊ต์๋ค ๋ก๊ทธ์ธ์์ด๋ > Id๋ก ๋ณ๊ฒฝ
let advisor1Id: number,
advisor2Id: number,
committee1Id: number,
@@ -299,42 +299,42 @@ export class StudentsService {
headReviewerId: number;
if (advisor1) {
const foundProfessor = await this.prismaService.user.findUnique({
- where: { loginId: advisor1, type: UserType.PROFESSOR, deletedAt: null }, // ๋ด์ ๋ฒํธ ์ฌ์ฉ
+ where: { loginId: advisor1, type: UserType.PROFESSOR, deletedAt: null }, // ๋ก๊ทธ์ธ ์์ด๋ ์ฌ์ฉ
});
if (!foundProfessor)
- throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ด์ ๋ฒํธ ${advisor1}๋ฅผ ํ์ธํ์ญ์์ค.`);
+ throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ก๊ทธ์ธ ์์ด๋ ${advisor1}๋ฅผ ํ์ธํ์ญ์์ค.`);
advisor1Id = foundProfessor.id;
}
if (advisor2) {
const foundProfessor = await this.prismaService.user.findUnique({
- where: { loginId: advisor2, type: UserType.PROFESSOR, deletedAt: null }, // ๋ด์ ๋ฒํธ ์ฌ์ฉ
+ where: { loginId: advisor2, type: UserType.PROFESSOR, deletedAt: null }, // ๋ก๊ทธ์ธ ์์ด๋ ์ฌ์ฉ
});
if (!foundProfessor)
- throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ด์ ๋ฒํธ ${advisor2}๋ฅผ ํ์ธํ์ญ์์ค.`);
+ throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ก๊ทธ์ธ ์์ด๋ ${advisor2}๋ฅผ ํ์ธํ์ญ์์ค.`);
advisor2Id = foundProfessor.id;
}
if (committee1) {
const foundProfessor = await this.prismaService.user.findUnique({
- where: { loginId: committee1, type: UserType.PROFESSOR, deletedAt: null }, // ๋ด์ ๋ฒํธ ์ฌ์ฉ
+ where: { loginId: committee1, type: UserType.PROFESSOR, deletedAt: null }, // ๋ก๊ทธ์ธ ์์ด๋ ์ฌ์ฉ
});
if (!foundProfessor)
- throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ด์ ๋ฒํธ ${committee1}๋ฅผ ํ์ธํ์ญ์์ค.`);
+ throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ก๊ทธ์ธ ์์ด๋ ${committee1}๋ฅผ ํ์ธํ์ญ์์ค.`);
committee1Id = foundProfessor.id;
}
if (committee2) {
const foundProfessor = await this.prismaService.user.findUnique({
- where: { loginId: committee2, type: UserType.PROFESSOR, deletedAt: null }, // ๋ด์ ๋ฒํธ ์ฌ์ฉ
+ where: { loginId: committee2, type: UserType.PROFESSOR, deletedAt: null }, // ๋ก๊ทธ์ธ ์์ด๋ ์ฌ์ฉ
});
if (!foundProfessor)
- throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ด์ ๋ฒํธ ${committee2}๋ฅผ ํ์ธํ์ญ์์ค.`);
+ throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ก๊ทธ์ธ ์์ด๋ ${committee2}๋ฅผ ํ์ธํ์ญ์์ค.`);
committee2Id = foundProfessor.id;
}
if (headReviewer) {
const foundProfessor = await this.prismaService.user.findUnique({
- where: { loginId: headReviewer, type: UserType.PROFESSOR, deletedAt: null }, // ๋ด์ ๋ฒํธ ์ฌ์ฉ
+ where: { loginId: headReviewer, type: UserType.PROFESSOR, deletedAt: null }, // ๋ก๊ทธ์ธ ์์ด๋ ์ฌ์ฉ
});
if (!foundProfessor)
- throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ด์ ๋ฒํธ ${headReviewer}๋ฅผ ํ์ธํ์ญ์์ค.`);
+ throw new BadRequestException(`${index + 2}ํ : ๊ต์ ๋ก๊ทธ์ธ ์์ด๋ ${headReviewer}๋ฅผ ํ์ธํ์ญ์์ค.`);
headReviewerId = foundProfessor.id;
}
@@ -2036,4 +2036,20 @@ export class StudentsService {
.map((reviewerInfo) => reviewerInfo.reviewer);
return { headReviewer, advisors, committees };
}
+
+ async deleteStudentsList() {
+ try {
+ return await this.prismaService.user.updateMany({
+ where: {
+ type: UserType.STUDENT,
+ deletedAt: null,
+ },
+ data: {
+ deletedAt: DateUtil.getCurrentTime().fullDateTime,
+ },
+ });
+ } catch (e) {
+ throw new InternalServerErrorException("ํ์ ๋ชฉ๋ก ์ญ์ ์ ์คํจํ์ต๋๋ค.");
+ }
+ }
}
+
+
+
+
+
+
+
-
- |
+ ๋
ผ๋ฌธ์ ์ถ์ + Dissertion + Submitter + |
+
+ ํ๊ณผ + Dept. + |
+ + $ํ๊ณผ + | +||
|
+ ํ๋ฒ + Student ID + |
+ + $ํ๋ฒ + | +
+ ์ฑ๋ช
+ Name + |
+ + $์ด๋ฆ + | +|
|
+ ์ฌ์ฌ๊ฒฐ๊ณผ + Result of Evaluation + |
+ + ํฉ๊ฒฉ(PASS) + | ++ $ํฉ๊ฒฉ + | ++ ๋ถํฉ๊ฒฉ(FAIL) + | ++ $๋ถํฉ๊ฒฉ + | +|
| + ์ฌ์ฌ์๊ฒฌ( Comments ) + | +
| + $์ฌ์ฌ์๊ฒฌ + | +
+ ์์ ๊ฐ์ด ๋ณด๊ณ ํฉ๋๋ค.
+ (I hereby report the result.)
- + (I hereby report the result.)
- Year Month day
+
+
-
+
+
+ $year๋
$month์ $day์ผ
+
+
+ Year Month day
+
|
+ ์ฌ์ฌ์์ + (Committee Member) + |
+ + $์ฌ์ฌ์์:์ฑ๋ช + | +
+ |
+
|
- ์ฌ์ฌ์์ - (Committee Member) - |
- - $์ฌ์ฌ์์:์ฑ๋ช - | -
- |
-