feature/IO-3571-Create-Job-Done-Loading - Fix set is submitting

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/job-totals-table/job-totals.table.labor.component.jsx

@@ -144,11 +144,18 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mapa")}
                 {InstanceRenderManager({
                   imex:
-                    (job.materials?.mapa ?? job.materials?.MAPA)?.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", { amount: (job.materials.mapa ?? job.materials.MAPA).cal_maxdlr }),
+                    job.materials?.mapa &&
+                    job.materials.mapa.cal_maxdlr &&
+                    job.materials.mapa.cal_maxdlr > 0 &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.mapa.cal_maxdlr
+                    }),
                   rome:
-                    job.materials?.MAPA?.cal_maxdlr !== undefined &&
-                    t("jobs.labels.threshhold", { amount: job.materials.MAPA.cal_maxdlr })
+                    job.materials?.MAPA &&
+                    job.materials.MAPA.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.MAPA.cal_maxdlr
+                    })
                 })}
               </Space>
             </ResponsiveTable.Summary.Cell>
@@ -183,11 +190,18 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mash")}
                 {InstanceRenderManager({
                   imex:
-                    (job.materials?.mash ?? job.materials?.MASH)?.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", { amount: (job.materials.mash ?? job.materials.MASH).cal_maxdlr }),
+                    job.materials?.mash &&
+                    job.materials.mash.cal_maxdlr &&
+                    job.materials.mash.cal_maxdlr > 0 &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.mash.cal_maxdlr
+                    }),
                   rome:
-                    job.materials?.MASH?.cal_maxdlr !== undefined &&
-                    t("jobs.labels.threshhold", { amount: job.materials.MASH.cal_maxdlr })
+                    job.materials?.MASH &&
+                    job.materials.MASH.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.MASH.cal_maxdlr
+                    })
                 })}
               </Space>
             </ResponsiveTable.Summary.Cell>

client/src/pages/jobs-create/jobs-create.component.jsx

@@ -10,14 +10,12 @@ import JobsCreateOwnerInfoContainer from "../../components/jobs-create-owner-inf
 import JobsCreateVehicleInfoContainer from "../../components/jobs-create-vehicle-info/jobs-create-vehicle-info.container";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
 
