From f3714cea1e9090d1ab769c8da8917953cabef519 Mon Sep 17 00:00:00 2001
From: swtmply <delosreyesjohnallen@gmail.com>
Date: Wed, 12 Apr 2023 03:13:19 +0800
Subject: [PATCH] IO-2239 Added totals on cards in job scoreboards

---
 .../scoreboard-day-stats.component.jsx        |  6 +++
 .../scoreboard-targets-table.component.jsx    | 48 +++++++++++++++++--
 client/src/translations/en_us/common.json     |  1 +
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx b/client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx
index 36b4a028b..497eab209 100644
--- a/client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx
+++ b/client/src/components/scoreboard-day-stats/scoreboard-day-stats.component.jsx
@@ -4,6 +4,7 @@ import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -13,6 +14,7 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ScoreboardDayStats({ bodyshop, date, entries }) {
   const { dailyPaintTarget, dailyBodyTarget } = bodyshop.scoreboard_target;
+  const { t } = useTranslation();
 
   //let totalHrs = 0;
   const paintHrs = entries.reduce((acc, value) => {
@@ -41,6 +43,10 @@ export function ScoreboardDayStats({ bodyshop, date, entries }) {
         label="P"
         value={paintHrs.toFixed(1)}
       />
+      <Statistic
+        title={t("general.labels.total")}
+        value={(bodyHrs + paintHrs).toFixed(1)}
+      />
     </Card>
   );
 }
diff --git a/client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx b/client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx
index 6f22b3b8a..558b217b6 100644
--- a/client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx
+++ b/client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx
@@ -184,14 +184,56 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) {
                 value={(values.todayPaint + values.todayBody).toFixed(1)}
               />
             </Col>
-            <Col {...statSpans}></Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("general.labels.total")}
+                value={(
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.WeeklyTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
             <Col {...statSpans}>
               <Statistic
                 value={(values.weeklyPaint + values.weeklyBody).toFixed(1)}
               />
             </Col>
-            <Col {...statSpans}></Col>
-            <Col {...statSpans}></Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("general.labels.total")}
+                value={(
+                  Util.MonthlyTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.MonthlyTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
+            <Col {...statSpans}>
+              <Statistic
+                title={t("general.labels.total")}
+                value={(
+                  Util.AsOfTodayTargetHrs(
+                    bodyshop.scoreboard_target.dailyBodyTarget,
+                    bodyshop
+                  ) +
+                  Util.AsOfTodayTargetHrs(
+                    bodyshop.scoreboard_target.dailyPaintTarget,
+                    bodyshop
+                  )
+                ).toFixed(1)}
+              />
+            </Col>
             <Col {...statSpans}>
               <Statistic
                 value={(values.toDatePaint + values.toDateBody).toFixed(1)}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index d3bdcdcbf..a8299c658 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1064,6 +1064,7 @@
 				"text": "Text",
 				"thursday": "Thursday",
 				"totals": "Totals",
+				"total": "Total",
 				"tuesday": "Tuesday",
 				"unknown": "Unknown",
 				"username": "Username",