Merged in release/2021-09-24 (pull request #223)

release/2021-09-24

Approved-by: Patrick Fic

bodyshop_translations.babel

@@ -1369,6 +1369,69 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>jobnoteadded</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>jobnotedeleted</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>jobnoteupdated</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>jobspartsorder</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -45,6 +45,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           text: t("courtesycars.status.out"),
           value: "courtesycars.status.out",
         },
+        {
+          text: t("courtesycars.status.sold"),
+          value: "courtesycars.status.sold",
+        },
       ],
       onFilter: (value, record) => value.includes(record.status),
       sortOrder:

client/src/components/jobs-notes/jobs-notes.container.jsx

@@ -10,8 +10,21 @@ import {
   QUERY_NOTES_BY_JOB_PK,
 } from "../../graphql/notes.queries";
 import JobNotesComponent from "./jobs.notes.component";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
-export default function JobNotesContainer({ jobId }) {
+const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
+});
+const mapDispatchToProps = (dispatch) => ({
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobNotesContainer);
+
+export function JobNotesContainer({ jobId, insertAuditTrail }) {
   const { loading, error, data, refetch } = useQuery(QUERY_NOTES_BY_JOB_PK, {
     variables: { id: jobId },
     fetchPolicy: "network-only",
@@ -32,6 +45,10 @@ export default function JobNotesContainer({ jobId }) {
       notification["success"]({
         message: t("notes.successes.deleted"),
       });
+      insertAuditTrail({
+        jobid: jobId,
+        operation: AuditTrailMapping.jobnotedeleted(),
+      });
     });
     setDeleteLoading(false);
   };

client/src/components/note-upsert-modal/note-upsert-modal.container.jsx

@@ -10,6 +10,8 @@ import { selectNoteUpsert } from "../../redux/modals/modals.selectors";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
 import NoteUpsertModalComponent from "./note-upsert-modal.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -17,12 +19,15 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function NoteUpsertModalContainer({
   currentUser,
   noteUpsertModal,
   toggleModalVisible,
+  insertAuditTrail,
 }) {
   const { t } = useTranslation();
   const [insertNote] = useMutation(INSERT_NEW_NOTE);
@@ -56,6 +61,10 @@ export function NoteUpsertModalContainer({
         notification["success"]({
           message: t("notes.successes.updated"),
         });
+        insertAuditTrail({
+          jobid: context.jobId,
+          operation: AuditTrailMapping.jobnoteupdated(),
+        });
       });
       if (refetch) refetch();
       toggleModalVisible();
@@ -75,6 +84,10 @@ export function NoteUpsertModalContainer({
         notification["success"]({
           message: t("notes.successes.create"),
         });
+        insertAuditTrail({
+          jobid: context.jobId,
+          operation: AuditTrailMapping.jobnoteadded(),
+        });
       });
     }
   };

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -153,7 +153,7 @@ export function ReportCenterModalComponent({ reportCenterModal }) {
                     <Typography.Title level={4}>
                       {t(`reportcenter.labels.groups.${key}`)}
                     </Typography.Title>
-                    <ul style={{ columns: "3 auto" }}>
+                    <ul style={{ columns: "2 auto" }}>
                       {grouped[key].map((item) => (
                         <li key={item.key}>
                           <Radio key={item.key} value={item.key}>

client/src/translations/en_us/common.json

@@ -96,6 +96,9 @@
 				"jobimported": "Job imported.",
 				"jobinproductionchange": "Job production status set to {{inproduction}}",
 				"jobmodifylbradj": "Labor adjustments modified.",
+				"jobnoteadded": "Note added to job.",
+				"jobnotedeleted": "Note deleted from job.",
+				"jobnoteupdated": "Note updated on job.",
 				"jobspartsorder": "Parts order {{order_number}} added to job.",
 				"jobspartsreturn": "Parts return {{order_number}} added to job.",
 				"jobstatuschange": "Job status changed to {{status}}.",

client/src/translations/es/common.json

@@ -96,6 +96,9 @@
 				"jobimported": "",
 				"jobinproductionchange": "",
 				"jobmodifylbradj": "",
+				"jobnoteadded": "",
+				"jobnotedeleted": "",
+				"jobnoteupdated": "",
 				"jobspartsorder": "",
 				"jobspartsreturn": "",
 				"jobstatuschange": "",

client/src/translations/fr/common.json

@@ -96,6 +96,9 @@
 				"jobimported": "",
 				"jobinproductionchange": "",
 				"jobmodifylbradj": "",
+				"jobnoteadded": "",
+				"jobnotedeleted": "",
+				"jobnoteupdated": "",
 				"jobspartsorder": "",
 				"jobspartsreturn": "",
 				"jobstatuschange": "",

client/src/utils/AuditTrailMappings.js

@@ -26,6 +26,9 @@ const AuditTrailMapping = {
     i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }),
   jobchecklist: (type, inproduction, status) =>
     i18n.t("audit_trail.messages.jobchecklist", { type, inproduction, status }),
+  jobnoteadded: () => i18n.t("audit_trail.messages.jobnoteadded"),
+  jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"),
+  jobnotedeleted: () => i18n.t("audit_trail.messages.jobnotedeleted"),
 };
 
 export default AuditTrailMapping;

client/src/utils/TemplateConstants.js

@@ -1226,7 +1226,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.jobs"),
               field: i18n.t("jobs.fields.date_open"),
             },
-            group: "jobs",
+            group: "payroll",
           },
           work_in_progress_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_labour"),
@@ -1278,7 +1278,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.parts_orders"),
               field: i18n.t("parts_orders.fields.order_date"),
             },
-            group: "jobs",
+            group: "purchases",
           },
           scoreboard_detail: {
             title: i18n.t("reportcenter.templates.scoreboard_detail"),
@@ -1330,7 +1330,7 @@ export const TemplateList = (type, context) => {
               object: i18n.t("reportcenter.labels.objects.csi"),
               field: i18n.t("csi.fields.created_at"), // Also date invoice.
             },
-            group: "jobs",
+            group: "customers",
           },
         }
       : {}),