From 29660a43ae5f4df58c98bff890d74869254a775b Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Tue, 23 Apr 2024 10:13:12 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A7=20nodeName,=20strategyName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/KpiPlanController.ts | 13 +++++++++++++ src/controllers/KpiRoleController.ts | 7 +++++++ src/controllers/KpiUserPlannedController.ts | 10 +++++++--- src/controllers/KpiUserRoleController.ts | 10 +++++++--- 4 files changed, 34 insertions(+), 6 deletions(-) diff --git a/src/controllers/KpiPlanController.ts b/src/controllers/KpiPlanController.ts index 3b6ef59..f2b0228 100644 --- a/src/controllers/KpiPlanController.ts +++ b/src/controllers/KpiPlanController.ts @@ -195,39 +195,50 @@ export class kpiPlanController extends Controller { } let node = null; let nodeId = null; + let nodeName = null; if (kpiPlan.child4Id != null) { node = 4; nodeId = kpiPlan.child4Id; + nodeName = kpiPlan.child4; } else if (kpiPlan.child3Id != null) { node = 3; nodeId = kpiPlan.child3Id; + nodeName = kpiPlan.child3; } else if (kpiPlan.child2Id != null) { node = 2; nodeId = kpiPlan.child2Id; + nodeName = kpiPlan.child2; } else if (kpiPlan.child1Id != null) { node = 1; nodeId = kpiPlan.child1Id; + nodeName = kpiPlan.child1; } else if (kpiPlan.rootId != null) { node = 0; nodeId = kpiPlan.rootId; + nodeName = kpiPlan.root; } let strategy = null; let strategyId = null; + let strategyName = null; if (kpiPlan.strategyChild5Id != null) { strategy = 5; strategyId = kpiPlan.strategyChild5Id; } else if (kpiPlan.strategyChild4Id != null) { strategy = 4; strategyId = kpiPlan.strategyChild4Id; + strategyName = kpiPlan.strategyChild4; } else if (kpiPlan.strategyChild3Id != null) { strategy = 3; strategyId = kpiPlan.strategyChild3Id; + strategyName = kpiPlan.strategyChild3; } else if (kpiPlan.strategyChild2Id != null) { strategy = 2; strategyId = kpiPlan.strategyChild2Id; + strategyName = kpiPlan.strategyChild2; } else if (kpiPlan.strategyChild1Id != null) { strategy = 1; strategyId = kpiPlan.strategyChild1Id; + strategyName = kpiPlan.strategyChild1; } const formattedData = { id: kpiPlan.id, @@ -248,9 +259,11 @@ export class kpiPlanController extends Controller { formula: kpiPlan.formula, node: node, nodeId: nodeId, + nodeName: nodeName, orgRevisionId: kpiPlan.orgRevisionId, strategy: strategy, strategyId: strategyId, + strategyName: strategyName, }; return new HttpSuccess(formattedData); } diff --git a/src/controllers/KpiRoleController.ts b/src/controllers/KpiRoleController.ts index d806998..eeac789 100644 --- a/src/controllers/KpiRoleController.ts +++ b/src/controllers/KpiRoleController.ts @@ -158,21 +158,27 @@ export class kpiRoleController extends Controller { } let node = null; let nodeId = null; + let nodeName = null; if (kpiRole.child4Id != null) { node = 4; nodeId = kpiRole.child4Id; + nodeName = kpiRole.child4; } else if (kpiRole.child3Id != null) { node = 3; nodeId = kpiRole.child3Id; + nodeName = kpiRole.child3; } else if (kpiRole.child2Id != null) { node = 2; nodeId = kpiRole.child2Id; + nodeName = kpiRole.child2; } else if (kpiRole.child1Id != null) { node = 1; nodeId = kpiRole.child1Id; + nodeName = kpiRole.child1; } else if (kpiRole.rootId != null) { node = 0; nodeId = kpiRole.rootId; + nodeName = kpiRole.root; } const formattedData = { id: kpiRole.id, @@ -193,6 +199,7 @@ export class kpiRoleController extends Controller { formula: kpiRole.formula, node: node, nodeId: nodeId, + nodeName: nodeName, orgRevisionId: kpiRole.orgRevisionId, position: kpiRole.position, }; diff --git a/src/controllers/KpiUserPlannedController.ts b/src/controllers/KpiUserPlannedController.ts index 9d3e0e5..4d1db6c 100644 --- a/src/controllers/KpiUserPlannedController.ts +++ b/src/controllers/KpiUserPlannedController.ts @@ -171,12 +171,16 @@ export class KpiUserPlannedController extends Controller { // } const mapKpiUserPlanned = kpiUserPlanned.map((item) => ({ id: item.id, + evaluationId: item.kpiUserEvaluation.id, indicatorId: item.kpiPlan.id, + includingName: item.kpiPlan.includingName, target: item.target, - unit: item.unit, weight: item.weight, - meaning: item.meaning, - formula: item.formula, + achievement1: item.kpiPlan.achievement1, + achievement2: item.kpiPlan.achievement2, + achievement3: item.kpiPlan.achievement3, + achievement4: item.kpiPlan.achievement4, + achievement5: item.kpiPlan.achievement5, })); return new HttpSuccess(mapKpiUserPlanned); } diff --git a/src/controllers/KpiUserRoleController.ts b/src/controllers/KpiUserRoleController.ts index 30e17ea..a60f12d 100644 --- a/src/controllers/KpiUserRoleController.ts +++ b/src/controllers/KpiUserRoleController.ts @@ -171,12 +171,16 @@ export class KpiUserRoleController extends Controller { // } const mapKpiUserRole = kpiUserRole.map((item) => ({ id: item.id, + evaluationId: item.kpiUserEvaluation.id, indicatorId: item.kpiRole.id, + includingName: item.kpiRole.includingName, target: item.target, - unit: item.unit, weight: item.weight, - meaning: item.meaning, - formula: item.formula, + achievement1: item.kpiRole.achievement1, + achievement2: item.kpiRole.achievement2, + achievement3: item.kpiRole.achievement3, + achievement4: item.kpiRole.achievement4, + achievement5: item.kpiRole.achievement5, })); return new HttpSuccess(mapKpiUserRole); }