Merged in release/2023-11-24 (pull request #1080)

Release/2023 11 24

client/src/components/courtesy-car-form/courtesy-car-form.component.jsx

@@ -34,7 +34,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
 
       {/* <FormFieldsChanged form={form} /> */}
       <LayoutFormRow header={t("courtesycars.labels.vehicle")}>
-      <Form.Item
+        <Form.Item
           label={t("courtesycars.fields.year")}
           name="year"
           rules={[
@@ -118,7 +118,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             },
           ]}
         >
-          <InputNumber precision={0} />
+          <InputNumber min={0} precision={0} />
         </Form.Item>
         <Form.Item
           label={t("courtesycars.fields.fleetnumber")}
@@ -213,12 +213,38 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
         >
           <CourtesyCarStatus />
         </Form.Item>
-        <Form.Item
+        <div>
-          label={t("courtesycars.fields.nextservicekm")}
+          <Form.Item
-          name="nextservicekm"
+            label={t("courtesycars.fields.nextservicekm")}
-        >
+            name="nextservicekm"
-          <InputNumber />
+          >
-        </Form.Item>
+            <InputNumber min={0} precision={0} />
+          </Form.Item>
+          <Form.Item
+            shouldUpdate={(p, c) =>
+              p.mileage !== c.mileage || p.nextservicekm !== c.nextservicekm
+            }
+          >
+            {() => {
+              const nextservicekm = form.getFieldValue("nextservicekm");
+              const mileageOver =
+                nextservicekm <= form.getFieldValue("mileage");
+
+              if (mileageOver)
+                return (
+                  <Space direction="vertical" style={{ color: "tomato" }}>
+                    <span>
+                      <WarningFilled style={{ marginRight: ".3rem" }} />
+                      {t("contracts.labels.cardueforservice")}
+                    </span>
+                    <span>{`${nextservicekm} km`}</span>
+                  </Space>
+                );
+
+              return <></>;
+            }}
+          </Form.Item>
+        </div>
         <div>
           <Form.Item
             label={t("courtesycars.fields.nextservicedate")}
@@ -227,30 +253,21 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             <FormDatePicker />
           </Form.Item>
           <Form.Item
