@measurequick/measurequick-report-generator 1.0.65 → 1.0.67

package/jspdf/mq-report-generator.js

@@ -55,7 +55,8 @@ function printBoilerPlateStandard() {
     doc.setFontSize(8);
     doc.text(headers.headerSection4Subsection1, .25, 4.655);
     doc.text(headers.headerSection4Subsection2, 2.25, 4.655);
-    doc.text(headers.headerSection4Subsection3, 2.25, 5.655);
+    let subsectionY = headers.headerSection4Subsection3 == 'Energy' ? 5.855 : 5.655;
+    doc.text(headers.headerSection4Subsection3, 2.25, subsectionY);
     doc.setFontSize(6.5);
     doc.setFontStyle("bolditalic");
     theme == "dark" ? doc.setTextColor(255, 255, 255) : doc.setTextColor(0, 0, 0);
@@ -127,6 +128,7 @@ function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y)
     let sMultiplier = 1;
 
     for (let key in dataPoints.values) {
+        if (key == "condenserVoltageSource" || key == "condenserAmperageSource" || key == "airHandlerVoltageSource" || key == "airHandlerAmperageSource") break;
         let dataPoint = dataPoints.values[key];
         let valueBeforeEditing = dataPoint;
         let templateRef = templates[measurementSection][key];
@@ -135,6 +137,8 @@ function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y)
             if (templateRef.hasOwnProperty("units")) {
                 units = Array.isArray(templateRef.units) ? `(${templateRef.units[0]} / ${templateRef.units[1]})` : `(${templateRef.units})`;
                 labelText += ` ${units}:`;
+                if ((key == "condenserVoltage" || key == "condenserAmperage" || key == "airHandlerVoltage" || key == "airHandlerAmperage") && dataPoints.values[`${key}Source`])
+                    doc.addImage(graphics[dataPoints.values[`${key}Source`]], "JPEG", xRight + .25, y - .12, .16, .16);
             } else labelText += ':';
             if (templateRef.hasOwnProperty("roundTo")) {
                 dataPoint *= 1;
@@ -176,7 +180,7 @@ function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y)
             y = yTop;
         } else if (key == "newRow") {
             y += .35;
-        }
+        } else console.log("No Template Found for: " + key);
     }
 }
 
@@ -280,6 +284,7 @@ function printSystemDiagnostics() {
 function printCorrectiveActions() {
     let y = 3.8;
     doc.setFontSize(9);
+    doc.setTextColor(0, 0, 0);
     let ca = JSON.parse(reportData.correctiveActions);
     for (let i = 0; i < Object.keys(ca).length; i++) {
         let sectionKey = Object.keys(ca)[i];

package/package.json

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

package/templates/js/templates.js

@@ -119,14 +119,10 @@ export const electricalMeasurements = {
 
 export const systemProfileWeatherDataGas = {
     "heat_type": {
-        "label": "Heating Type",
-        "units": "",
-        "roundTo": 1
+        "label": "Heating Type"
     },
     "fuel_type": {
-        "label": "Fuel Type",
-        "units": "",
-        "roundTo": 1
+        "label": "Fuel Type"
     },
     "gas_supply_pressure_min": {
         "label": "Min Gas Supply Pres.",
@@ -570,7 +566,7 @@ export const mqHeatingInfoPage = {
         "Indoor Equipment Condition:",
         "Venting System:",
         "Fuel Delivery System:",
-        "'Make Up Air System (CAZ):",
+        "Make Up Air System (CAZ):",
         "Heat Exchanger:",
         "Safety System:",
         "Combustion Efficiency:",