From d1b7330b917b9df4bd8fd98b41ad2c869b7af48b Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Wed, 3 Apr 2024 14:11:33 +0700 Subject: [PATCH 1/2] DEV_010 --- .../DevelopmentHistoryController.ts | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/src/controllers/DevelopmentHistoryController.ts b/src/controllers/DevelopmentHistoryController.ts index 8437110..cab66f6 100644 --- a/src/controllers/DevelopmentHistoryController.ts +++ b/src/controllers/DevelopmentHistoryController.ts @@ -208,15 +208,41 @@ export class DevelopmentOfficerHistoryController extends Controller { * * @param {string} id Id โครงการ */ - @Get("{id}") + @Get("{id}") async GetDevelopemtHistoryById(@Path() id: string) { const type = "OFFICER"; const getDevelopment = await this.developmentHistoryRepository.findOne({ + relations: ["development"], where: { id: id, type: type }, }); if (!getDevelopment) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้"); } - return new HttpSuccess(getDevelopment); + + const formattedData = { + rank: getDevelopment.rank ? getDevelopment.rank : null, + prefix: getDevelopment.prefix ? getDevelopment.prefix : null, + firstName: getDevelopment.firstName ? getDevelopment.firstName : null, + lastName: getDevelopment.lastName ? getDevelopment.lastName : null, + citizenId: getDevelopment.citizenId ? getDevelopment.citizenId : null, + position: getDevelopment.position ? getDevelopment.position : null, + posLevelId: getDevelopment.posLevelId ? getDevelopment.posLevelId : null, + posTypeId: getDevelopment.posTypeId ? getDevelopment.posTypeId : null, + developmentId: getDevelopment.developmentId ? getDevelopment.developmentId : null, + order: getDevelopment.order ? getDevelopment.order : null, + dateOrder: getDevelopment.dateOrder ? getDevelopment.dateOrder : null, + year: getDevelopment.development.year ? getDevelopment.development.year : null, + projectName: getDevelopment.development.projectName ? getDevelopment.development.projectName : null, + dateStart: getDevelopment.development.dateStart ? getDevelopment.development.dateStart : null, + dateEnd: getDevelopment.development.dateEnd ? getDevelopment.development.dateEnd : null, + totalDate: getDevelopment.development.totalDate ? getDevelopment.development.totalDate : null, + addressAcademic: getDevelopment.development.addressAcademic ? getDevelopment.development.addressAcademic : null, + topicAcademic: getDevelopment.development.topicAcademic ? getDevelopment.development.topicAcademic : null, + dateStartAcademic: new Date(), + dateEndAcademic: new Date(), + org: null, + }; + + return new HttpSuccess(formattedData); } } From e8a5fa5e42c24730d7bdabd2584664e2e0ef7903 Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Wed, 3 Apr 2024 14:48:59 +0700 Subject: [PATCH 2/2] DEV_10 (EMP) --- .../DevelopmentEmployeeHistoryController.ts | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/controllers/DevelopmentEmployeeHistoryController.ts b/src/controllers/DevelopmentEmployeeHistoryController.ts index d226d0c..6f3f590 100644 --- a/src/controllers/DevelopmentEmployeeHistoryController.ts +++ b/src/controllers/DevelopmentEmployeeHistoryController.ts @@ -216,11 +216,37 @@ export class DevelopmentEmployeeHistoryController extends Controller { async GetDevelopemtHistoryById(@Path() id: string) { const type = "EMPLOYEE"; const getDevelopment = await this.developmentHistoryRepository.findOne({ + relations: ["development"], where: { id: id, type: type }, }); if (!getDevelopment) { throw new HttpError(HttpStatusCode.NOT_FOUND, "ไม่พบข้อมูลประวัติการฝึกอบรม/ดูงานนี้"); } - return new HttpSuccess(getDevelopment); + + const formattedData = { + rank: getDevelopment.rank ? getDevelopment.rank : null, + prefix: getDevelopment.prefix ? getDevelopment.prefix : null, + firstName: getDevelopment.firstName ? getDevelopment.firstName : null, + lastName: getDevelopment.lastName ? getDevelopment.lastName : null, + citizenId: getDevelopment.citizenId ? getDevelopment.citizenId : null, + position: getDevelopment.position ? getDevelopment.position : null, + posLevelId: getDevelopment.posLevelId ? getDevelopment.posLevelId : null, + posTypeId: getDevelopment.posTypeId ? getDevelopment.posTypeId : null, + developmentId: getDevelopment.developmentId ? getDevelopment.developmentId : null, + order: getDevelopment.order ? getDevelopment.order : null, + dateOrder: getDevelopment.dateOrder ? getDevelopment.dateOrder : null, + year: getDevelopment.development.year ? getDevelopment.development.year : null, + projectName: getDevelopment.development.projectName ? getDevelopment.development.projectName : null, + dateStart: getDevelopment.development.dateStart ? getDevelopment.development.dateStart : null, + dateEnd: getDevelopment.development.dateEnd ? getDevelopment.development.dateEnd : null, + totalDate: getDevelopment.development.totalDate ? getDevelopment.development.totalDate : null, + addressAcademic: getDevelopment.development.addressAcademic ? getDevelopment.development.addressAcademic : null, + topicAcademic: getDevelopment.development.topicAcademic ? getDevelopment.development.topicAcademic : null, + dateStartAcademic: new Date(), + dateEndAcademic: new Date(), + org: null, + }; + + return new HttpSuccess(formattedData); } }