Final adjustments to job totals calculation for 99% accuracy.

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

@@ -6,7 +6,7 @@ import {
   useQuery,
 } from "@apollo/client";
 import { useTreatments } from "@splitsoftware/splitio-react";
-import { Col, Row, notification } from "antd";
+import { Button, Col, Row, notification } from "antd";
 import Axios from "axios";
 import _ from "lodash";
 import moment from "moment";
@@ -90,13 +90,15 @@ export function JobsAvailableContainer({
   const modalSearchState = useState("");
 
   //Import Scenario
-  const onOwnerFindModalOk = async () => {
+  const onOwnerFindModalOk = async (lazyData) => {
     logImEXEvent("job_import_new");
 
     setOwnerModalVisible(false);
     setInsertLoading(true);
-
-    const estData = replaceEmpty(estDataRaw.data.available_jobs_by_pk);
+    console.log("Using this as the data.", lazyData || estDataRaw);
+    const estData = replaceEmpty(
+      lazyData?.available_jobs_by_pk || estDataRaw.data.available_jobs_by_pk
+    );
 
     if (!(estData && estData.est_data)) {
       //We don't have the right data. Error!
@@ -165,47 +167,46 @@ export function JobsAvailableContainer({
       newJob.kmin = null;
     }
 
-    insertNewJob({
-      variables: {
-        job: newJob,
-      },
-    })
-      .then((r) => {
-        Axios.post("/job/totalsssu", {
-          id: r.data.insert_jobs.returning[0].id,
-        });
+    try {
+      const r = await insertNewJob({
+        variables: {
+          job: newJob,
+        },
+      });
+      await Axios.post("/job/totalsssu", {
+        id: r.data.insert_jobs.returning[0].id,
+      });
 
-        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.
+      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({
-          jobid: r.data.insert_jobs.returning[0].id,
-          operation: AuditTrailMapping.jobimported(),
-        });
+      insertAuditTrail({
+        jobid: r.data.insert_jobs.returning[0].id,
+        operation: AuditTrailMapping.jobimported(),
+      });
 
-        deleteJob({
-          variables: { id: estData.id },
-        }).then((r) => {
-          refetch();
-          setInsertLoading(false);
-        });
-      })
-      .catch((r) => {
-        //error while inserting
-        notification["error"]({
-          message: t("jobs.errors.creating", { error: r.message }),
-        });
-        refetch();
+      await deleteJob({
+        variables: { id: estData.id },
+      }).then((r) => {
+        if (!lazyData) refetch();
         setInsertLoading(false);
       });
+    } catch (r) {
+      //error while inserting
+      notification["error"]({
+        message: t("jobs.errors.creating", { error: r.message }),
+      });
+      refetch();
+      setInsertLoading(false);
+    }
   };
 
   //Suplement scenario
@@ -392,6 +393,21 @@ export function JobsAvailableContainer({
         onCancel={onJobModalCancel}
         modalSearchState={modalSearchState}
       />
+      <Button
+        onClick={async () => {
+          for (const record of data.available_jobs) {
+            //Query the data
+            console.log("Start Job", record.id);
+            const { data } = await loadEstData({
+              variables: { id: record.id },
+            });
+            console.log("Query has been awaited and is complete");
+            await onOwnerFindModalOk(data);
+          }
+        }}
+      >
+        Add all jobs as new.
+      </Button>
       <Row gutter={[16, 16]}>
         <Col span={24}>
           <JobsAvailableTableComponent
@@ -469,6 +485,12 @@ async function CheckTaxRates(estData, bodyshop) {
   //     estData.parts_tax_rates.PAC.prt_tax_in = true;
   //   }
   // }
+
+  //PAM Check
+  if (!estData.parts_tax_rates?.PAM) {
+    estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
+  }
+
   // //PAM Check
   // if (
   //   !estData.parts_tax_rates?.PAM ||
@@ -542,8 +564,7 @@ async function ResolveCCCLineIssues(estData, bodyshop) {
   //This needs to be done before cleansing unq_seq since some misc prices could move over.
   estData.joblines.data.forEach((line) => {
     if (line.misc_amt && line.misc_amt !== 0) {
-      line.act_price = line.misc_amt;
-      line.part_type = "PAS";
+      line.act_price = line.act_price + line.misc_amt;
       line.tax_part = !!line.misc_tax;
     }
   });