IO-2480 Unqueue Parts Label instead of Remove

Remove is the uncorrect work as it doesn't actually remove just unqueue

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/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-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/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/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/translations/en_us/common.json

@@ -349,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": "",
@@ -857,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}}"
@@ -2197,7 +2202,7 @@
 				"parts_orders": "Parts Orders",
 				"print": "Show Printed Form",
 				"receive": "Receive Parts Order",
-				"removefrompartsqueue": "Remove from Parts Queue?",
+				"removefrompartsqueue": "Unqueue from Parts Queue?",
 				"returnpartsorder": "Return Parts Order",
 				"sublet_order": "Sublet Order"
 			},

client/src/translations/es/common.json

@@ -254,6 +254,9 @@
 				"address1": "",
 				"address2": "",
 				"appt_alt_transport": "",
+				"md_functionality_toggles":  {
+					"parts_queue_toggle": ""
+				},
 				"appt_colors": {
 					"color": "",
 					"label": ""
@@ -857,6 +860,8 @@
 				"refhrs": ""
 			},
 			"titles": {
+				"labhours": "",
+				"larhours": "",
 				"monthlyemployeeefficiency": "",
 				"monthlyjobcosting": "",
 				"monthlylaborsales": "",

client/src/translations/fr/common.json

@@ -331,6 +331,9 @@
 					"paint": "",
 					"prep": ""
 				},
+				"md_functionality_toggles":  {
+					"parts_queue_toggle": ""
+				},
 				"md_ins_co": {
 					"city": "",
 					"name": "",
@@ -857,6 +860,8 @@
 				"refhrs": ""
 			},
 			"titles": {
+				"labhours": "",
+				"larhours": "",
 				"monthlyemployeeefficiency": "",
 				"monthlyjobcosting": "",
 				"monthlylaborsales": "",

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();