@measurequick/measurequick-report-generator 1.1.76 → 1.1.77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measurequick/measurequick-report-generator",
-  "version": "1.1.76",
+  "version": "1.1.77",
   "description": "Generates PDF documents for various MeasureQuick applications.",
   "main": "index.js",
   "scripts": {

package/report-gen-scripts/corrective-measures.js

@@ -16,8 +16,7 @@ export async function getReport(payload) {
                   "iconBluflame", "iconRedfish510", "iconRedfish510333", "iconRedfish550", "iconDg1000", "iconTrueflow", "iconThumbprintRed", "iconThumbprintGreen", "iconThumbprintYellow"];
     for (let label of labels) embeddedIcons[label] = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64[label]));
 
-    let scoreDeduction = payload.meta.score_deduction;
-    let systemScorePercentage = +(100 - +(scoreDeduction.toFixed(0)));
+    let systemScorePercentage = +payload.meta.score.toFixed(0);
     let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
     let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
     form.getTextField(`YourSystemScore${systemScoreColor}`).setText(`${systemScorePercentage}% ${systemScoreGrade}`);

package/report-gen-scripts/measurement-details.js

@@ -46,8 +46,7 @@ export async function getReport(payload) { console.log(payload);
             form.getTextField('Time of Service').setText(date.toLocaleTimeString("en-US"));
         }
 
-        let scoreDeduction = payload.meta.score_deduction;
-        let systemScorePercentage = +(100 - +(scoreDeduction.toFixed(0)));
+        let systemScorePercentage = +payload.meta.score.toFixed(0);
         let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
         let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
         form.getTextField(`YourSystemScore${systemScoreColor}`).setText(`${systemScorePercentage}% ${systemScoreGrade}`);

package/report-gen-scripts/vitals-cooling-report.js

@@ -35,20 +35,15 @@ export async function getReport(payload) { console.log(payload);
     const form = pdfDoc.getForm();
 
     // print system diagnostics section
-    let scoreDeduction = 0;
     let t = payload.tests[0].testInfo;
     if (t && t.diagnostics && t.diagnostics.multi_point_analysis && t.diagnostics.multi_point_analysis.length > 0) {
         for (let i = 0; i < 9; i++) {
             let d = t.diagnostics.multi_point_analysis[i];
             if (d) {
                 let diagnosticIcon = iconFlagBlack;
-                if (d.type === 'stability')
-                    diagnosticIcon = iconStability;
-                else if (d.score > 1 && d.score < 10) {
-                    diagnosticIcon = iconFlagRed;
-                    scoreDeduction += d.score;
-                } else if (d.score >= 10 && d.score < 15)
-                    diagnosticIcon = iconFlagYellow;
+                if (d.type === 'stability') diagnosticIcon = iconStability;
+                else if (d.score > 1 && d.score < 10) diagnosticIcon = iconFlagRed;
+                else if (d.score >= 10 && d.score < 15) diagnosticIcon = iconFlagYellow;
                 form.getButton(`ImageDiagnostics${i+1}_af_image`).setImage(diagnosticIcon);
                 form.getTextField(`SystemDiagnostics${i+1}`).setText(`${d.title}`);
                 form.getTextField(`SystemDiagnostics${i+1}a`).setText(`${d.score}`);
@@ -58,11 +53,8 @@ export async function getReport(payload) { console.log(payload);
         form.getButton("ImageDiagnostics1_af_image").setImage(iconFlagGreen);
         form.getTextField("SystemDiagnostics1").setText("No system-wide issues were detected.");
     }
-    if (t.score_deduction) {
-        scoreDeduction = t.score_deduction;
-    }
 
-    let systemScorePercentage = +(100 - +(scoreDeduction.toFixed(0)));
+    let systemScorePercentage = +payload.meta.score.toFixed(0);
     let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
     let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
 

package/report-gen-scripts/vitals-heating-report.js

@@ -35,9 +35,7 @@ export async function getReport(payload) { console.log("Vitals Heating Report");
     const form = pdfDoc.getForm();
 
     // print system diagnostics section
-    let scoreDeduction = 0;
-
-    let systemScorePercentage = payload.tests[0].testInfo.data.efficiency_gcv;
+    let systemScorePercentage = +payload.meta.score.toFixed(0);
     let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
     let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
 
@@ -142,7 +140,7 @@ export async function getReport(payload) { console.log("Vitals Heating Report");
     // print pass fail measures
     let passFails = ["ambient_co_pass_fail", "control_system_pass_fail", "electrical_system_pass_fail", "air_distribution_system_pass_fail", "air_filtration_system_pass_fail", "condensate_drain_system_pass_fail", "indoor_equipment_pass_fail", "venting_system_pass_fail", "fuel_delivery_system_pass_fail", "make_up_air_system_pass_fail", "heat_exchanger_pass_fail", "safety_system_pass_fail", "heating_operation_pass_fail", "combustion_safety_pass_fail", "combustion_efficiency_pass_fail"];
     for (let i = 1; i <= passFails.length; i++) {
-        let meas = payload.test[passFails[i - 1]];
+        let meas = test[passFails[i - 1]];
         let icon = meas == "Pass" || meas == "High" || meas == "Mid"  ? iconRangeGreen : iconRangeRed;
         form.getButton(`ImageSubsystem${i}_af_image`).setImage(icon);
     }

package/util.js

@@ -37,7 +37,7 @@ export function getColorFromGrade(grade) {
 
 export function getToolIcon(test, ref, embeddedIcons) {
     let toolIcon;
-    if (test.data.calculated[ref]) toolIcon = embeddedIcons.iconCalculator;
+    if (test.data.calculated && test.data.calculated[ref]) toolIcon = embeddedIcons.iconCalculator;
     else {
         switch (test.source[ref]) {
             case "Testo": toolIcon = embeddedIcons.iconTesto; break;