feature/IO-3388 - Parts Queue Fix

IO-3384 Mitchell OP14 Import USA

client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx

@@ -90,7 +90,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||
@@ -103,7 +103,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
     <div>
       <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
         <PartsStatusPie joblines_status={joblines_status} />
-        <Table key="id" columns={columns} dataSource={filteredJobLines ? filteredJobLines : []} />
+        <Table key="id" columns={columns} dataSource={filteredJobLines || []} />
       </CardTemplate>
     </div>
   );

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -318,7 +318,7 @@ export function JobLinesComponent({
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx

@@ -1,8 +1,9 @@
 import { useMemo } from "react";
-import { Col, Row, Tag, Tooltip } from "antd";
+import { Tag, Tooltip } from "antd";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -11,65 +12,67 @@ const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
-
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
 
-export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
+export function JobPartsQueueCount({ bodyshop, parts }) {
+  const { t } = useTranslation();
   const partsStatus = useMemo(() => {
     if (!parts) return null;
+    const statusKeys = ["default_bo", "default_ordered", "default_received", "default_returned"];
     return parts.reduce(
       (acc, val) => {
         if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
         acc.total = acc.total + val.count;
         acc[val.status] = acc[val.status] + val.count;
-
         return acc;
       },
       {
         total: 0,
         null: 0,
-        [bodyshop.md_order_statuses.default_bo]: 0,
-        [bodyshop.md_order_statuses.default_ordered]: 0,
-        [bodyshop.md_order_statuses.default_received]: 0,
-        [bodyshop.md_order_statuses.default_returned]: 0
+        ...Object.fromEntries(statusKeys.map((key) => [bodyshop.md_order_statuses[key], 0]))
       }
     );
   }, [bodyshop, parts]);
 
   if (!parts) return null;
   return (
-    <Row>
-      <Col {...defaultColLayout}>
-        <Tooltip title="Total">
-          <Tag>{partsStatus.total}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title="No Status">
-          <Tag color="gold">{partsStatus["null"]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
-          <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_received}>
-          <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-          <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_bo}>
-          <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
-        </Tooltip>
-      </Col>
-    </Row>
+    <div
+      style={{
+        display: "grid",
+        gridTemplateColumns: "repeat(auto-fit, minmax(40px, 1fr))",
+        gap: "8px",
+        width: "100%",
+        justifyItems: "start"
+      }}
+    >
+      <Tooltip title="Total">
+        <Tag style={{ minWidth: "40px", textAlign: "center" }}>{partsStatus.total}</Tag>
+      </Tooltip>
+      <Tooltip title={t("dashboard.errors.status_normal")}>
+        <Tag color="gold" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus["null"]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_bo}>
+        <Tag color="red" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_bo]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
+        <Tag color="blue" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_ordered]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_received}>
+        <Tag color="green" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_received]}
+        </Tag>
+      </Tooltip>
+      <Tooltip title={bodyshop.md_order_statuses.default_returned}>
+        <Tag color="orange" style={{ minWidth: "40px", textAlign: "center" }}>
+          {partsStatus[bodyshop.md_order_statuses.default_returned]}
+        </Tag>
+      </Tooltip>
+    </div>
   );
 }

client/src/components/jobs-list/jobs-list.component.jsx

@@ -166,7 +166,7 @@ export function JobsList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -165,7 +165,7 @@ export function JobsReadyList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })

client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx

@@ -145,7 +145,7 @@ export function PartsQueueJobLinesComponent({ loading, jobLines }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -171,7 +171,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       filters:
         bodyshop.md_ro_statuses.active_statuses.map((s) => {
           return {
-            text: s || "No Status*",
+            text: s || t("dashboard.errors.status"),
             value: [s]
           };
         }) || [],

client/src/components/production-list-columns/production-list-columns.data.jsx

@@ -34,8 +34,9 @@ const getEmployeeName = (employeeId, employees) => {
   return employee ? `${employee.first_name} ${employee.last_name}` : "";
 };
 
-const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
+const productionListColumnsData = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
   const { Enhanced_Payroll } = treatments;
+
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
@@ -313,7 +314,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
         activeStatuses
           ?.map((s) => {
             return {
-              text: s || "No Status*",
+              text: s || i18n.t("dashboard.errors.status"),
               value: [s]
             };
           })
@@ -584,4 +585,4 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
     }
   ];
 };
