From d7b0e3046b6b0e8b9dc87db5fa5e9375734e3009 Mon Sep 17 00:00:00 2001 From: swtmply Date: Sat, 15 Apr 2023 03:26:56 +0800 Subject: [PATCH] IO-2240 Adjusted calculation for total efficiency --- .../scoreboard-timetickets.component.jsx | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx index 1b6fae085..dbcd92f55 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx @@ -224,17 +224,18 @@ export default function ScoreboardTimeTickets() { ret2.push(r); }); - // Add total efficiency of employees - ret.totalEffieciencyOverPeriod = Object.keys(ret.employees) - .map((key) => { - return { employee_number: key, ...ret.employees[key] }; - }) - .map((e) => - ((e.totalOverPeriod / (e.actualTotalOverPeriod || 0.1)) * 100).toFixed( - 1 - ) - ) - .reduce((acc, prev) => acc + Number(prev), 0); + // Add combined efficiency of employees // 454.7% + ret.totalEffieciencyOverPeriod = ( + (Object.keys(ret.employees).reduce( + (acc, key) => acc + ret.employees[key].totalOverPeriod, + 0 + ) / + (Object.keys(ret.employees).reduce( + (acc, key) => acc + ret.employees[key].actualTotalOverPeriod, + 0 + ) || 0.1)) * + 100 + ).toFixed(1); roundObject(ret); roundObject(totals);