From 6b28b5b3e52c0eda859fd365cf3af2e8de896f8b Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 8 Feb 2021 13:01:21 -0800
Subject: [PATCH] Added memo to time ticket IO-485

---
 bodyshop_translations.babel                   |  21 ++++
 .../job-reconciliation-totals.component.jsx   | 102 ++++++++++--------
 .../time-ticket-list.component.jsx            |   8 ++
 .../time-ticket-modal.component.jsx           |   4 +
 client/src/graphql/timetickets.queries.js     |   3 +
 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, 96 insertions(+), 45 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 277d3e368..5e77d1534 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -18940,6 +18940,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>discrepancy</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>joblinestotal</name>
                                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx
index a101c9fb9..4f3474750 100644
--- a/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx
+++ b/client/src/components/job-reconciliation-totals/job-reconciliation-totals.component.jsx
@@ -46,51 +46,63 @@ export default function JobReconciliationTotals({
   }, [billLines, jobLines, selectedBillLines, selectedJobLines]);
 
   return (
-    <div>
-      <Space direction="horizontal">
-        <Statistic
-          title={t("jobs.labels.reconciliation.joblinestotal")}
-          value={totals.joblinesTotal.toFormat()}
-        />
-        <Statistic
-          title={t("jobs.labels.reconciliation.billlinestotal")}
-          value={totals.billLinesTotal.toFormat()}
-        />
-        <Button
-          onClick={() =>
-            reconcileByAssocLine(
-              jobLines,
-              jobLineState,
-              billLines,
-              billLineState,
-              setErrors
-            )
-          }
-        >
-          {t("jobs.labels.reconciliation.byassoc")}
-        </Button>
-        <Button
-          onClick={() =>
-            reconcileByPrice(
-              jobLines,
-              jobLineState,
-              billLines,
-              billLineState,
-              setErrors
-            )
-          }
-        >
-          {t("jobs.labels.reconciliation.byprice")}
-        </Button>
-        <Button
-          onClick={() => {
-            jobLineState[1]([]);
-            billLineState[1]([]);
-          }}
-        >
-          {t("jobs.labels.reconciliation.clear")}
-        </Button>
-      </Space>
+    <div style={{ display: "inline-block" }}>
+      <div>
+        <Space>
+          <Statistic
+            title={t("jobs.labels.reconciliation.joblinestotal")}
+            value={totals.joblinesTotal.toFormat()}
+          />
+          <Statistic
+            title={t("jobs.labels.reconciliation.billlinestotal")}
+            value={totals.billLinesTotal.toFormat()}
+          />
+          <Statistic
+            title={t("jobs.labels.reconciliation.discrepancy")}
+            value={totals.joblinesTotal
+              .subtract(totals.billLinesTotal)
+              .toFormat()}
+          />
+        </Space>
+      </div>
+      <div>
+        <Space direction="horizontal">
+          <Button
+            onClick={() =>
+              reconcileByAssocLine(
+                jobLines,
+                jobLineState,
+                billLines,
+                billLineState,
+                setErrors
+              )
+            }
+          >
+            {t("jobs.labels.reconciliation.byassoc")}
+          </Button>
+          <Button
+            onClick={() =>
+              reconcileByPrice(
+                jobLines,
+                jobLineState,
+                billLines,
+                billLineState,
+                setErrors
+              )
+            }
+          >
+            {t("jobs.labels.reconciliation.byprice")}
+          </Button>
+          <Button
+            onClick={() => {
+              jobLineState[1]([]);
+              billLineState[1]([]);
+            }}
+          >
+            {t("jobs.labels.reconciliation.clear")}
+          </Button>
+        </Space>
+      </div>
       {errors.length > 0 && (
         <div>
           {t("general.labels.errors")}
diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
index bc14e9556..89ae8a7cd 100644
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -98,6 +98,14 @@ export default function TimeTicketList({
       sortOrder:
         state.sortedInfo.columnKey === "actualhrs" && state.sortedInfo.order,
     },
+    {
+      title: t("timetickets.fields.memo"),
+      dataIndex: "memo",
+      key: "memo",
+      sorter: (a, b) => a.memo - b.memo,
+      sortOrder:
+        state.sortedInfo.columnKey === "memo" && state.sortedInfo.order,
+    },
     {
       title: t("timetickets.fields.clockon"),
       dataIndex: "clockon",
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index b37611336..76917a858 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -124,6 +124,10 @@ export default function TimeTicketModalComponent({
           <InputNumber min={0} precision={1} />
         </Form.Item>
 
+        <Form.Item label={t("timetickets.fields.memo")} name="memo">
+          <Input />
+        </Form.Item>
+
         <Form.Item
           name="ciecacode"
           label={t("timetickets.fields.ciecacode")}
diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js
index 33f1f2e75..e0e2bc5a8 100644
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -9,6 +9,7 @@ export const QUERY_TICKETS_BY_JOBID = gql`
       rate
       productivehrs
       id
+      memo
       employee {
         employee_number
         first_name
@@ -66,6 +67,7 @@ export const INSERT_NEW_TIME_TICKET = gql`
         actualhrs
         ciecacode
         date
+        memo
       }
     }
   }
@@ -92,6 +94,7 @@ export const UPDATE_TIME_TICKET = gql`
         updated_at
         jobid
         date
+        memo
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 05f076ac5..1bc73851d 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1145,6 +1145,7 @@
 					"byassoc": "By Line Association",
 					"byprice": "By Price",
 					"clear": "Clear All",
+					"discrepancy": "Discrepancy",
 					"joblinestotal": "Job Lines Total",
 					"multipleactprices": "${{act_price}} is the price for multiple job lines.",
 					"multiplebilllines": "{{line_desc}} has 2 or more bill lines associated to it.",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index f91c2d312..abdfeb9f8 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1145,6 +1145,7 @@
 					"byassoc": "",
 					"byprice": "",
 					"clear": "",
+					"discrepancy": "",
 					"joblinestotal": "",
 					"multipleactprices": "",
 					"multiplebilllines": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index cf3d24f34..17adc2057 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1145,6 +1145,7 @@
 					"byassoc": "",
 					"byprice": "",
 					"clear": "",
+					"discrepancy": "",
 					"joblinestotal": "",
 					"multipleactprices": "",
 					"multiplebilllines": "",