IO-3592 WIP Summary Reports

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

client/src/components/eula/eula.component.jsx

@@ -25,6 +25,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
 
   const handleScroll = useCallback(
     (e) => {
+      if (!e.target) return;
       const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
       if (bottom && !hasEverScrolledToBottom) {
         setHasEverScrolledToBottom(true);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
   );
 
   useEffect(() => {
-    handleScroll({ target: markdownCardRef.current });
+    if (markdownCardRef.current) {
+      handleScroll({ target: markdownCardRef.current });
+    }
   }, [handleScroll]);
 
   const handleChange = useCallback(() => {

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

@@ -3372,8 +3372,10 @@
         "void_ros": "Void ROs",
         "work_in_progress_committed_labour": "Work in Progress - Committed Labor",
         "work_in_progress_jobs": "Work in Progress - Jobs",
-        "work_in_progress_labour": "Work in Progress - Labor",
-        "work_in_progress_payables": "Work in Progress - Payables"
+        "work_in_progress_labour": "Work in Progress - Labor (Detail)",
+        "work_in_progress_labour_summary": "Work in Progress - Labor (Summary)",
+        "work_in_progress_payables": "Work in Progress - Payables (Detail)",
+        "work_in_progress_payables_summary": "Work in Progress - Payables (Summary)"
       }
     },
     "schedule": {

client/src/translations/es/common.json

@@ -3373,7 +3373,9 @@
         "work_in_progress_committed_labour": "",
         "work_in_progress_jobs": "",
         "work_in_progress_labour": "",
-        "work_in_progress_payables": ""
+        "work_in_progress_labour_summary": "",
+        "work_in_progress_payables": "",
+        "work_in_progress_payables_summary": ""
       }
     },
     "schedule": {

client/src/translations/fr/common.json

@@ -3373,7 +3373,9 @@
         "work_in_progress_committed_labour": "",
         "work_in_progress_jobs": "",
         "work_in_progress_labour": "",
-        "work_in_progress_payables": ""
+        "work_in_progress_labour_summary": "",
+        "work_in_progress_payables": "",
+        "work_in_progress_payables_summary": ""
       }
     },
     "schedule": {

client/src/utils/TemplateConstants.js

@@ -1717,6 +1717,20 @@ export const TemplateList = (type, context) => {
             group: "jobs",
             featureNameRestricted: "timetickets"
           },
+          work_in_progress_labour_summary: {
+            title: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
+            key: "work_in_progress_labour_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open")
+            },
+            group: "jobs",
+            featureNameRestricted: "timetickets"
+          },
           work_in_progress_committed_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_committed_labour"),
             description: "",
@@ -1746,6 +1760,20 @@ export const TemplateList = (type, context) => {
             group: "jobs",
             featureNameRestricted: "bills"
           },
+          work_in_progress_payables_summary: {
+            title: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
+            description: "",
+            subject: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
+            key: "work_in_progress_payables_summary",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_open")
+            },
+            group: "jobs",
+            featureNameRestricted: "bills"
+          },
           lag_time: {
             title: i18n.t("reportcenter.templates.lag_time"),
             description: "",

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;