@measurequick/measurequick-report-generator 1.0.58 → 1.0.61

package/jspdf/mq-report-generator.js

@@ -3,12 +3,13 @@ import * as templates from "../templates/js/templates.js";
 import * as request from "../templates/js/request.js";
 
 let jsPDF = require("jspdf");
-let doc = new jsPDF(templates.docOptions);
+let doc;
 let reportData;
 let currentSnapshot;
 
 export function generateReport(reportType, payload) {
     try {
+        doc = new jsPDF(templates.docOptions);
         reportData = JSON.parse(JSON.stringify(payload));
         let testNumber = 0;
         for (currentSnapshot in reportData.snapshots) {
@@ -120,7 +121,8 @@ function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y)
     let valueText = "";
     let yTop = y;
     let s = .18;
-    let sMultiplier = measurementSection == "performanceData" ? 2 : 1;
+    // let sMultiplier = measurementSection == "performanceData" ? 2 : 1;
+    let sMultiplier = 1;
 
     for (let key in dataPoints.values) {
         let dataPoint = dataPoints.values[key];
@@ -144,7 +146,7 @@ function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y)
                 valueText = `${dataPoint} / ${secondaryDataPoint}`;
             } else valueText = `${dataPoint}`;
             if (templateRef.label) doc.text(labelText, xLeft, y);
-            if (isNaN(valueText) || !valueText) valueText = "--";
+            //if (isNaN(valueText) || !valueText) valueText = "--";
             doc.text(valueText, alignRight(valueText, xRight, 8), y);
             if (printRangeIcons) {
                 let rangeIconRef = getRangeIcon(key, valueBeforeEditing, currentSnapshot);
@@ -225,7 +227,7 @@ function printDiagnosticPage() {
     doc.addPage();
     printBoilerPlateDiagnostic();
     printSubsystemReview();
-    // printSystemDiagnostics();
+    printSystemDiagnostics();
     printCorrectiveActions();
 }
 
@@ -235,7 +237,9 @@ function printSubsystemReview() {
     let ssr = JSON.parse(reportData.subsystemReview);
     for (let i = 0; i < Object.keys(ssr).length; i++) {
         let key = Object.keys(ssr)[i];
+        doc.setTextColor(0, 0, 0);
         doc.text(templateRef[key], .25, y);
+        setColor(ssr[key]);
         doc.text(ssr[key], 3, y);
         y += .15;
     };
@@ -248,11 +252,11 @@ function printSystemDiagnostics() {
         let key = Object.keys(diagnostics)[i];
         let score = diagnostics[key].score;
         let diagnosticIcon = graphics.iconFlagGreen;
-        if (type === 'stability') icon = stability;
+        if (diagnostics[key].type === 'stability') diagnosticIcon = graphics.iconStability;
         else if (score > 1 && score < 10) diagnosticIcon = graphics.iconFlagRed;
         else if (score >= 10 && score < 15) diagnosticIcon = graphics.iconFlagYellow;
         else if (score >= 15) diagnosticIcon = graphics.iconFlagBlack;
-        if (diagnosticIcon) doc.addImage(graphics[diagnosticIcon], "JPEG", 7.8, y, .25, .25);
+        //if (diagnosticIcon) doc.addImage(diagnosticIcon, "JPEG", 7.8, y, .25, .25);
         y += .2;
         doc.text(diagnostics[key].title, 4.4375, y);
         doc.text(`${diagnostics[key].score}`, 7.5, y);
@@ -269,13 +273,13 @@ function printCorrectiveActions() {
             let actionKey = Object.keys(ca[sectionKey])[j];
             let action = ca[sectionKey][actionKey];
             if (actionKey == "header") {
-                doc.setFontSize(10);
+                doc.setFontSize(9);
                 doc.setFontStyle("bold");
-                doc.text(getTextFromAction(action), .25, y);
+                doc.text(action, .25, y);
             } else {
                 doc.setFontSize(8);
                 doc.setFontStyle("normal");
-                doc.text(actionKey, .25, y);
+                doc.text(getCorrectiveActionNameFromTag(actionKey), .25, y);
             }
             y += .18;
         }
@@ -374,6 +378,12 @@ function getPhotoSectionNameFromTag(tag) {
     return sectionName;
 }
 
+function getCorrectiveActionNameFromTag(tag) {
+    let tagUnderscoresReplaced = tag.replaceAll('_', ' ');
+    let sectionName = `${tagUnderscoresReplaced.charAt(0).toUpperCase()}${tagUnderscoresReplaced.slice(1)}`;
+    return sectionName;
+}
+
 function resizeAndPrintStaticImages() {
     let wMax = 2.25,
         hMax = .7,
@@ -443,6 +453,12 @@ function getToolIcon(measurementSource) {
     }
 }
 
+function setColor(measure) {
+    if (measure == 'Pass') doc.setTextColor(55, 99, 45);
+    else if (measure == 'Fail') doc.setTextColor(157, 45, 54);
+    else doc.setTextColor(0,0,0);
+}
+
 function getRangeIcon(key, actualValue, currentSnapshot) {
     let ranges = JSON.parse(reportData.snapshots[currentSnapshot].rangeIcons);
     let target = null, low = null, high = null;
@@ -460,10 +476,6 @@ function getRangeIcon(key, actualValue, currentSnapshot) {
     return rangeIconRef;
 }
 
-function getTextFromAction(action) {
-    return action;
-}
-
 function alignRight(text, rightAlign, fontSize) {
     return rightAlign - doc.getStringUnitWidth(text) * fontSize / 72;
 }

package/mq-system-vitals-report-generator.js

@@ -124,7 +124,8 @@ export async function generateReport(payload) {
     // print pass fail measures
     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"];
     for (let i = 1; i <= passFails.length; i++) {
-        let icon = payload.test[passFails[i - 1]] == "Pass" ? iconRangeGreen : iconRangeRed;
+        let meas = payload.test[passFails[i - 1]];
+        let icon = meas == "Pass" || meas == "High" || meas == "Mid"  ? iconRangeGreen : iconRangeRed;
         form.getButton(`ImageSubsystem${i}_af_image`).setImage(icon);
     }
 

package/package.json

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

package/templates/js/templates.js

@@ -304,13 +304,13 @@ export const outdoorMeasurements = {
     "pressure_evaporator": {
         "label": "Low Pressure",
         "units": ["PSIG", "°F"],
-        "secondaryValue": "lowSideTemperature",
+        "secondaryValue": "temperature_saturation_evaporator",
         "roundTo": 1
     },
     "pressure_condenser": {
         "label": "High Pressure",
         "units": ["PSIG", "°F"],
-        "secondaryValue": "highSideTemperature",
+        "secondaryValue": "temperature_saturation_condenser",
         "roundTo": 1
     },
     "temperature_suction_line_condenser": {
@@ -374,33 +374,29 @@ export const performanceData = {
         "label": "Actual"
     },
     "capacityActualNormalized": {
-        "label": "TestLabel"
+        "label": ""
     },
     "capacitySensible": {
         "label": "Sensible"
     },
     "capacitySensibleNormalized": {
-        "label": "TestLabel"
+        "label": ""
     },
     "capacityLatent": {
         "label": "Latent"
     },
     "capacityLatentNormalized": {
-        "label": "TestLabel"
+        "label": ""
     },
     "sensibleHeatRatio": {
         "label": "Sensible Heat Ratio",
         "roundTo": 2
     },
     "temperatureSplitTarget": {
-        "label": "Temp Split Target",
-        "units": "°F",
-        "roundTo": 1
+        "label": "Temp Split Target"
     },
     "temperatureSplit": {
-        "label": "Temp Split",
-        "units": "°F",
-        "roundTo": 1
+        "label": "Temp Split"
     },
     "dehumidification": {
         "label": "Dehumidification",
@@ -428,6 +424,10 @@ export const performanceData = {
     "sensibleEfficiency": {
         "label": "Sensible Efficiency",
         "roundTo": 1
+    },
+    "filterFaceVelocity": {
+        "label": "Fltr. Face Vel.",
+        "roundTo": 1
     }
 };
 
@@ -479,6 +479,9 @@ export const systemProfileWeatherData = {
     },
     "systemStability": {
         "label": "System Stability"
+    },
+    "systemBenchmarked": {
+        "label": "System Benchmarked"
     }
 };