From 7092d67973e76283cc6c7d43f4e47dd865ce26ca Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 16 Jul 2024 15:24:43 +0700 Subject: [PATCH] fix report kpi8 --- src/controllers/ReportController.ts | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 1872f03..40292ba 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -1108,7 +1108,15 @@ export class ReportController extends Controller { "isDevelopment70", ], }); - + const dev10text = "การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)"; + const dev20text = "การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)"; + const dev70text = "การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)"; + const combianText = [ + dev10text, + dev20text, + dev70text + ]; + formattedUserDevelopmentLists = userDevelopmentLists.map( (development: any, index: number) => ({ no: Extension.ToThaiNumber((index + 1).toString()), @@ -1119,6 +1127,18 @@ export class ReportController extends Controller { point: development.point ? Extension.ToThaiNumber(development.point.toString()) : null, + pointText: (development.point = 0 + ? development.achievement0 + : (development.point = 5 + ? development.achievement5 + : (development.point = 10 ? development.achievement10 : null))), + isDevelopmentText: [ + development.isDevelopment10, + development.isDevelopment20, + development.isDevelopment70, + ] + .map((x: any, index) => (x ? combianText[index]:null)).filter((x: any) => x !== null) + .join("/"), }), );