From 956134c360c9445b8720ebdca799384815e906da Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 19 Jul 2022 14:40:53 -0700
Subject: [PATCH] IO-1957 Add efficiencies to timetickets scoreboard

---
 bodyshop_translations.babel                   | 21 +++++++++++++++++++
 .../schedule-calendar-header.component.js     |  1 -
 .../scoreboard-timetickets.component.jsx      |  9 +++++++-
 ...scoreboard-timetickets.stats.component.jsx | 12 ++++++++++-
 client/src/graphql/timetickets.queries.js     |  1 +
 client/src/translations/en_us/common.json     |  1 +
 client/src/translations/es/common.json        |  1 +
 client/src/translations/fr/common.json        |  1 +
 8 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bcf0fb69d..45256e2f5 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -41451,6 +41451,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>efficiencyoverperiod</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>jobs</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js
index fbdc59a77..9f41906db 100644
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.js
@@ -37,7 +37,6 @@ export function ScheduleCalendarHeaderComponent({
   ...otherProps
 }) {
   const ATSToday = useMemo(() => {
-    console.log("eeee", events);
     if (!events) return [];
     return _.groupBy(
       events.filter(
diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
index c681ee4ef..29f2bb59f 100644
--- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
+++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.component.jsx
@@ -80,6 +80,7 @@ export default function ScoreboardTimeTickets() {
       totalThisMonth: 0,
       totalLastMonth: 0,
       totalOverPeriod: 0,
+      actualTotalOverPeriod: 0,
       employees: {},
     };
     data.fixedperiod.forEach((ticket) => {
@@ -92,6 +93,7 @@ export default function ScoreboardTimeTickets() {
           totalThisMonth: 0,
           totalLastMonth: 0,
           totalOverPeriod: 0,
+          actualTotalOverPeriod: 0,
         };
       }
 
@@ -182,6 +184,9 @@ export default function ScoreboardTimeTickets() {
           ret.employees[ticket.employee.employee_number].totalOverPeriod =
             ret.employees[ticket.employee.employee_number].totalOverPeriod +
             ticket.productivehrs;
+          ret.employees[ticket.employee.employee_number].actualTotalOverPeriod =
+            ret.employees[ticket.employee.employee_number].actualTotalOverPeriod +
+            (ticket.actualhrs || 0);
 
           if (!totals.employees[ticket.employee.employee_number])
             totals.employees[ticket.employee.employee_number] = {
@@ -219,7 +224,7 @@ export default function ScoreboardTimeTickets() {
     roundObject(ret);
     roundObject(totals);
     roundObject(ret2);
-    console.log(ret);
+
     return {
       fixed: ret,
       timeperiod: {
@@ -231,6 +236,8 @@ export default function ScoreboardTimeTickets() {
     };
   }, [fixedPeriods, data, startDate, endDate]);
 
+  console.log(calculatedData);
+
   if (error) return <AlertComponent message={error.message} type="error" />;
   if (loading) return <LoadingSpinner />;
   return (
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 72f1637b9..439f63743 100644
--- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx
+++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx
@@ -19,7 +19,6 @@ export default connect(
 
 export function ScoreboardTicketsStats({ data, bodyshop }) {
   const { t } = useTranslation();
-  console.log(data);
   const columns = [
     {
       title: t("employees.fields.employee_number"),
@@ -57,6 +56,16 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
       key: "totalOverPeriod",
       sorter: (a, b) => a.totalOverPeriod - b.totalOverPeriod,
     },
+    {
+      title: t("scoreboard.labels.efficiencyoverperiod"),
+      dataIndex: "efficiencyoverperiod",
+      key: "efficiencyoverperiod",
+      render: (text, record) =>
+        `${(
+          (record.totalOverPeriod / (record.actualTotalOverPeriod || 1)) *
+          100
+        ).toFixed(1)} %`,
+    },
   ];
 
   const tableData = data
@@ -112,6 +121,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
         <Col md={24} lg={20}>
           <Table
             columns={columns}
+            rowKey='employee_number'
             dataSource={tableData}
             id="employee_number"
             scroll={{ y: "300px" }}
diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js
index 28df9226d..fd593a003 100644
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -79,6 +79,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       date
       id
       rate
+      actualhrs
       productivehrs
       memo
       jobid
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 7007e80fa..e639faaff 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2461,6 +2461,7 @@
 				"calendarperiod": "Periods based on calendar weeks/months.",
 				"dailyactual": "Actual (D)",
 				"dailytarget": "Daily",
+				"efficiencyoverperiod": "Efficiency over Selected Dates",
 				"jobs": "Jobs",
 				"lastmonth": "Last Month",
 				"lastweek": "Last Week",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 41508420f..d0de45bf3 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2461,6 +2461,7 @@
 				"calendarperiod": "",
 				"dailyactual": "",
 				"dailytarget": "",
+				"efficiencyoverperiod": "",
 				"jobs": "",
 				"lastmonth": "",
 				"lastweek": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index be68ebc77..b1dfc0c2d 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2461,6 +2461,7 @@
 				"calendarperiod": "",
 				"dailyactual": "",
 				"dailytarget": "",
+				"efficiencyoverperiod": "",
 				"jobs": "",
 				"lastmonth": "",
 				"lastweek": "",