diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx index 6f3f53a42..23a009722 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx @@ -81,6 +81,7 @@ export default function ScoreboardTimeTickets() { totalLastMonth: 0, totalOverPeriod: 0, actualTotalOverPeriod: 0, + totalEffieciencyOverPeriod: 0, employees: {}, }; data.fixedperiod.forEach((ticket) => { @@ -94,6 +95,7 @@ export default function ScoreboardTimeTickets() { totalLastMonth: 0, totalOverPeriod: 0, actualTotalOverPeriod: 0, + totalEffieciencyOverPeriod: 0, }; } @@ -217,6 +219,19 @@ 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); diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx index 3a25d4957..e31cec3af 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx @@ -1,5 +1,5 @@ import { Card, Col, Row, Statistic, Table, Typography } from "antd"; -import React, { useMemo } from "react"; +import React from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; @@ -74,23 +74,6 @@ export function ScoreboardTicketsStats({ data, bodyshop }) { }) : []; - const totalEffieciencyOverPeriod = useMemo( - () => - Object.keys(data?.employees ?? []) - .map((key) => { - return { employee_number: key, ...data.employees[key] }; - }) - .map((e) => - ( - (e.totalOverPeriod / (e.actualTotalOverPeriod || 0.1)) * - 100 - ).toFixed(1) - ) - .reduce((acc, prev) => acc + Number(prev), 0) - .toFixed(1), - [data] - ); - return ( @@ -133,7 +116,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {