From e387abcd14566828b548b5c0cb132ec6f2aa72df Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Thu, 27 Apr 2023 10:20:46 -0700
Subject: [PATCH] IO-1741 IO-2147 IO-1933 Bug fixes for multiple tickets.

---
 bodyshop_translations.babel                   | 128 +++++++++++++++++-
 .../jobs-detail-rates.component.jsx           |   2 +-
 .../note-upsert-modal.container.jsx           |   1 +
 ...-list-columns.productionnote.component.jsx |   4 +-
 .../tech-job-statistics.component.jsx         |  21 +--
 client/src/graphql/notes.queries.js           |  12 +-
 .../jobs-detail.page.component.jsx            |   8 +-
 client/src/translations/en_us/common.json     |   3 +-
 client/src/translations/es/common.json        |   3 +-
 client/src/translations/fr/common.json        |   3 +-
 10 files changed, 165 insertions(+), 20 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index f453df8c6..1d299f13f 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -8906,6 +8906,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>use_paint_scale_data</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>uselocalmediaserver</name>
                                         <definition_loaded>false</definition_loaded>
@@ -16339,6 +16360,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>excel</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>exceptiontitle</name>
                                         <definition_loaded>false</definition_loaded>
@@ -33467,6 +33509,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>savetojobnotes</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>
                             <folder_node>
@@ -37589,6 +37652,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>dms_posting_sheet</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>envelope_return_address</name>
                                         <definition_loaded>false</definition_loaded>
@@ -41242,6 +41326,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>exported_gsr_by_ro</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>exported_gsr_by_ro_labor</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>gsr_by_atp</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
index 7d62c7356..0e6d841a2 100644
--- a/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
+++ b/client/src/components/jobs-detail-rates/jobs-detail-rates.component.jsx
@@ -82,7 +82,7 @@ export function JobsDetailRates({ jobRO, form, job, bodyshop }) {
         >
           <CurrencyInput disabled={jobRO || bodyshop.cdk_dealerid} />
         </Form.Item>
-        <Space align="end">
+        <Space align="center">
           <Form.Item label={t("jobs.fields.ca_bc_pvrt")} name="ca_bc_pvrt">
             <CurrencyInput disabled={jobRO} min={0} />
           </Form.Item>
diff --git a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
index d4c57c403..f925b7100 100644
--- a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
+++ b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
@@ -86,6 +86,7 @@ export function NoteUpsertModalContainer({
             { ...values, jobid: jobId, created_by: currentUser.email },
           ],
         },
+        refetchQueries: ["QUERY_NOTES_BY_JOB_PK"],
       });
 
       if (AdditionalNoteInserts.length > 0) {
diff --git a/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx b/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
index 217be5205..ff823bc3d 100644
--- a/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
@@ -82,13 +82,13 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext }) {
                 setVisible(false);
                 setNoteUpsertContext({
                   context: {
-                    jobId: record.jobId,
+                    jobId: record.id,
                     text: note,
                   },
                 });
               }}
             >
-              Save to Job Notes
+              {t("notes.actions.savetojobnotes")}
             </Button>
           </Space>
         </div>
diff --git a/client/src/components/tech-job-statistics/tech-job-statistics.component.jsx b/client/src/components/tech-job-statistics/tech-job-statistics.component.jsx
index ec26a8069..cf0587c8b 100644
--- a/client/src/components/tech-job-statistics/tech-job-statistics.component.jsx
+++ b/client/src/components/tech-job-statistics/tech-job-statistics.component.jsx
@@ -10,7 +10,7 @@ import { connect } from "react-redux";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useMemo } from "react";
-
+import { useTranslation } from "react-i18next";
 const { Title } = Typography;
 
 const mapStateToProps = createStructuredSelector({
@@ -19,6 +19,7 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({});
 
 const TechJobStatistics = ({ technician }) => {
+  const { t } = useTranslation();
   const searchParams = queryString.parse(useLocation().search);
   const { start, end } = searchParams;
 
@@ -78,21 +79,21 @@ const TechJobStatistics = ({ technician }) => {
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <Card title="Productive Hours Statistics">
+    <Card title={t("scoreboard.labels.productivestatistics")}>
       <Space size={100}>
         <Col>
-          <Title level={5}>This Week</Title>
+          <Title level={5}>{t("scoreboard.labels.thisweek")}</Title>
           <Space size={20}>
             <Statistic
-              title="Productive Hours"
+              title={t("timetickets.fields.productivehrs")}
               value={totals.week.productivehrs.toFixed(2)}
             />
             <Statistic
-              title="Actual Hours"
+              title={t("timetickets.fields.actualhrs")}
               value={totals.week.actualhrs.toFixed(2)}
             />
             <Statistic
-              title="Efficiency %"
+              title={t("timetickets.labels.efficiency")}
               value={
                 totals.week.actualhrs
                   ? `${(
@@ -105,18 +106,18 @@ const TechJobStatistics = ({ technician }) => {
           </Space>
         </Col>
         <Col>
-          <Title level={5}>This Month</Title>
+          <Title level={5}>{t("scoreboard.labels.thismonth")}</Title>
           <Space size={20}>
             <Statistic
-              title="Productive Hours"
+              title={t("timetickets.fields.productivehrs")}
               value={totals.month.productivehrs.toFixed(2)}
             />
             <Statistic
-              title="Actual Hours"
+              title={t("timetickets.fields.actualhrs")}
               value={totals.month.actualhrs.toFixed(2)}
             />
             <Statistic
-              title="Efficiency %"
+              title={t("timetickets.labels.efficiency")}
               value={
                 totals.month.actualhrs
                   ? `${(
diff --git a/client/src/graphql/notes.queries.js b/client/src/graphql/notes.queries.js
index 41b605515..b8ca126a6 100644
--- a/client/src/graphql/notes.queries.js
+++ b/client/src/graphql/notes.queries.js
@@ -4,7 +4,15 @@ export const INSERT_NEW_NOTE = gql`
   mutation INSERT_NEW_NOTE($noteInput: [notes_insert_input!]!) {
     insert_notes(objects: $noteInput) {
       returning {
+        created_at
+        created_by
+        critical
         id
+        jobid
+        private
+        text
+        updated_at
+        audit
       }
     }
   }
@@ -15,8 +23,8 @@ export const QUERY_NOTES_BY_JOB_PK = gql`
     jobs_by_pk(id: $id) {
       id
       ro_number
-      vehicle{
-        jobs{
+      vehicle {
+        jobs {
           id
           ro_number
           status
diff --git a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
index 5533666a1..c98e8b1a9 100644
--- a/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
+++ b/client/src/pages/jobs-detail/jobs-detail.page.component.jsx
@@ -52,6 +52,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import UndefinedToNull from "../../utils/undefinedtonull";
+import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -97,7 +98,11 @@ export function JobsDetailPage({
       variables: {
         jobId: job.id,
         job: {
-          ...UndefinedToNull(values, ["alt_transport", "category", "referral_source"]),
+          ...UndefinedToNull(values, [
+            "alt_transport",
+            "category",
+            "referral_source",
+          ]),
           parts_tax_rates: {
             ...job.parts_tax_rates,
             ...values.parts_tax_rates,
@@ -231,6 +236,7 @@ export function JobsDetailPage({
       <ScheduleJobModalContainer />
       <JobReconciliationModal />
       <JobLineUpsertModalContainer />
+      <NoteUpsertModalComponent />
       <Form
         form={form}
         name="JobDetailForm"
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index caeb8413e..f52178267 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1962,7 +1962,8 @@
 				"actions": "Actions",
 				"deletenote": "Delete Note",
 				"edit": "Edit Note",
-				"new": "New Note"
+				"new": "New Note",
+				"savetojobnotes": "Save to Job Notes"
 			},
 			"errors": {
 				"inserting": "Error inserting note.  {{error}}"
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 319df99c1..f5ce87c45 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1962,7 +1962,8 @@
 				"actions": "Comportamiento",
 				"deletenote": "Borrar nota",
 				"edit": "Editar nota",
-				"new": "Nueva nota"
+				"new": "Nueva nota",
+				"savetojobnotes": ""
 			},
 			"errors": {
 				"inserting": ""
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index ec9bcc734..413a6135d 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1962,7 +1962,8 @@
 				"actions": "actes",
 				"deletenote": "Supprimer la note",
 				"edit": "Note éditée",
-				"new": "Nouvelle note"
+				"new": "Nouvelle note",
+				"savetojobnotes": ""
 			},
 			"errors": {
 				"inserting": ""