-export default function JobsCreateComponent({ form }) {
+export default function JobsCreateComponent({ form, isSubmitting }) {
   const [pageIndex, setPageIndex] = useState(0);
-
   const [errorMessage, setErrorMessage] = useState(null);
-
   const [state] = useContext(JobCreateContext);
-
   const { t } = useTranslation();
+
   const steps = [
     {
       title: t("jobs.labels.create.vehicleinfo"),
@@ -42,11 +40,9 @@ export default function JobsCreateComponent({ form }) {
 
   const next = () => {
     setPageIndex(pageIndex + 1);
-    console.log("Next");
   };
   const prev = () => {
     setPageIndex(pageIndex - 1);
-    console.log("Previous");
   };
 
   const ProgressButtons = ({ top }) => {
@@ -79,17 +75,19 @@ export default function JobsCreateComponent({ form }) {
             {pageIndex === steps.length - 1 && (
               <Button
                 type="primary"
+                loading={isSubmitting}
                 onClick={() => {
                   form
                     .validateFields()
                     .then(() => {
-                      // NO OP
+                      form.submit();
                     })
-                    .catch((error) => console.log("error", error));
-                  form.submit();
+                    .catch((error) => {
+                      console.log("error", error);
+                    });
                 }}
               >
-                Done
+                {t("general.actions.done")}
               </Button>
             )}
           </Space>
@@ -146,13 +144,11 @@ export default function JobsCreateComponent({ form }) {
       ) : (
         <div>
           <ProgressButtons top />
-
           {errorMessage ? (
             <div>
               <AlertComponent title={errorMessage} type="error" />
             </div>
           ) : null}
-
           {steps.map((item, idx) => (
             <div
               key={idx}

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -46,6 +46,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
   });
   const [form] = Form.useForm();
   const [state, setState] = contextState;
+  const [isSubmitting, setIsSubmitting] = useState(false);
   const [insertJob] = useMutation(INSERT_NEW_JOB);
   const [loadOwner, remoteOwnerData] = useLazyQuery(QUERY_OWNER_FOR_JOB_CREATION);
 
@@ -83,16 +84,19 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
           newJobId: resp.data.insert_jobs.returning[0].id
         });
         logImEXEvent("manual_job_create_completed", {});
+        setIsSubmitting(false);
       })
       .catch((error) => {
         notification.error({
           title: t("jobs.errors.creating", { error: error })
         });
         setState({ ...state, error: error });
+        setIsSubmitting(false);
       });
   };
 
   const handleFinish = (values) => {
+    setIsSubmitting(true);
     let job = Object.assign(
       {},
       values,
@@ -297,7 +301,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
             })
           }}
         >
-          <JobsCreateComponent form={form} />
+          <JobsCreateComponent form={form} isSubmitting={isSubmitting} />
         </Form>
       </RbacWrapper>
     </JobCreateContext.Provider>

client/src/translations/en_us/common.json

@@ -1295,6 +1295,7 @@
         "delete": "Delete",
         "deleteall": "Delete All",
         "deselectall": "Deselect All",
+        "done": "Done",
         "download": "Download",
         "edit": "Edit",
         "gotoadmin": "Go to Admin Panel",

client/src/translations/es/common.json

@@ -1295,6 +1295,7 @@
         "delete": "Borrar",
         "deleteall": "",
         "deselectall": "",
+        "done": "",
         "download": "",
         "edit": "Editar",
         "gotoadmin": "",

client/src/translations/fr/common.json

@@ -1295,6 +1295,7 @@
         "delete": "Effacer",
         "deleteall": "",
         "deselectall": "",
+        "done": "",
         "download": "",
         "edit": "modifier",
         "gotoadmin": "",

server/job/job-totals.js

@@ -315,12 +315,7 @@ function CalculateRatesTotals(ratesList) {
     if (item.mod_lbr_ty) {
       //Check to see if it has 0 hours and a price instead.
       //Extend for when there are hours and a price.
-      if (
-        item.lbr_op === "OP14" &&
-        item.act_price > 0 &&
-        (!item.part_type || item.mod_lb_hrs === 0) &&
-        !IsAdditionalCost(item)
-      ) {
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) {
         //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()].total = Dinero();
@@ -344,30 +339,38 @@ function CalculateRatesTotals(ratesList) {
   let subtotal = Dinero({ amount: 0 });
   let rates_subtotal = Dinero({ amount: 0 });
 
-  for (const [property, values] of Object.entries(ret)) {
+  for (const property in ret) {
     //Skip calculating mapa and mash if we got the amounts.
-    const shouldSkipCalculation = (property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine);
-
-    if (!shouldSkipCalculation) {
-      values.total ??= Dinero();
-
-      //Check if there is a max for this type and apply it.
-      const maxDollar =
-        ratesList.materials?.[property]?.cal_maxdlr || ratesList.materials?.[property.toUpperCase()]?.cal_maxdlr;
-      const threshold = maxDollar > 0 ? Dinero({ amount: Math.round(maxDollar * 100) }) : null;
+    if (!((property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine))) {
+      if (!ret[property].total) {
+        ret[property].total = Dinero();
+      }
+      let threshold;
+      //Check if there is a max for this type.
+      if (ratesList.materials && ratesList.materials[property]) {
+        //
+        if (ratesList.materials[property].cal_maxdlr && ratesList.materials[property].cal_maxdlr > 0) {
+          //It has an upper threshhold.
+          threshold = Dinero({
+            amount: Math.round(ratesList.materials[property].cal_maxdlr * 100)
+          });
+        }
+      }
 
       const total = Dinero({
-        amount: Math.round((values.rate || 0) * 100)
-      }).multiply(values.hours);
+        amount: Math.round((ret[property].rate || 0) * 100)
+      }).multiply(ret[property].hours);
 
-      values.total = values.total.add(threshold && total.greaterThanOrEqual(threshold) ? threshold : total);
+      if (threshold && total.greaterThanOrEqual(threshold)) {
+        ret[property].total = ret[property].total.add(threshold);
+      } else {
+        ret[property].total = ret[property].total.add(total);
+      }
     }
 
-    subtotal = subtotal.add(values.total);
+    subtotal = subtotal.add(ret[property].total);
 
-    if (property !== "mapa" && property !== "mash") {
-      rates_subtotal = rates_subtotal.add(values.total);
-    }
+    if (property !== "mapa" && property !== "mash") rates_subtotal = rates_subtotal.add(ret[property].total);
   }
 
   ret.subtotal = subtotal;