@measurequick/measurequick-report-generator 1.2.65 → 1.2.67

package/package.json

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

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

@@ -13,12 +13,28 @@ export async function getReport(payload) { console.log("Corrective Measures - Pa
       const form = pdfDoc.getForm();
 
       let labels = ["iconRangeHigh", "iconRangeLow", "iconRangeNormal", "iconTesto", "iconCalculator", "iconFieldpiece",
-                    "iconUei", "iconSporlanPro", "iconSporlanLegacy", "iconIconnect", "iconImanifold", "iconSensi",
+                    "iconUei", "iconSporlanPro", "iconSporlanLegacy", "iconIconnect", "iconImanifold", "iconSensi", "iconDg8",
                     "iconBluflame", "iconRedfish510", "iconRedfish510333", "iconRedfish550", "iconDg1000", "iconTrueflow", "iconThumbprintRed", "iconThumbprintGreen", "iconThumbprintYellow", "whiteBox"];
       for (let label of labels) embeddedIcons[label] = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64[label]));
       const mqLogoBytes =  util._base64ToArrayBuffer(base64.mqLogo);
       const mqLogo =   await pdfDoc.embedPng(mqLogoBytes);
 
+      if (payload.tests.length < 2) {
+        const page = pdfDoc.getPages()[0];
+        const button = form.createButton('HideSystemScore');
+        button.addToPage('', page, {
+          x: 581,
+          y: 295,
+          width: 221,
+          height: 135,
+          // textColor: rgb(1, 1, 1),
+          // backgroundColor: rgb(1, 1, 1),
+          // borderColor: rgb(1, 1, 1),
+          borderWidth: 0
+        });
+        button.setImage(embeddedIcons.whiteBox);
+      }
+
       // embed company logo and profile picture
       let profileImage, companyImage;
       let profileImageType = util.checkProfilePicture(payload.meta);
