From 9c1dc78eedada122717d9c3729beb103b418a60c Mon Sep 17 00:00:00 2001 From: AdisakKanthawilang Date: Mon, 20 Jan 2025 13:23:31 +0700 Subject: [PATCH] reformat code --- src/controllers/ReportController.ts | 59 ++++++----------------------- 1 file changed, 11 insertions(+), 48 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index 95e852c..4a5a689 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -129,7 +129,6 @@ export class ReportController extends Controller { strategy: Strategy[]; } - // สมมติว่า 'resultAllStrategy' ถูกกำหนดไว้แล้วและมีข้อมูลที่คุณให้มา const groupedData: GroupedData[] = resultAllStrategy.reduce((acc: GroupedData[], item) => { const existingRoot = acc.find(entry => entry.rootId === item.rootId); @@ -168,7 +167,6 @@ export class ReportController extends Controller { return acc; }, []); - // ตอนนี้คุณสามารถ map ข้อมูลใน 'groupedData' เพื่อสร้าง 'formattedData' ได้แล้ว const reformattedData = groupedData.map((group,x) => { const formattedGroup = { rowNo: x?Extension.ToThaiNumber((x + 1).toString()):Extension.ToThaiNumber("๑"), @@ -189,58 +187,23 @@ export class ReportController extends Controller { }; return { - [`strategyName${index + 1}`]: strategy.strategyName ?? "0", - [`devCount${index + 1}`]: strategy.devCount ?? "0", - [`target${index + 1}`]: "0", - [`receiveBudget${index + 1}`]: strategy.receiveBudget ?? "0", - [`sumDev${index + 1}`]: strategy.sumDev ?? "0", - [`sumTraget${index + 1}`]: strategy.sumTraget ?? "0", - [`sumBudget${index + 1}`]: strategy.sumBudget ?? "0", - [`sumRowDev`]: strategy.sumRowDev ?? "0", - [`sumRowTarget`]: strategy.sumRowTarget ?? "0", - [`sumRowBudget`]: strategy.sumRowBudget ?? "0", - }; + [`strategyName${index + 1}`]: strategy.strategyName ?? "", + [`devCount${index + 1}`]: strategy.devCount ?? "", + [`target${index + 1}`]: "", + [`receiveBudget${index + 1}`]: strategy.receiveBudget ?? "", + [`sumDev${index + 1}`]: strategy.sumDev ?? "", + [`sumTraget${index + 1}`]: strategy.sumTraget ?? "", + [`sumBudget${index + 1}`]: strategy.sumBudget ?? "", + [`sumRowDev`]: strategy.sumRowDev ?? "", + [`sumRowTarget`]: strategy.sumRowTarget ?? "", + [`sumRowBudget`]: strategy.sumRowBudget ?? "", + }; }), }; return formattedGroup; }); - - // const fmdata = reformattedData.map(rfmData => { - // return { - // rowNo: rfmData.rowNo, - // rootId: rfmData.rootId, - // root: rfmData.root, - // strategy: [ - // { - // strategyName1: rfmData.strategy[0].strategyName1, - // devCount1: rfmData.strategy[0].devCount1, - // target1: rfmData.strategy[0].target1, - // receiveBudget1: rfmData.strategy[0].receiveBudget1 - // }, - // { - // strategyName2: rfmData.strategy[1].strategyName2, - // devCount2: rfmData.strategy[1].devCount2, - // target2: rfmData.strategy[1].target2, - // receiveBudget2: rfmData.strategy[1].receiveBudget2 - // }, - // { - // strategyName3: rfmData.strategy[2].strategyName3, - // devCount3: rfmData.strategy[2].devCount3, - // target3: rfmData.strategy[2].target3, - // receiveBudget3: rfmData.strategy[2].receiveBudget3 - // }, - // { - // strategyName4: rfmData.strategy[3].strategyName4, - // devCount4: rfmData.strategy[3].devCount4, - // target4: rfmData.strategy[3].target4, - // receiveBudget4: rfmData.strategy[3].receiveBudget4 - // } - // ], - // }; - // }); - return new HttpSuccess({ template: "development", reportName: "development",