From 3666b7cd22fcebf4dbcc125b917a250eb64dc7e6 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 6 Jun 2022 12:04:47 -0700
Subject: [PATCH] IO-1911 Tickets scoreboard updates.

---
 bodyshop_translations.babel                   | 52 +++++++-----------
 .../scoreboard-entry-edit.component.jsx       |  2 +-
 ...scoreboard-timetickets.stats.component.jsx | 55 ++++++++++++-------
 client/src/translations/en_us/common.json     |  8 +--
 client/src/translations/es/common.json        |  6 +-
 client/src/translations/fr/common.json        |  6 +-
 6 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 22823dc7c..b0565a686 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -40785,6 +40785,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>calendarperiod</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>dailyactual</name>
                                         <definition_loaded>false</definition_loaded>
@@ -41214,37 +41235,6 @@
                             </folder_node>
                         </children>
                     </folder_node>
-                    <folder_node>
-                        <name>scoredboard</name>
-                        <children>
-                            <folder_node>
-                                <name>successes</name>
-                                <children>
-                                    <concept_node>
-                                        <name>updated</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>
-                                </children>
-                            </folder_node>
-                        </children>
-                    </folder_node>
                     <folder_node>
                         <name>tech</name>
                         <children>
diff --git a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
index 3a74409f2..a8488e9dd 100644
--- a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
+++ b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
@@ -26,7 +26,7 @@ export default function ScoreboardEntryEdit({ entry }) {
       return;
     } else {
       notification["success"]({
-        message: t("scoredboard.successes.updated"),
+        message: t("scoreboard.successes.updated"),
       });
       setVisible(false);
     }
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 863f5f14f..71492893c 100644
--- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx
+++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx
@@ -1,4 +1,4 @@
-import { Card, Col, Row, Space, Statistic, Table } from "antd";
+import { Card, Col, Row, Space, Statistic, Table, Typography } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -68,27 +68,40 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
   return (
     <Card title={t("scoreboard.labels.productivestatistics")}>
       <Row gutter={[16, 16]}>
-        <Col md={24} lg={6}>
-          <Space wrap>
-            <Statistic
-              title={t("scoreboard.labels.lastweek")}
-              value={data.totalLastWeek.toFixed(1)}
-            />
-            <Statistic
-              title={t("scoreboard.labels.thisweek")}
-              value={data.totalThisWeek.toFixed(1)}
-            />
-            <Statistic
-              title={t("scoreboard.labels.lastmonth")}
-              value={data.totalLastMonth.toFixed(1)}
-            />
-            <Statistic
-              title={t("scoreboard.labels.thismonth")}
-              value={data.totalThisMonth.toFixed(1)}
-            />
-          </Space>
+        <Col md={24} lg={4}>
+          <Row gutter={[16, 16]}>
+            <Col span={12}>
+              <Statistic
+                title={t("scoreboard.labels.lastweek")}
+                value={data.totalLastWeek.toFixed(1)}
+              />
+            </Col>
+            <Col span={12}>
+              <Statistic
+                title={t("scoreboard.labels.lastmonth")}
+                value={data.totalLastMonth.toFixed(1)}
+              />
+            </Col>
+          </Row>
+          <Row gutter={[16, 16]}>
+            <Col span={12}>
+              <Statistic
+                title={t("scoreboard.labels.thisweek")}
+                value={data.totalThisWeek.toFixed(1)}
+              />
+            </Col>
+            <Col span={12}>
+              <Statistic
+                title={t("scoreboard.labels.thismonth")}
+                value={data.totalThisMonth.toFixed(1)}
+              />
+            </Col>
+          </Row>
+          <Typography.Text type="secondary">
+            {t("scoreboard.labels.calendarperiod")}
+          </Typography.Text>
         </Col>
-        <Col md={24} lg={18}>
+        <Col md={24} lg={20}>
           <Table
             columns={columns}
             dataSource={tableData}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index ba02ecc71..6e9d6f82c 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2424,6 +2424,7 @@
 			},
 			"labels": {
 				"asoftodaytarget": "As of Today",
+				"calendarperiod": "Periods based on calendar weeks/months.",
 				"dailyactual": "Actual (D)",
 				"dailytarget": "Daily",
 				"jobs": "Jobs",
@@ -2437,7 +2438,7 @@
 				"thisweek": "This Week",
 				"timetickets": "Timetickets",
 				"todateactual": "Actual (MTD)",
-				"totaloverperiod": "Total Period",
+				"totaloverperiod": "Total over Selected Dates",
 				"weeklyactual": "Actual (W)",
 				"weeklytarget": "Weekly",
 				"workingdays": "Working Days / Month"
@@ -2448,11 +2449,6 @@
 				"updated": "Scoreboard updated."
 			}
 		},
-		"scoredboard": {
-			"successes": {
-				"updated": "Scoreboard entry updated."
-			}
-		},
 		"tech": {
 			"fields": {
 				"employeeid": "Employee ID",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index ae5d81de2..c0570bb5f 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2424,6 +2424,7 @@
 			},
 			"labels": {
 				"asoftodaytarget": "",
+				"calendarperiod": "",
 				"dailyactual": "",
 				"dailytarget": "",
 				"jobs": "",
@@ -2448,11 +2449,6 @@
 				"updated": ""
 			}
 		},
-		"scoredboard": {
-			"successes": {
-				"updated": ""
-			}
-		},
 		"tech": {
 			"fields": {
 				"employeeid": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index b71d833e8..56c6f95bf 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2424,6 +2424,7 @@
 			},
 			"labels": {
 				"asoftodaytarget": "",
+				"calendarperiod": "",
 				"dailyactual": "",
 				"dailytarget": "",
 				"jobs": "",
@@ -2448,11 +2449,6 @@
 				"updated": ""
 			}
 		},
-		"scoredboard": {
-			"successes": {
-				"updated": ""
-			}
-		},
 		"tech": {
 			"fields": {
 				"employeeid": "",