@@ -49,11 +65,11 @@ export async function getReport(payload) { console.log("Corrective Measures - Pa
       }
 
       let scoreHeader = payload.tests.length > 1 ? "Test In Score" : "Your System Score";
-      form.getTextField("YourSystemScoreHeader").setText("");
+      form.getTextField("YourSystemScoreHeader").setText(scoreHeader);
       let systemScorePercentage = payload.tests[0].testInfo.data.vitals_score ? +payload.tests[0].testInfo.data.vitals_score.toFixed(0) : 0;
       let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
       let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
-      if (!payload.tests[0].testInfo.canScoreVitals) {
+      if (!payload.tests[0].testInfo.data.vitals_score) {
         systemScorePercentage = "--";
         systemScoreGrade = "";
       } else systemScorePercentage += "%";
@@ -64,12 +80,12 @@ export async function getReport(payload) { console.log("Corrective Measures - Pa
         systemScorePercentage = payload.tests[1].testInfo.data.vitals_score ? +payload.tests[1].testInfo.data.vitals_score.toFixed(0) : 0;
         systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
         systemScoreColor = util.getColorFromGrade(systemScoreGrade);
-        if (!payload.tests[1].testInfo.canScoreVitals) {
+        if (!payload.tests[1].testInfo.data.vitals_score) {
           systemScorePercentage = "--";
           systemScoreGrade = "";
         } else systemScorePercentage += "%";
         form.getTextField(`YourSystemScore${systemScoreColor}2`).setText(`${systemScorePercentage} ${systemScoreGrade}`);
-      } else form.getButton("HideSystemScore").setImage(embeddedIcons.whiteBox);
+      }
 
       form.getTextField(`Block1-Title`).setText(payload.system_data.title1);
       for (let rowNum = 1; rowNum < 12; rowNum++) {

package/report-gen-scripts/full-report.js

@@ -18,6 +18,7 @@ export async function getReport(payload) { console.log("Full Report"); console.l
 
     const coreDoc = await PDFDocument.create();
 
+    /******** COVER SHEET (1 PAGE) *********/
     try {
       let coverPageBase64 = payload.meta.pdf_settings.includeCoverPage ? await coverPage.getReport(payload) : false;
       const coverPageDoc = coverPageBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(coverPageBase64)) : false;
@@ -25,8 +26,9 @@ export async function getReport(payload) { console.log("Full Report"); console.l
       if (_coverPageDoc) coreDoc.insertPage(coreDoc.getPages().length, _coverPageDoc);
     } catch (e) {} // error printed in original pdf script
 
+    /******** TEST IN VITALS (2 PAGES) *********/
     try {
-      if (payload.meta.report_mode == "goettl" || payload.tests.length > 1) {
+      if (payload.meta.report_mode == "goettl") {
         if (payload.tests && payload.tests[0] && payload.tests[0].testInfo && payload.tests[0].testInfo) {
           let vitalsReportBase64 = await vitalsCoolingReport.getReport(payload, payload.tests[0]);
           const vitalsReportDoc = await PDFDocument.load(util._base64ToArrayBuffer(vitalsReportBase64));
@@ -36,7 +38,7 @@ export async function getReport(payload) { console.log("Full Report"); console.l
           coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg2);
         }
         if (payload.tests && payload.tests[1] && payload.tests[1].testInfo && payload.tests[1].testInfo) {
-          let vitalsReportBase64_ = await vitalsHeatingReport.getReport(payload, payload.tests[1]);
+          let vitalsReportBase64_ = payload.meta.report_mode == "goettl" ? await vitalsHeatingReport.getReport(payload, payload.tests[1]) : await vitalsCoolingReport.getReport(payload, payload.tests[1]);
           const vitalsReportDoc_ = await PDFDocument.load(util._base64ToArrayBuffer(vitalsReportBase64_));
           const [_vitalsReportPg1_] = await coreDoc.copyPages(vitalsReportDoc_, [0]);
           const [_vitalsReportPg2_] = await coreDoc.copyPages(vitalsReportDoc_, [1]);
@@ -44,6 +46,7 @@ export async function getReport(payload) { console.log("Full Report"); console.l
           coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg2_);
         }
       } else if (payload.tests && payload.tests[0] && payload.tests[0].testInfo && payload.tests[0].testInfo) {
+        payload.meta.header = "Test In A/C Vitals";
         let vitalsReportBase64 = payload.meta.report_mode == "cooling" ? await vitalsCoolingReport.getReport(payload) : await vitalsHeatingReport.getReport(payload);
         const vitalsReportDoc = await PDFDocument.load(util._base64ToArrayBuffer(vitalsReportBase64));
         const [_vitalsReportPg1] = await coreDoc.copyPages(vitalsReportDoc, [0]);
@@ -53,17 +56,38 @@ export async function getReport(payload) { console.log("Full Report"); console.l
       }
     } catch (e) {} // error printed in original pdf script
 
+    /******** TEST IN MEASUREMENTS (1 PAGE) *********/
     try {
       let measurementDetailsBase64 = await measurementDetails.getReport(payload);
       const measurementDetailsDoc = measurementDetailsBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(measurementDetailsBase64)) : false;
       const [_measurementDetailsDoc] = measurementDetailsDoc ? await coreDoc.copyPages(measurementDetailsDoc, [0]) : false;
       if (_measurementDetailsDoc) coreDoc.insertPage(coreDoc.getPages().length, _measurementDetailsDoc);
+    } catch (e) {} // error printed in original pdf script
+
+    /******** TEST OUT VITALS (2 PAGES) *********/
+    try {
+      if (payload.tests && payload.tests[1] && payload.tests[1].testInfo && payload.tests[1].testInfo) {
+        payload.meta.header = "Test Out A/C Vitals";
+        let vitalsReportBase64 = payload.meta.report_mode == "cooling" ? await vitalsCoolingReport.getReport(payload) : await vitalsHeatingReport.getReport(payload);
+        const vitalsReportDoc = await PDFDocument.load(util._base64ToArrayBuffer(vitalsReportBase64));
+        const [_vitalsReportPg1] = await coreDoc.copyPages(vitalsReportDoc, [0]);
+        const [_vitalsReportPg2] = await coreDoc.copyPages(vitalsReportDoc, [1]);
+        coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg1);
+        coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg2);
+      }
+    } catch (e) {} // error printed in original pdf script
+
+    /******** TEST OUT MEASUREMENTS (1 PAGE) *********/
+    try {
       if (payload.tests.length > 1) {
+          let measurementDetailsBase64 = await measurementDetails.getReport(payload);
+          const measurementDetailsDoc = measurementDetailsBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(measurementDetailsBase64)) : false;
           const [_measurementDetailsDocPg2] = measurementDetailsDoc ? await coreDoc.copyPages(measurementDetailsDoc, [1]) : false;
           if (_measurementDetailsDocPg2) coreDoc.insertPage(coreDoc.getPages().length, _measurementDetailsDocPg2);
       }
     } catch (e) {} // error printed in original pdf script
 
+    /******** CORRECTIVE MEASURES (1 PAGE) *********/
     try {
       let correctiveMeasuresBase64 = await correctiveMeasures.getReport(payload);
       const correctiveMeasuresDoc = correctiveMeasuresBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(correctiveMeasuresBase64)) : false;
@@ -71,6 +95,7 @@ export async function getReport(payload) { console.log("Full Report"); console.l
       if (_correctiveMeasuresDoc) coreDoc.insertPage(coreDoc.getPages().length, _correctiveMeasuresDoc);
     } catch (e) {} // error printed in original pdf script
 
+    /******** PHOTOS (X PAGES) *********/
     try {
       let selectedPhotosReport = payload.meta.origin == 'virtuoso' ? photosReportS3 : photosReport;
       let photosReportBase64 = (payload.meta.pdf_settings.includePhotos && payload.meta.photo_count > 0) ? await selectedPhotosReport.getReport(payload.photos) : false;
@@ -81,6 +106,7 @@ export async function getReport(payload) { console.log("Full Report"); console.l
       }
     } catch (e) {} // error printed in original pdf script
 
+    /******** SYSTEM INFO (1 PAGE) *********/
     try {
       let systemInfoPageBase64 = await systemInfoPage.getReport(payload);
       const systemInfoPageDoc = systemInfoPageBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(systemInfoPageBase64)) : false;

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

@@ -28,7 +28,7 @@ export async function getReport(payload) { console.log("Measurement Details - Pa
     }
 
     let labels = ["iconRangeHigh", "iconRangeLow", "iconRangeNormal", "iconTesto", "iconCalculator", "iconFieldpiece",
-      "iconUei", "iconSporlanPro", "iconSporlanLegacy", "iconIconnect", "iconImanifold", "iconSensi",
+      "iconUei", "iconSporlanPro", "iconSporlanLegacy", "iconIconnect", "iconImanifold", "iconSensi", "iconDg8",
       "iconBluflame", "iconRedfish510", "iconRedfish510333", "iconRedfish550", "iconDg1000", "iconTrueflow", "iconThumbprintRed", "iconThumbprintGreen", "iconThumbprintYellow"
     ];
     for (let label of labels) embeddedIconsTestIn[label] = await pdfDocPg1.embedPng(util._base64ToArrayBuffer(base64[label]));
@@ -119,7 +119,7 @@ export async function getReport(payload) { console.log("Measurement Details - Pa
       let systemScorePercentage = payload.tests[t].testInfo.data.vitals_score ? +payload.tests[t].testInfo.data.vitals_score.toFixed(0) : 0;
       let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
       let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
-      if (!payload.tests[0].testInfo.canScoreVitals) {
+      if (!payload.tests[0].testInfo.data.vitals_score) {
         systemScorePercentage = "--";
         systemScoreGrade = "";
       } else systemScorePercentage += "%";

package/report-gen-scripts/system-info-page.js

@@ -1,15 +1,21 @@
 import { PDFDocument } from 'pdf-lib';
-import * as pdfCooling from '../base-64/understanding-cooling.js';
-import * as pdfHeating from '../base-64/understanding-heating.js';
+import * as base64 from '../base-64/icons.js';
+import * as pdfCooling from '../base-64/system-info-cooling.js';
+import * as pdfHeating from '../base-64/system-info-heating.js';
 import * as util from '../util.js';
 
-export async function getReport(payload) { console.log("Understanding Report");
-    const pdfDoc = payload.meta.report_mode == "heating" ? await PDFDocument.load(util._base64ToArrayBuffer(pdfHeating.base64)) : await PDFDocument.load(util._base64ToArrayBuffer(pdfCooling.base64));
-    const form = pdfDoc.getForm();
-    const mqLogoBytes =  util._base64ToArrayBuffer(base64.mqLogo);
-    const mqLogo =   await pdfDoc.embedPng(mqLogoBytes);
-    form.getButton("FullWidthLogo").setImage(mqLogo);
-    form.flatten();
-    const pdfBase64 = await pdfDoc.saveAsBase64({ dataUri: true });
-    return pdfBase64;
+export async function getReport(payload) { console.log("System Info Page");
+  try {
+      const pdfDoc = payload.meta.report_mode == "heating" ? await PDFDocument.load(util._base64ToArrayBuffer(pdfHeating.base64)) : await PDFDocument.load(util._base64ToArrayBuffer(pdfCooling.base64));
+      const form = pdfDoc.getForm();
+      const mqLogoBytes =  util._base64ToArrayBuffer(base64.mqLogo);
+      const mqLogo =   await pdfDoc.embedPng(mqLogoBytes);
+      form.getButton("FullWidthLogo").setImage(mqLogo);
+      form.flatten();
+      const pdfBase64 = await pdfDoc.saveAsBase64({ dataUri: true });
+      return pdfBase64;
+    } catch (e) {
+      console.log(e);
+      return false;
+    }
 }

package/report-gen-scripts/understanding-page.js

@@ -1,9 +1,9 @@
 import { PDFDocument } from 'pdf-lib';
-import * as pdfCooling from '../base-64/system-info-cooling.js';
-import * as pdfHeating from '../base-64/system-info-heating.js';
+import * as pdfCooling from '../base-64/understanding-cooling.js';
+import * as pdfHeating from '../base-64/understanding-heating.js';
 import * as util from '../util.js';
 
-export async function getReport(payload) { console.log("System Info Page");
+export async function getReport(payload) { console.log("Understanding Page");
     const pdfDoc = payload.meta.report_mode == "heating" ? await PDFDocument.load(util._base64ToArrayBuffer(pdfHeating.base64)) : await PDFDocument.load(util._base64ToArrayBuffer(pdfCooling.base64));
     const form = pdfDoc.getForm();
     const mqLogoBytes =  util._base64ToArrayBuffer(base64.mqLogo);

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

@@ -70,8 +70,11 @@ export async function getReport(payload, _test) { console.log("Vitals Cooling -
         form.getTextField("SystemDiagnostics1").setText("No system-wide issues were detected.");
     }
 
+    let header = payload.meta.header ? payload.meta.header : "A/C System Vitals";
+    form.getTextField('Header').setText(header);
+
     // get text fields
-    let textFields = getTextFields(payload);
+    let textFields = getTextFields(payload, t);
 
     // print company logo and profile picture
     if (profileImage && companyImage) { // both images are embedded in the document
@@ -118,12 +121,10 @@ export async function getReport(payload, _test) { console.log("Vitals Cooling -
         form.getTextField('TimeOfServiceUpper').setText(date.toLocaleTimeString("en-US"));
     }
 
-
-    console.log();
-    let systemScorePercentage = payload.tests[0].testInfo.data.vitals_score ? +payload.tests[0].testInfo.data.vitals_score.toFixed(0) : 0;
+    let systemScorePercentage = t.data.vitals_score ? +t.data.vitals_score.toFixed(0) : 0;
     let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
     let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
-    if (!payload.tests[0].testInfo.canScoreVitals && !payload.pdfSettings.alwaysShowVitals) {
+    if (!t.data.vitals_score) {
       systemScorePercentage = "--";
       systemScoreGrade = "";
     } else systemScorePercentage += "%";
@@ -162,15 +163,15 @@ export async function getReport(payload, _test) { console.log("Vitals Cooling -
     for (let i = 0; i < measureLabels.length; i++) {
         let iconPlacement = "Mid";
         let icon = iconRangeRed;
-        let actual = +payload.tests[0].testInfo.data[targetKeys[i]];
-        let mid = +payload.tests[0].testInfo.targets[targetKeys[i]];
-        let low = +payload.tests[0].testInfo.targets[`${targetKeys[i]}_ideal_low`];
-        let high = +payload.tests[0].testInfo.targets[`${targetKeys[i]}_ideal_high`];
+        let actual = +t.data[targetKeys[i]];
+        let mid = +t.targets[targetKeys[i]];
+        let low = +t.targets[`${targetKeys[i]}_ideal_low`];
+        let high = +t.targets[`${targetKeys[i]}_ideal_high`];
         low = mid - low;
         high = mid + high;
         if (targetKeys[i] == "pressure_static_total_external") high = mid * 1.4;
         else if (targetKeys[i] == "velocity_face_filter1") high = 500;
-        let val = payload.tests[0].testInfo.data[targetKeys[i]];
+        let val = t.data[targetKeys[i]];
         if (actual < low && targetKeys[i] != "velocity_face_filter1") iconPlacement = "Low";
         else if (actual > high) iconPlacement = "High";
         else if (val) icon = iconRangeGreen;
@@ -182,11 +183,11 @@ export async function getReport(payload, _test) { console.log("Vitals Cooling -
     }
 
     // print pass fail measures
-    if (payload.tests[0].testInfo.subsystem_review_complete) {
+    if (t.subsystem_review_complete) {
       let passFails = ["electrical_system_pass_fail", "air_distribution_system_pass_fail", "air_filtration_system_pass_fail", "condensate_drain_system_pass_fail", "refrigerant_charge_pass_fail", "outdoor_equipment_pass_fail", "indoor_equipment_pass_fail", "cooling_capacity_pass_fail", "cooling_electrical_efficiency_pass_fail"];
       let pfLabels = ["Electrical system", "Air distribution system", "Air filtration system", "Condensate drain system", "Refrigerant charge", "Outdoor equipment", "Indoor equipment", "Cooling capacity", "Cooling electrical efficiency"];
       for (let i = 1; i <= passFails.length; i++) {
-          let meas = payload.tests[0].testInfo[passFails[i - 1]];
+          let meas = t[passFails[i - 1]];
           let icon = meas == "Pass" || meas == "High" || meas == "Mid"  ? iconRangeGreen : iconRangeRed;
           console.log(passFails[i - 1] + " || " + meas + " || " + icon);
           form.getButton(`ImageSubsystem${i}_af_image`).setImage(icon);
@@ -201,8 +202,7 @@ export async function getReport(payload, _test) { console.log("Vitals Cooling -
   } catch (error) { console.log(error) }
 }
 
-function getTextFields(payload) {
-    let test = payload.tests[0].testInfo;
+function getTextFields(payload, test) {
     return {
         "cName": payload.site.customer.first_name && payload.site.customer.last_name ? `${payload.site.customer.first_name} ${payload.site.customer.last_name}` : "",
         "address": payload.site.location.address ? payload.site.location.address : "",

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

@@ -49,6 +49,9 @@ export async function getReport(payload, _test) { console.log("Vitals Heating -
     // get form for filling
     const form = pdfDoc.getForm();
 
+    let header = payload.meta.header ? payload.meta.header : "A/C System Vitals";
+    form.getTextField('Header').setText(header);
+
     // get text fields
     let textFields = getTextFields(payload);
 
@@ -98,10 +101,10 @@ export async function getReport(payload, _test) { console.log("Vitals Heating -
     }
 
 
-    let systemScorePercentage = payload.tests[0].testInfo.data.vitals_score ? +payload.tests[0].testInfo.data.vitals_score.toFixed(0) : 0;
+    let systemScorePercentage = test.testInfo.data.vitals_score ? +test.testInfo.data.vitals_score.toFixed(0) : 0;
     let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
     let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
-    if (!payload.tests[0].testInfo.canScoreVitals && !payload.pdfSettings.alwaysShowVitals) {
+    if (!test.testInfo.canScoreVitals && !payload.pdfSettings.alwaysShowVitals) {
       systemScorePercentage = "--";
       systemScoreGrade = "";
     } else systemScorePercentage += "%";
@@ -151,7 +154,7 @@ export async function getReport(payload, _test) { console.log("Vitals Heating -
         high = mid + high;
         if (targetKeys[i] == "pressure_static_total_external") high = mid * 1.4;
         else if (targetKeys[i] == "velocity_face_filter1") high = 500;
-        let val = payload.tests[0].testInfo.data[targetKeys[i]];
+        let val = test.testInfo.data[targetKeys[i]];
         if (actual < low && targetKeys[i] != "velocity_face_filter1") iconPlacement = "Low";
         else if (actual > high) iconPlacement = "High";
         else if (val) icon = iconRangeGreen;
@@ -179,7 +182,7 @@ export async function getReport(payload, _test) { console.log("Vitals Heating -
     form.getButton(`ImageEfficiency${specialCasePlacement}`).setImage(specialCaseIcon);
 
     // print pass fail measures
-    if (payload.tests[0].testInfo.subsystem_review_complete) {
+    if (test.testInfo.subsystem_review_complete) {
       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"];
       let pfLabels = ["Ambient CO", "Control system (thermostat)", "Electrical system", "Air distribution system", "Air filtration system", "Condensate drain system", "Indoor equipment", "Venting system"];
       for (let i = 1; i <= passFails.length; i++) {
@@ -198,7 +201,7 @@ export async function getReport(payload, _test) { console.log("Vitals Heating -
 }
 
 function getTextFields(payload) {
-    let test = payload.tests[0].testInfo;
+    let test = test.testInfo;
     return {
         "cName": payload.site.customer.first_name && payload.site.customer.last_name ? `${payload.site.customer.first_name} ${payload.site.customer.last_name}` : "",
         "address": payload.site.location.address ? payload.site.location.address : "",

package/util.js

@@ -79,6 +79,7 @@ export function getToolIcon(test, ref, embeddedIcons) {
             case "TrueFlow": toolIcon = embeddedIcons.iconTrueflow; break;
             case "Calculator": toolIcon = embeddedIcons.iconCalculator; break;
             case "DG-1000": toolIcon = embeddedIcons.iconDg1000; break;
+            case "DG-8": toolIcon = embeddedIcons.iconDg8; break;
         }
     }
     if (test.source[ref] == "iDVM510" && ref.includes("amperage")) toolIcon = embeddedIcons.iconRedfish510333;