From 0e06b449cbe6676616a9b8c73df9d1658d9bf2dc Mon Sep 17 00:00:00 2001 From: swtmply Date: Sat, 15 Apr 2023 01:18:29 +0800 Subject: [PATCH] IO-2240 Adjusted the location of the calculation --- .../scoreboard-timetickets.component.jsx | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx index 23a009722..1b6fae085 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx @@ -219,23 +219,23 @@ export default function ScoreboardTimeTickets() { r.employees[ticket.employee.employee_number].actual + ticket.actualhrs; }); - - // 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); } 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); + roundObject(ret); roundObject(totals); roundObject(ret2);