-export default r;
+export default productionListColumnsData;

client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx

@@ -103,7 +103,7 @@ export function SimplifiedPartsJobsListComponent({
         return record.status || t("general.labels.na");
       },
       filteredValue: filter?.status || null,
-      filters: bodyshop.md_ro_statuses?.parts_statuses.map((s) => {
+      filters: bodyshop?.md_ro_statuses?.parts_statuses?.map((s) => {
         return { text: s, value: [s] };
       }),
       onFilter: (value, record) => value.includes(record.status)

client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx

@@ -111,7 +111,7 @@ export function TechLookupJobsList({ bodyshop }) {
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx

@@ -97,7 +97,7 @@ export function TechAssignedProdJobs({ setTimeTicketTaskContext, technician, bod
             .filter(onlyUnique)
             .map((s) => {
               return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                 value: [s]
               };
             })) ||

client/src/translations/en_us/common.json

@@ -996,6 +996,7 @@
         "insco": "No Ins. Co.*",
         "refreshrequired": "You must refresh the dashboard data to see this component.",
         "status": "No Status*",
+        "status_normal": "No Status",
         "updatinglayout": "Error saving updated layout {{message}}"
       },
       "labels": {

client/src/translations/es/common.json

@@ -996,6 +996,7 @@
         "insco": "",
         "refreshrequired": "",
         "status": "",
+        "status_normal": "",
         "updatinglayout": ""
       },
       "labels": {

client/src/translations/fr/common.json

@@ -996,6 +996,7 @@
         "insco": "",
         "refreshrequired": "",
         "status": "",
+        "status_normal": "",
         "updatinglayout": ""
       },
       "labels": {

hasura/metadata/cron_triggers.yaml

@@ -51,12 +51,13 @@
   comment: ""
 - name: Rome Usage Report
   webhook: '{{HASURA_API_URL}}/data/usagereport'
-  schedule: 0 12 * * 5
+  schedule: 0 12 * * 3,5
   include_in_metadata: true
   payload: {}
   headers:
     - name: x-imex-auth
       value_from_env: DATAPUMP_AUTH
+  comment: ""
 - name: Task Reminders
   webhook: '{{HASURA_API_URL}}/tasks-remind-handler'
   schedule: '*/15 * * * *'

hasura/metadata/tables.yaml

@@ -944,6 +944,7 @@
           - autohouseid
           - bill_allow_post_to_closed
           - bill_tax_rates
+          - carfax_exclude
           - cdk_configuration
           - cdk_dealerid
           - chatterid

hasura/migrations/1758833517953_alter_table_public_bodyshops_add_column_carfax_exclude/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 "carfax_exclude" boolean
+--  not null default 'false';

hasura/migrations/1758833517953_alter_table_public_bodyshops_add_column_carfax_exclude/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "carfax_exclude" boolean
+ not null default 'false';

server/data/carfax.js

@@ -99,7 +99,7 @@ exports.default = async (req, res) => {
     await processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allXMLResults, allErrors);
 
     await sendServerEmail({
-      subject: `CARFAX Report ${moment().format("MM-DD-YY")}`,
+      subject: `Project Mexico Report ${moment().format("MM-DD-YY")}`,
       text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
         allXMLResults.map((x) => ({
           imexshopid: x.imexshopid,
@@ -164,35 +164,36 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
 
       if (skipUpload) {
         fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
+        uploadToS3(jsonObj);
       } else {
         await uploadViaSFTP(jsonObj);
-      }
 
-      await sendMexicoBillingEmail({
-        subject: `${shopid.toUpperCase()}_Mexico${InstanceManager({
-          imex: "IO",
-          rome: "RO"
-        })}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
-        text: `Errors:\n${JSON.stringify(
-          erroredJobs.map((ej) => ({
-            ro_number: ej.job?.ro_number,
-            jobid: ej.job?.id,
-            error: ej.error
-          })),
-          null,
-          2
-        )}\n\nUploaded:\n${JSON.stringify(
-          {
-            bodyshopid: bodyshop.id,
-            imexshopid: shopid,
-            count: jsonObj.count,
-            filename: jsonObj.filename,
-            result: jsonObj.result
-          },
-          null,
-          2
-        )}`
-      });
+        await sendMexicoBillingEmail({
+          subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
+            imex: "IO",
+            rome: "RO"
+          })}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
+          text: `Errors:\n${JSON.stringify(
+            erroredJobs.map((ej) => ({
+              ro_number: ej.job?.ro_number,
+              jobid: ej.job?.id,
+              error: ej.error
+            })),
+            null,
+            2
+          )}\n\nUploaded:\n${JSON.stringify(
+            {
+              bodyshopid: bodyshop.id,
+              imexshopid: shopid,
+              count: jsonObj.count,
+              filename: jsonObj.filename,
+              result: jsonObj.result
+            },
+            null,
+            2
+          )}`
+        });
+      }
 
       allXMLResults.push({
         bodyshopid: bodyshop.id,
@@ -292,17 +293,22 @@ const CreateRepairOrderTag = (job, errorCallback) => {
       v_make: job.v_make_desc || "",
       v_model: job.v_model_desc || "",
 
-      date_estimated:
-        (job.date_estimated && moment(job.date_estimated).tz(job.bodyshop.timezone).format(AHDateFormat)) ||
-        (job.created_at && moment(job.created_at).tz(job.bodyshop.timezone).format(AHDateFormat)) ||
-        "",
-      data_opened:
-        (job.date_open && moment(job.date_open).tz(job.bodyshop.timezone).format(AHDateFormat)) ||
-        (job.created_at && moment(job.created_at).tz(job.bodyshop.timezone).format(AHDateFormat)) ||
-        "",
-      date_invoiced:
-        (job.date_invoiced && moment(job.date_invoiced).tz(job.bodyshop.timezone).format(AHDateFormat)) || "",
-      loss_date: (job.loss_date && moment(job.loss_date).format(AHDateFormat)) || "",
+      date_estimated: [job.date_estimated, job.created_at].find((date) => date)
+        ? moment([job.date_open, job.created_at].find((date) => date))
+            .tz(job.bodyshop.timezone)
+            .format(AHDateFormat)
+        : "",
+      data_opened: [job.date_open, job.created_at].find((date) => date)
+        ? moment([job.date_open, job.created_at].find((date) => date))
+            .tz(job.bodyshop.timezone)
+            .format(AHDateFormat)
+        : "",
+      date_invoiced: [job.date_invoiced, job.actual_delivery, job.actual_completion].find((date) => date)
+        ? moment([job.date_invoiced, job.actual_delivery, job.actual_completion].find((date) => date))
+            .tz(job.bodyshop.timezone)
+            .format(AHDateFormat)
+        : "",
+      loss_date: job.loss_date ? moment(job.loss_date).format(AHDateFormat) : "",
 
       ins_co_nm: job.ins_co_nm || "",
       loss_desc: job.loss_desc || "",
@@ -329,7 +335,9 @@ const GenerateDetailLines = (line) => {
     line_desc: line.line_desc ? line.line_desc.replace(NON_ASCII_REGEX, "") : null,
     oem_partno: line.oem_partno ? line.oem_partno.replace(NON_ASCII_REGEX, "") : null,
     alt_partno: line.alt_partno ? line.alt_partno.replace(NON_ASCII_REGEX, "") : null,
+    op_code_desc: line.op_code_desc ? line.op_code_desc.replace(NON_ASCII_REGEX, "") : null,
     lbr_ty: generateLaborType(line.mod_lbr_ty),
+    lbr_hrs: line.mod_lb_hrs || 0,
     part_qty: line.part_qty || 0,
     part_type: generatePartType(line.part_type),
     act_price: line.act_price || 0

server/graphql-client/queries.js

@@ -879,39 +879,43 @@ exports.CHATTER_QUERY = `query CHATTER_EXPORT($start: timestamptz, $bodyshopid:
 }`;
 
 exports.CARFAX_QUERY = `query CARFAX_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
-  bodyshops_by_pk(id: $bodyshopid){
+  bodyshops_by_pk(id: $bodyshopid) {
     id
     shopname
     imexshopid
     timezone
   }
-  jobs(where: {_and: [{converted: {_eq: true}}, {v_vin: {_is_null: false}}, {date_invoiced: {_gt: $start}}, {date_invoiced: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}]}) {
-    id
+  jobs(where: {_and: [{_or: [{date_invoiced: {_gt: $start, _lte: $end}}, {actual_delivery: {_gt: $start, _lte: $end}, date_invoiced: {_is_null: true}}, {actual_completion: {_gt: $start, _lte: $end}, actual_delivery: {_is_null: true}, date_invoiced: {_is_null: true}}]}, {_not: {_and: [{date_invoiced: {_is_null: true}}, {actual_delivery: {_is_null: true}}, {actual_completion: {_is_null: true}}]}}, {shopid: {_eq: $bodyshopid}}, {voided: {_neq: true}}, {v_vin: {_is_null: false}}, {ro_number: {_is_null: false}}]}) {
+    actual_completion  
+    actual_delivery
+    area_of_damage
     created_at
-    ro_number
-    v_model_yr
-    v_model_desc
-    v_make_desc
-    v_vin
     date_estimated
-    date_open
     date_invoiced
-    loss_date
+    date_open
+    id
     ins_co_nm
+    job_totals
+    joblines(where: {removed: {_eq: false}}) {
+      act_price
+      alt_partno
+      line_desc
+      mod_lb_hrs
+      mod_lbr_ty
+      oem_partno
+      op_code_desc
+      part_type
+      part_qty
+    }
+    loss_date
     loss_desc
+    ro_number
     theft_ind
     tlos_ind
-    job_totals
-    area_of_damage
-    joblines(where: {removed: {_eq: false}}) {
-      line_desc
-      oem_partno
-      alt_partno
-      mod_lbr_ty
-      part_qty
-      part_type
-      act_price
-    }
+    v_make_desc
+    v_model_desc
+    v_model_yr
+    v_vin
   }
 }`;
 
@@ -1854,7 +1858,7 @@ exports.GET_CHATTER_SHOPS = `query GET_CHATTER_SHOPS {
 }`;
 
 exports.GET_CARFAX_SHOPS = `query GET_CARFAX_SHOPS {
-  bodyshops(where: {external_shop_id: {_is_null: true}}){
+  bodyshops(where: {external_shop_id: {_is_null: true}, carfax_exclude: {_neq: "true"}}){
       id
       shopname
       imexshopid

server/job/job-totals-USA.js

@@ -384,6 +384,8 @@ async function CalculateRatesTotals({ job, client }) {
       if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
         //Scenario where SGI may pay out hours using a part price.
         if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
+          ret[item.mod_lbr_ty.toLowerCase()].base = Dinero();
+          ret[item.mod_lbr_ty.toLowerCase()].adjustment = Dinero();
           ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();
         }
         ret[item.mod_lbr_ty.toLowerCase()].total = ret[item.mod_lbr_ty.toLowerCase()].total.add(