-            shouldUpdate={(p, c) =>
+            shouldUpdate={(p, c) => p.nextservicedate !== c.nextservicedate}
-              p.mileage !== c.mileage ||
-              p.nextservicedate !== c.nextservicedate ||
-              p.nextservicekm !== c.nextservicekm
-            }
           >
             {() => {
               const nextservicedate = form.getFieldValue("nextservicedate");
-              const nextservicekm = form.getFieldValue("nextservicekm");
-
-              const mileageOver =
-                nextservicekm <= form.getFieldValue("mileage");
-
               const dueForService =
-                nextservicedate && moment(nextservicedate).isBefore(moment());
+                nextservicedate &&
+                moment(nextservicedate).endOf("day").isSameOrBefore(moment());
 
-              if (mileageOver || dueForService)
+              if (dueForService)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>
                     <span>
                       <WarningFilled style={{ marginRight: ".3rem" }} />
                       {t("contracts.labels.cardueforservice")}
                     </span>
-                    <span>{`${nextservicekm} km`}</span>
                     <span>
                       <DateFormatter>{nextservicedate}</DateFormatter>
                     </span>
@@ -282,7 +299,8 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             {() => {
               const expires = form.getFieldValue("registrationexpires");
 
-              const dateover = expires && moment(expires).isBefore(moment());
+              const dateover =
+                expires && moment(expires).endOf("day").isBefore(moment());
 
               if (dateover)
                 return (
@@ -317,7 +335,8 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             {() => {
               const expires = form.getFieldValue("insuranceexpires");
 
-              const dateover = expires && moment(expires).isBefore(moment());
+              const dateover =
+                expires && moment(expires).endOf("day").isBefore(moment());
 
               if (dateover)
                 return (

client/src/components/job-at-change/schedule-event.container.jsx

@@ -2,12 +2,16 @@ import { useMutation } from "@apollo/client";
 import { notification } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { useDispatch } from "react-redux";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENT_BY_ID } from "../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import ScheduleEventComponent from "./schedule-event.component";
 
 export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
+  const dispatch = useDispatch();
   const { t } = useTranslation();
   const [cancelAppointment] = useMutation(CANCEL_APPOINTMENT_BY_ID);
   const [updateJob] = useMutation(UPDATE_JOB);
@@ -34,16 +38,24 @@ export default function ScheduleEventContainer({ bodyshop, event, refetch }) {
       const jobUpdate = await updateJob({
         variables: {
           jobId: event.job.id,
-
           job: {
             date_scheduled: null,
             scheduled_in: null,
             scheduled_completion: null,
             lost_sale_reason,
+            date_lost_sale: new Date(),
             status: bodyshop.md_ro_statuses.default_imported,
           },
         },
       });
+      if (!jobUpdate.errors) {
+        dispatch(
+          insertAuditTrail({
+            jobid: event.job.id,
+            operation: AuditTrailMapping.appointmentcancel(lost_sale_reason),
+          })
+        );
+      }
       if (!!jobUpdate.errors) {
         notification["error"]({
           message: t("jobs.errors.updating", {

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -13,6 +13,7 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { insertAuditTrail } from "../../redux/application/application.actions";
+import { DateTimeFormat } from "./../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -53,7 +54,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
         operation: AuditTrailMapping.admin_jobfieldchange(
           key,
           changedAuditFields[key] instanceof moment
-            ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+            ? DateTimeFormat(changedAuditFields[key])
             : changedAuditFields[key]
         ),
       });
@@ -179,6 +180,12 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           <Form.Item label={t("jobs.fields.date_void")} name="date_void">
             <DateTimePicker />
           </Form.Item>
+          <Form.Item
+            label={t("jobs.fields.date_lost_sale")}
+            name="date_lost_sale"
+          >
+            <DateTimePicker />
+          </Form.Item>
         </LayoutFormRow>
       </Form>
 

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -73,6 +73,8 @@ export function JobsAvailableContainer({
 
   const [selectedJob, setSelectedJob] = useState(null);
   const [selectedOwner, setSelectedOwner] = useState(null);
+  const [partsQueueToggle, setPartsQueueToggle] = useState(bodyshop.md_functionality_toggles.parts_queue_toggle);
+
   const [insertLoading, setInsertLoading] = useState(false);
 
   const [insertNote] = useMutation(INSERT_NEW_NOTE);
@@ -94,6 +96,7 @@ export function JobsAvailableContainer({
     logImEXEvent("job_import_new");
 
     setOwnerModalVisible(false);
+
     setInsertLoading(true);
 
     const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
@@ -120,7 +123,7 @@ export function JobsAvailableContainer({
 
     let existingVehicles;
     if (estData.est_data.v_vin) {
-      //There's vehicle data, need to double check the VIN.
+      //There's vehicle data, need to double-check the VIN.
       existingVehicles = await client.query({
         query: SEARCH_VEHICLE_BY_VIN,
         variables: {
@@ -143,7 +146,7 @@ export function JobsAvailableContainer({
           text: t("jobs.labels.importnote"),
         },
       },
-      queued_for_parts: true,
+      queued_for_parts: partsQueueToggle,
       ...(existingVehicles && existingVehicles.data.vehicles.length > 0
         ? { vehicleid: existingVehicles.data.vehicles[0].id, vehicle: null }
         : {}),
@@ -157,46 +160,51 @@ export function JobsAvailableContainer({
       delete newJob.vehicle;
     }
 
-    insertNewJob({
+    try {
-      variables: {
+      const r = await insertNewJob({
-        job: newJob,
+        variables: {
-      },
+          job: newJob,
-    })
+        },
-      .then((r) => {
+      });
-        if (CriticalPartsScanning.treatment === "on") {
-          CriticalPartsScan(r.data.insert_jobs.returning[0].id);
-        }
-        notification["success"]({
-          message: t("jobs.successes.created"),
-          onClick: () => {
-            history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
-          },
-        });
-        //Job has been inserted. Clean up the available jobs record.
 
-        insertAuditTrail({
+      if (CriticalPartsScanning.treatment === "on") {
-          jobid: r.data.insert_jobs.returning[0].id,
+        CriticalPartsScan(r.data.insert_jobs.returning[0].id);
-          operation: AuditTrailMapping.jobimported(),
+      }
-        });
 
-        deleteJob({
+      notification["success"]({
-          variables: { id: estData.id },
+        message: t("jobs.successes.created"),
-        }).then((r) => {
+        onClick: () => {
-          refetch();
+          history.push(`/manage/jobs/${r.data.insert_jobs.returning[0].id}`);
-          setInsertLoading(false);
+        },
-        });
+      });
-      })
+      //Job has been inserted. Clean up the available jobs record.
-      .catch((r) => {
+
-        //error while inserting
+      insertAuditTrail({
-        notification["error"]({
+        jobid: r.data.insert_jobs.returning[0].id,
-          message: t("jobs.errors.creating", { error: r.message }),
+        operation: AuditTrailMapping.jobimported(),
-        });
+      });
+
+      deleteJob({
+        variables: { id: estData.id },
+      }).then((r) => {
         refetch();
         setInsertLoading(false);
       });
+
+      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+    } catch (err) {
+      //error while inserting
+      notification["error"]({
+        message: t("jobs.errors.creating", { error: err.message }),
+      });
+      refetch().catch(e => {console.error(`Something went wrong in jobs available table container - ${err.message || ''}`)});
+      setInsertLoading(false);
+      setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+    }
+
   };
 
-  //Suplement scenario
+  //Supplement scenario
   const onJobFindModalOk = async () => {
     logImEXEvent("job_import_supplement");
 
@@ -248,11 +256,14 @@ export function JobsAvailableContainer({
             //   "0.00"
             // ),
             // job_totals: newTotals,
-            // queued_for_parts: true,
+            queued_for_parts: partsQueueToggle,
           },
         },
       });
-      if (CriticalPartsScanning.treatment === "on") {
+
+        setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
+
+        if (CriticalPartsScanning.treatment === "on") {
         CriticalPartsScan(updateResult.data.update_jobs.returning[0].id);
       }
       if (updateResult.errors) {
@@ -327,12 +338,14 @@ export function JobsAvailableContainer({
   const onOwnerModalCancel = () => {
     setOwnerModalVisible(false);
     setSelectedOwner(null);
+    setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
   };
 
   const onJobModalCancel = () => {
     setJobModalVisible(false);
     modalSearchState[1]("");
     setSelectedJob(null);
+    setPartsQueueToggle(bodyshop.md_functionality_toggles.parts_queue_toggle);
   };
 
   const addJobAsNew = (record) => {
@@ -353,6 +366,8 @@ export function JobsAvailableContainer({
   }, [addJobAsSupp, availableJobId, clm_no]);
 
   if (error) return <AlertComponent type="error" message={error.message} />;
+
+
   return (
     <LoadingSpinner
       loading={insertLoading}
@@ -362,11 +377,14 @@ export function JobsAvailableContainer({
         loading={estDataRaw.loading}
         error={estDataRaw.error}
         owner={owner}
+        partsQueueToggle={partsQueueToggle}
+        setPartsQueueToggle={setPartsQueueToggle}
         selectedOwner={selectedOwner}
         setSelectedOwner={setSelectedOwner}
         visible={ownerModalVisible}
         onOk={onOwnerFindModalOk}
         onCancel={onOwnerModalCancel}
+
       />
       <JobsFindModalContainer
         loading={estDataRaw.loading}
@@ -378,6 +396,8 @@ export function JobsAvailableContainer({
         onOk={onJobFindModalOk}
         onCancel={onJobModalCancel}
         modalSearchState={modalSearchState}
+        partsQueueToggle={partsQueueToggle}
+        setPartsQueueToggle={setPartsQueueToggle}
       />
       <Row gutter={[16, 16]}>
         <Col span={24}>

client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx

@@ -145,6 +145,13 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_void")} name="date_void">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
+
+        <Form.Item
+          label={t("jobs.fields.date_lost_sale")}
+          name="date_lost_sale"
+        >
+          <DateTimePicker disabled={true || jobRO} />
+        </Form.Item>
       </FormRow>
     </div>
   );

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -18,12 +18,14 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID } from "../../graphql/appointments.queries";
 import { DELETE_JOB, UPDATE_JOB, VOID_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import JobsDetailHeaderActionsAddevent from "./jobs-detail-header-actions.addevent";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
@@ -50,6 +52,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(setModalContext({ context: context, modal: "timeTicket" })),
   setCardPaymentContext: (context) =>
     dispatch(setModalContext({ context: context, modal: "cardPayment" })),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function JobsDetailHeaderActions({
@@ -64,6 +68,7 @@ export function JobsDetailHeaderActions({
   jobRO,
   setTimeTicketContext,
   setCardPaymentContext,
+  insertAuditTrail,
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
@@ -158,6 +163,7 @@ export function JobsDetailHeaderActions({
                         scheduled_in: null,
                         scheduled_completion: null,
                         lost_sale_reason,
+                        date_lost_sale: new Date(),
                         status: bodyshop.md_ro_statuses.default_imported,
                       },
                     },
@@ -166,6 +172,11 @@ export function JobsDetailHeaderActions({
                     notification["success"]({
                       message: t("appointments.successes.canceled"),
                     });
+                    insertAuditTrail({
+                      jobid: job.id,
+                      operation:
+                        AuditTrailMapping.appointmentcancel(lost_sale_reason),
+                    });
                     return;
                   }
                 }}

client/src/components/jobs-find-modal/jobs-find-modal.component.jsx

@@ -14,6 +14,8 @@ export default function JobsFindModalComponent({
   importOptionsState,
   modalSearchState,
   jobsListRefetch,
+  partsQueueToggle,
+  setPartsQueueToggle,
 }) {
   const { t } = useTranslation();
   const [modalSearch, setModalSearch] = modalSearchState;
@@ -199,6 +201,12 @@ export default function JobsFindModalComponent({
       >
         {t("jobs.labels.override_header")}
       </Checkbox>
+      <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+      >
+        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+      </Checkbox>
     </div>
   );
 }

client/src/components/jobs-find-modal/jobs-find-modal.container.jsx

@@ -24,6 +24,8 @@ export default connect(
   setSelectedJob,
   importOptionsState,
   modalSearchState,
+  partsQueueToggle,
+  setPartsQueueToggle,
   ...modalProps
 }) {
   const { t } = useTranslation();
@@ -91,6 +93,8 @@ export default connect(
           jobsListRefetch={jobsList.refetch}
           jobsList={jobsData}
           modalSearchState={modalSearchState}
+          partsQueueToggle={partsQueueToggle}
+          setPartsQueueToggle={setPartsQueueToggle}
         />
       ) : null}
     </Modal>

client/src/components/owner-find-modal/owner-find-modal.component.jsx

@@ -8,10 +8,11 @@ export default function OwnerFindModalComponent({
   setSelectedOwner,
   ownersListLoading,
   ownersList,
+  partsQueueToggle,
+  setPartsQueueToggle,
 }) {
   //setSelectedOwner is used to set the record id of the owner to use for adding the job.
   const { t } = useTranslation();
-
   const columns = [
     {
       title: t("owners.fields.ownr_ln"),
@@ -109,6 +110,12 @@ export default function OwnerFindModalComponent({
       >
         {t("owners.labels.create_new")}
       </Checkbox>
+      <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+      >
+        {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+      </Checkbox>
     </div>
   );
 }

client/src/components/owner-find-modal/owner-find-modal.container.jsx

@@ -14,6 +14,8 @@ export default function OwnerFindModalContainer({
   owner,
   selectedOwner,
   setSelectedOwner,
+  partsQueueToggle,
+  setPartsQueueToggle,
   ...modalProps
 }) {
   //use owner object to run query and find what possible owners there are.
@@ -59,6 +61,8 @@ export default function OwnerFindModalContainer({
             selectedOwner={selectedOwner}
             setSelectedOwner={setSelectedOwner}
             ownersListLoading={ownersList.loading}
+            partsQueueToggle={partsQueueToggle}
+            setPartsQueueToggle={setPartsQueueToggle}
             ownersList={
               ownersList.data && ownersList.data.search_owners
                 ? ownersList.data.search_owners

client/src/components/production-board-kanban/production-board-kanban.component.jsx

@@ -20,9 +20,9 @@ import ProductionBoardCard from "../production-board-kanban-card/production-boar
 import ProductionListDetailComponent from "../production-list-detail/production-list-detail.component";
 import ProductionBoardKanbanCardSettings from "./production-board-kanban.card-settings.component";
 //import "@asseinfo/react-kanban/dist/styles.css";
+import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 import "./production-board-kanban.styles.scss";
 import { createBoardData } from "./production-board-kanban.utils.js";
-import CardColorLegend from "../production-board-kanban-card/production-board-kanban-card-color-legend.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
@@ -153,6 +153,18 @@ export function ProductionBoardKanbanComponent({
       0
     )
     .toFixed(1);
+    const totalLAB = data
+    .reduce(
+      (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
+  const totalLAR = data
+    .reduce(
+      (acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
   const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
     .filter((screen) => !!screen[1])
     .slice(-1)[0];
@@ -236,6 +248,14 @@ export function ProductionBoardKanbanComponent({
               title={t("dashboard.titles.productionhours")}
               value={totalHrs}
             />
+            <Statistic
+              title={t("dashboard.titles.labhours")}
+              value={totalLAB}
+            />
+            <Statistic
+              title={t("dashboard.titles.larhours")}
+              value={totalLAR}
+            />
             <Statistic
               title={t("appointments.labels.inproduction")}
               value={data && data.length}

client/src/components/production-list-table/production-list-table.component.jsx

@@ -184,6 +184,18 @@ export function ProductionListTable({
       0
     )
     .toFixed(1);
+  const totalLAB = data
+    .reduce(
+      (acc, val) => acc + (val.labhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
+  const totalLAR = data
+    .reduce(
+      (acc, val) => acc + (val.larhrs?.aggregate?.sum?.mod_lb_hrs || 0),
+      0
+    )
+    .toFixed(1);
   return (
     <div>
       <PageHeader
@@ -193,6 +205,14 @@ export function ProductionListTable({
               title={t("dashboard.titles.productionhours")}
               value={totalHrs}
             />
+            <Statistic
+              title={t("dashboard.titles.labhours")}
+              value={totalLAB}
+            />
+            <Statistic
+              title={t("dashboard.titles.larhours")}
+              value={totalLAR}
+            />
             <Statistic
               title={t("appointments.labels.inproduction")}
               value={dataSource && dataSource.length}

client/src/components/schedule-job-modal/schedule-job-modal.container.jsx

@@ -13,6 +13,7 @@ import {
   QUERY_APPOINTMENTS_BY_JOBID,
 } from "../../graphql/appointments.queries";
 import { QUERY_LBR_HRS_BY_PK, UPDATE_JOBS } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { setEmailOptions } from "../../redux/email/email.actions";
 import { toggleModalVisible } from "../../redux/modals/modals.actions";
 import { selectSchedule } from "../../redux/modals/modals.selectors";
@@ -20,6 +21,8 @@ import {
   selectBodyshop,
   selectCurrentUser,
 } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { DateTimeFormat } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import ScheduleJobModalComponent from "./schedule-job-modal.component";
 
@@ -31,6 +34,8 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
   toggleModalVisible: () => dispatch(toggleModalVisible("schedule")),
   setEmailOptions: (e) => dispatch(setEmailOptions(e)),
+  insertAuditTrail: ({ jobid, operation }) =>
+    dispatch(insertAuditTrail({ jobid, operation })),
 });
 
 export function ScheduleJobModalContainer({
@@ -39,6 +44,7 @@ export function ScheduleJobModalContainer({
   toggleModalVisible,
   setEmailOptions,
   currentUser,
+  insertAuditTrail,
 }) {
   const { visible, context, actions } = scheduleModal;
   const { jobId, job, previousEvent } = context;
@@ -134,6 +140,15 @@ export function ScheduleJobModalContainer({
       },
     });
 
+    if (!appt.errors) {
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.appointmentinsert(
+          DateTimeFormat(values.start)
+        ),
+      });
+    }
+
     if (!!appt.errors) {
       notification["error"]({
         message: t("appointments.errors.saving", {
@@ -155,6 +170,7 @@ export function ScheduleJobModalContainer({
             scheduled_in: values.start,
             scheduled_completion: values.scheduled_completion,
             lost_sale_reason: null,
+            date_lost_sale: null,
           },
         },
       });

client/src/components/scoreboard-timetickets-stats/scoreboard-timetickets.component.jsx

@@ -2,11 +2,9 @@ import { useQuery } from "@apollo/client";
 import { Col, Row } from "antd";
 import _ from "lodash";
 import moment from "moment";
-import queryString from "query-string";
 import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { QUERY_TIME_TICKETS_IN_RANGE_SB } from "../../graphql/timetickets.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -31,12 +29,8 @@ export default connect(
 
 export function ScoreboardTimeTicketsStats({ bodyshop }) {
   const { t } = useTranslation();
-  const searchParams = queryString.parse(useLocation().search);
+  const startDate = moment().startOf("month")
-  const { start, end } = searchParams;
+  const endDate = moment().endOf("month");
-  const startDate = start
-    ? moment(start)
-    : moment().startOf("week").subtract(7, "days");
-  const endDate = end ? moment(end) : moment().endOf("week");
 
   const fixedPeriods = useMemo(() => {
     const endOfThisMonth = moment().endOf("month");

client/src/components/shop-info/shop-info.general.component.jsx

@@ -42,6 +42,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
     bodyshop && bodyshop.imexshopid
   );
 
+
   return (
     <div>
       <LayoutFormRow
@@ -680,6 +681,13 @@ export function ShopInfoGeneral({ form, bodyshop }) {
         >
           <Select mode="tags" />
         </Form.Item>
+        <Form.Item
+            label={t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
+            name={["md_functionality_toggles","parts_queue_toggle"]}
+            valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
         <Form.Item
           name={["last_name_first"]}
           label={t("bodyshop.fields.last_name_first")}

client/src/graphql/appointments.queries.js

@@ -271,6 +271,7 @@ export const CANCEL_APPOINTMENTS_BY_JOB_ID = gql`
       scheduled_completion
       status
       lost_sale_reason
+      date_lost_sale
     }
   }
 `;

client/src/graphql/bodyshop.queries.js

@@ -39,6 +39,7 @@ export const QUERY_BODYSHOP = gql`
       logo_img_path
       md_ro_statuses
       md_order_statuses
+      md_functionality_toggles
       shopname
       state
       state_tax_id
@@ -158,6 +159,7 @@ export const UPDATE_SHOP = gql`
         logo_img_path
         md_ro_statuses
         md_order_statuses
+        md_functionality_toggles
         shopname
         state
         state_tax_id

client/src/graphql/jobs.queries.js

@@ -675,6 +675,7 @@ export const GET_JOB_BY_PK = gql`
       date_scheduled
       date_invoiced
       date_last_contacted
+      date_lost_sale
       date_next_contact
       date_towin
       date_rentalresp
@@ -1077,6 +1078,7 @@ export const UPDATE_JOB = gql`
         actual_in
         date_repairstarted
         date_void
+        date_lost_sale
       }
     }
   }

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -3,19 +3,19 @@ import Icon, {
   CalendarFilled,
   DollarCircleOutlined,
   FileImageFilled,
-  PrinterFilled,
-  ToolFilled,
   HistoryOutlined,
+  PrinterFilled,
   SyncOutlined,
+  ToolFilled,
 } from "@ant-design/icons";
 import {
   Button,
   Divider,
   Form,
-  notification,
   PageHeader,
   Space,
   Tabs,
+  notification,
 } from "antd";
 import Axios from "axios";
 import moment from "moment";
@@ -27,6 +27,7 @@ import { connect } from "react-redux";
 import { useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
+import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
 import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
 import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
@@ -42,17 +43,17 @@ import JobsDetailPliContainer from "../../components/jobs-detail-pli/jobs-detail
 import JobsDetailRates from "../../components/jobs-detail-rates/jobs-detail-rates.component";
 import JobsDetailTotals from "../../components/jobs-detail-totals/jobs-detail-totals.component";
 import JobsDocumentsGalleryContainer from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
+import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
 import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
+import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
+import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
 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";
+import { DateTimeFormat } from "./../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -172,7 +173,7 @@ export function JobsDetailPage({
           operation: AuditTrailMapping.jobfieldchange(
             key,
             changedAuditFields[key] instanceof moment
-              ? moment(changedAuditFields[key]).format("MM/DD/YYYY hh:mm a")
+              ? DateTimeFormat(changedAuditFields[key])
               : changedAuditFields[key]
           ),
         });

client/src/translations/en_us/common.json

@@ -103,6 +103,8 @@
 				"admin_jobmarkforreexport": "ADMIN: Job marked for re-export.",
 				"admin_jobuninvoice": "ADMIN: Job has been uninvoiced.",
 				"admin_jobunvoid": "ADMIN: Job has been unvoided.",
+				"appointmentcancel": "Appointment canceled. Lost Reason: {{lost_sale_reason}}.",
+				"appointmentinsert": "Appointment created. Appointment Date: {{start}}.",
 				"billposted": "Bill with invoice number {{invoice_number}} posted.",
 				"billupdated": "Bill with invoice number {{invoice_number}} updated.",
 				"failedpayment": "Failed payment",
@@ -347,6 +349,9 @@
 				},
 				"md_payment_types": "Payment Types",
 				"md_referral_sources": "Referral Sources",
+				"md_functionality_toggles":  {
+					"parts_queue_toggle": "Auto Add Imported/Supplemented Jobs to Parts Queue"
+				},
 				"md_tasks_presets": {
 					"hourstype": "",
 					"memo": "",
@@ -855,14 +860,16 @@
 				"refhrs": "Refinish Hrs"
 			},
 			"titles": {
+				"labhours": "Total Body Hours",
+				"larhours": "Total Refinish Hours",
 				"monthlyemployeeefficiency": "Monthly Employee Efficiency",
 				"monthlyjobcosting": "Monthly Job Costing ",
 				"monthlylaborsales": "Monthly Labor Sales",
 				"monthlypartssales": "Monthly Parts Sales",
 				"monthlyrevenuegraph": "Monthly Revenue Graph",
 				"prodhrssummary": "Production Hours Summary",
-				"productiondollars": "Total dollars in Production",
+				"productiondollars": "Total Dollars in Production",
-				"productionhours": "Total hours in Production",
+				"productionhours": "Total Hours in Production",
 				"projectedmonthlysales": "Projected Monthly Sales",
 				"scheduledintoday": "Sheduled In Today: {{date}}",
 				"scheduledouttoday": "Sheduled Out Today: {{date}}"
@@ -1442,6 +1449,7 @@
 				"date_exported": "Exported",
 				"date_invoiced": "Invoiced",
 				"date_last_contacted": "Last Contacted Date",
+				"date_lost_sale": "Lost Sale",
 				"date_next_contact": "Next Contact Date",
 				"date_open": "Open",
 				"date_rentalresp": "Shop Rental Responsibility Start",
@@ -2596,6 +2604,7 @@
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
 				"jobs_scheduled_completion": "Jobs Scheduled Completion",
 				"lag_time": "Lag Time",
+				"lost_sales": "Lost Sales",
 				"open_orders": "Open Orders by Date",
 				"open_orders_csr": "Open Orders by CSR",
 				"open_orders_estimator": "Open Orders by Estimator",

client/src/translations/es/common.json

@@ -103,6 +103,8 @@
 				"admin_jobmarkforreexport": "",
 				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
+				"appointmentcancel": "",
+				"appointmentinsert": "",
 				"billposted": "",
 				"billupdated": "",
 				"failedpayment": "",
@@ -252,6 +254,9 @@
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
+				"md_functionality_toggles":  {
+					"parts_queue_toggle": ""
+				},
 				"appt_colors": {
 					"color": "",
 					"label": ""
@@ -855,6 +860,8 @@
 				"refhrs": ""
 			},
 			"titles": {
+				"labhours": "",
+				"larhours": "",
 				"monthlyemployeeefficiency": "",
 				"monthlyjobcosting": "",
 				"monthlylaborsales": "",
@@ -1442,6 +1449,7 @@
 				"date_exported": "Exportado",
 				"date_invoiced": "Facturado",
 				"date_last_contacted": "",
+				"date_lost_sale": "",
 				"date_next_contact": "",
 				"date_open": "Abierto",
 				"date_rentalresp": "",
@@ -2596,6 +2604,7 @@
 				"jobs_reconcile": "",
 				"jobs_scheduled_completion": "",
 				"lag_time": "",
+				"lost_sales": "",
 				"open_orders": "",
 				"open_orders_csr": "",
 				"open_orders_estimator": "",

client/src/translations/fr/common.json

@@ -103,6 +103,8 @@
 				"admin_jobmarkforreexport": "",
 				"admin_jobuninvoice": "",
 				"admin_jobunvoid": "",
+				"appointmentcancel": "",
+				"appointmentinsert": "",
 				"billposted": "",
 				"billupdated": "",
 				"failedpayment": "",
@@ -329,6 +331,9 @@
 					"paint": "",
 					"prep": ""
 				},
+				"md_functionality_toggles":  {
+					"parts_queue_toggle": ""
+				},
 				"md_ins_co": {
 					"city": "",
 					"name": "",
@@ -855,6 +860,8 @@
 				"refhrs": ""
 			},
 			"titles": {
+				"labhours": "",
+				"larhours": "",
 				"monthlyemployeeefficiency": "",
 				"monthlyjobcosting": "",
 				"monthlylaborsales": "",
@@ -1442,6 +1449,7 @@
 				"date_exported": "Exportés",
 				"date_invoiced": "Facturé",
 				"date_last_contacted": "",
+				"date_lost_sale": "",
 				"date_next_contact": "",
 				"date_open": "Ouvrir",
 				"date_rentalresp": "",
@@ -2596,6 +2604,7 @@
 				"jobs_reconcile": "",
 				"jobs_scheduled_completion": "",
 				"lag_time": "",
+				"lost_sales": "",
 				"open_orders": "",
 				"open_orders_csr": "",
 				"open_orders_estimator": "",

client/src/utils/AuditTrailMappings.js

@@ -1,6 +1,10 @@
 import i18n from "i18next";
 
 const AuditTrailMapping = {
+  appointmentcancel: (lost_sale_reason) =>
+    i18n.t("audit_trail.messages.appointmentcancel", { lost_sale_reason }),
+  appointmentinsert: (start) =>
+    i18n.t("audit_trail.messages.appointmentinsert", { start }),
   jobstatuschange: (status) =>
     i18n.t("audit_trail.messages.jobstatuschange", { status }),
   admin_jobstatuschange: (status) =>

client/src/utils/DateFormatter.jsx

@@ -31,3 +31,7 @@ export function TimeAgoFormatter(props) {
     </Tooltip>
   ) : null;
 }
+
+export function DateTimeFormat(value) {
+  return moment(value).format("MM/DD/YYYY hh:mm A");
+}

client/src/utils/TemplateConstants.js

@@ -2014,6 +2014,18 @@ export const TemplateList = (type, context) => {
             },
             group: "jobs",
           },
+          lost_sales: {
+            title: i18n.t("reportcenter.templates.lost_sales"),
+            subject: i18n.t("reportcenter.templates.lost_sales"),
+            key: "lost_sales",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_lost_sale"),
+            },
+            group: "customers",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

hasura/metadata/tables.yaml

@@ -890,11 +890,13 @@
           - appt_colors
           - appt_length
           - attach_pdf_to_email
+          - autohouseid
           - bill_allow_post_to_closed
           - bill_tax_rates
           - cdk_configuration
           - cdk_dealerid
           - city
+          - claimscorpid
           - country
           - created_at
           - default_adjustment_rate
@@ -928,6 +930,7 @@
           - md_estimators
           - md_filehandlers
           - md_from_emails
+          - md_functionality_toggles
           - md_hour_split
           - md_ins_cos
           - md_jobline_presets
@@ -1026,6 +1029,7 @@
           - md_estimators
           - md_filehandlers
           - md_from_emails
+          - md_functionality_toggles
           - md_hour_split
           - md_ins_cos
           - md_jobline_presets
@@ -3583,6 +3587,7 @@
           - date_exported
           - date_invoiced
           - date_last_contacted
+          - date_lost_sale
           - date_next_contact
           - date_open
           - date_rentalresp
@@ -3863,6 +3868,7 @@
           - date_exported
           - date_invoiced
           - date_last_contacted
+          - date_lost_sale
           - date_next_contact
           - date_open
           - date_rentalresp

hasura/migrations/1700599672091_alter_table_public_bodyshops_add_column_md_functionality_toggles/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "md_functionality_toggles" jsonb
+--  null default jsonb_build_object();

hasura/migrations/1700599672091_alter_table_public_bodyshops_add_column_md_functionality_toggles/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "md_functionality_toggles" jsonb
+ null default jsonb_build_object();

hasura/migrations/1700680020194_alter_table_public_jobs_add_column_date_lost_sale/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "date_lost_sale" timestamp with time zone
+--  null;

hasura/migrations/1700680020194_alter_table_public_jobs_add_column_date_lost_sale/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "date_lost_sale" timestamp with time zone
+ null;

hasura/migrations/1700682617632_alter_table_public_jobs_alter_column_date_lost_sale/down.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."jobs" ALTER COLUMN "date_lost_sale" TYPE timestamp with time zone;

hasura/migrations/1700682617632_alter_table_public_jobs_alter_column_date_lost_sale/up.sql

@@ -0,0 +1 @@
+ALTER TABLE "public"."jobs" ALTER COLUMN "date_lost_sale" TYPE timestamp with time zone;