From 9526799ec047d5a6590116ab85c4d7becc964522 Mon Sep 17 00:00:00 2001 From: Bright Date: Fri, 12 Jul 2024 11:51:27 +0700 Subject: [PATCH] fix report kpi8 --- src/controllers/ReportController.ts | 51 +++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 3 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 2f7de29..87cfc17 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -971,6 +971,15 @@ export class ReportController extends Controller { const target_ = await this.kpiUserDevelopmentRepository.findOne({ where: { kpiUserEvaluationId: x.id }, }); + const isDev70 = target_ && target_?.isDevelopment70 === true + ? "ðŸ—đ 70 āļāļēāļĢāļĨāļ‡āļĄāļ·āļ­āļ›āļāļīāļšāļąāļ•āļī (āđ‚āļ”āļĒāļœāļđāđ‰āļšāļąāļ‡āļ„āļąāļšāļšāļąāļāļŠāļēāļĄāļ­āļšāļŦāļĄāļēāļĒ)" + : "" + const isDev20 = target_ && target_?.isDevelopment20 === true + ? "ðŸ—đ 20 āļāļēāļĢāđ€āļĢāļĩāļĒāļ™āļĢāļđāđ‰āļˆāļēāļāļœāļđāđ‰āļ­āļ·āđˆāļ™ (Coach/Mentor/Consulting)" + : "" + const isDev10 = target_ && target_?.isDevelopment10 === true + ? "ðŸ—đ 10 āļāļēāļĢāļāļķāļāļ­āļšāļĢāļĄāļ­āļ·āđˆāļ™āđ†" + : "" return { no: Extension.ToThaiNumber((idx + 1).toString()), fullName: `${x.prefix}${x.firstName} ${x.lastName}`, @@ -981,6 +990,9 @@ export class ReportController extends Controller { target: target_ ? target_.target : "", timeEvaluator: x.timeEvaluator ? Extension.ToThaiNumber(x.timeEvaluator) : "", developResults: "", //āļ§āļīāļ˜āļĩāļāļēāļĢāļ§āļąāļ”āļœāļĨāļāļēāļĢāļžāļąāļ’āļ™āļē + isDev70, + isDev20, + isDev10, evaluationResults: x.evaluationResults ? Extension.EvaluationResult(x.evaluationResults) : "", @@ -1063,17 +1075,50 @@ export class ReportController extends Controller { const affiliation = fullNameParts .filter((part) => part !== undefined && part !== null) .join("/"); + const period_ = await this.kpiPeriodRepository.findOne({ + where: { id: String(requestBody.periodId) } + }) + if(period_ && !period1 && !period2) { + if(period_?.durationKPI === "APR") { + period1 = `${Extension.ToThaiFullDate2(period_.startDate)} āļ–āļķāļ‡ ${Extension.ToThaiFullDate2(period_.endDate)}`; + let _period2 = await this.kpiPeriodRepository.findOne({ + where: { + year: period_.year, + durationKPI: "OCT", + isActive: true, + }, + }); + period2 = _period2 + ? `${Extension.ToThaiFullDate2(_period2?.startDate)} āļ–āļķāļ‡ ${Extension.ToThaiFullDate2(_period2?.endDate)}` + : ""; + } + else if (period_?.durationKPI === "OCT"){ + period2 = `${Extension.ToThaiFullDate2(period_.startDate)} āļ–āļķāļ‡ ${Extension.ToThaiFullDate2(period_.endDate)}`; + let _period1 = await this.kpiPeriodRepository.findOne({ + where: { + year: period_.year, + durationKPI: "APR", + isActive: true, + }, + }); + period1 = _period1 + ? `${Extension.ToThaiFullDate2(_period1?.startDate)} āļ–āļķāļ‡ ${Extension.ToThaiFullDate2(_period1?.endDate)}` + : ""; + } + } + formattedData = { fullName: userInfo ? userInfo[0]?.prefix + userInfo[0]?.firstName + " " + userInfo[0]?.lastName : null, affiliation: affiliation ?? null, - durationKPI: data?.durationKPI ?? null, + // durationKPI: data?.durationKPI ?? null, + durationKPI: period_ ? period_.durationKPI : null, position: userInfo ? userInfo[0]?.position : null, posType: userInfo ? userInfo[0]?.posTypeName : null, posLevel: userInfo ? userInfo[0]?.posLevelName : null, - period1: Extension.ToThaiNumber(period1), - period2: Extension.ToThaiNumber(period2), + period1: period1 ? Extension.ToThaiNumber(period1) : "-", + period2: period2 ? Extension.ToThaiNumber(period2) : "-", developments: formattedUserDevelopmentLists.length > 0 ? formattedUserDevelopmentLists : [{}], };