From 49a1f0c42c3aeec01ca0a53c318e1426082261e0 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 1 Aug 2024 14:42:07 -0700 Subject: [PATCH] Correct for Labor Adjustment being null Signed-off-by: Allan Carr --- server/job/job-totals-USA.js | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/server/job/job-totals-USA.js b/server/job/job-totals-USA.js index ba84a2488..3dabed316 100644 --- a/server/job/job-totals-USA.js +++ b/server/job/job-totals-USA.js @@ -357,27 +357,33 @@ async function CalculateRatesTotals({ job, client }) { let adjp = 0; if (property === "mapa" || property === "mash") { - adjp = - Math.abs(job.materials[property.toUpperCase()].mat_adjp) > 1 - ? job.materials[property.toUpperCase()].mat_adjp - : job.materials[property.toUpperCase()].mat_adjp * 100; //Adjust mat_adjp to whole number + if (job.materials[property.toUpperCase()] && job.materials[property.toUpperCase()].mat_adjp) { + adjp = + Math.abs(job.materials[property.toUpperCase()].mat_adjp) > 1 + ? job.materials[property.toUpperCase()].mat_adjp + : job.materials[property.toUpperCase()].mat_adjp * 100; //Adjust mat_adjp to whole number + } } else { if (property === "la1" || property === "la2" || property === "la3" || property === "la4") { - adjp = - Math.abs(job.cieca_pfl["LAU"].lbr_adjp) > 1 - ? job.cieca_pfl["LAU"].lbr_adjp - : job.cieca_pfl["LAU"].lbr_adjp * 100; //Adjust lbr_adjp to whole number + if (job.cieca_pfl["LAU"] && job.cieca_pfl["LAU"].lbr_adjp) { + adjp = + Math.abs(job.cieca_pfl["LAU"].lbr_adjp) > 1 + ? job.cieca_pfl["LAU"].lbr_adjp + : job.cieca_pfl["LAU"].lbr_adjp * 100; //Adjust lbr_adjp to whole number + } } else { - if (job.cieca_pfl[property.toUpperCase()]) { + if (job.cieca_pfl[property.toUpperCase()] && job.cieca_pfl[property.toUpperCase()].lbr_adjp) { adjp = Math.abs(job.cieca_pfl[property.toUpperCase()].lbr_adjp) > 1 ? job.cieca_pfl[property.toUpperCase()].lbr_adjp : job.cieca_pfl[property.toUpperCase()].lbr_adjp * 100; //Adjust lbr_adjp to whole number } else { - adjp = - Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1 - ? job.cieca_pfl["LAB"].lbr_adjp - : job.cieca_pfl["LAB"].lbr_adjp * 100; //Adjust lbr_adjp to whole number + if (job.cieca_pfl["LAB"].lbr_adjp) { + adjp = + Math.abs(job.cieca_pfl["LAB"].lbr_adjp) > 1 + ? job.cieca_pfl["LAB"].lbr_adjp + : job.cieca_pfl["LAB"].lbr_adjp * 100; //Adjust lbr_adjp to whole number + } } } }