@measurequick/measurequick-report-generator 1.0.62 → 1.0.63

package/jspdf/mq-report-generator.js

@@ -129,10 +129,11 @@ function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y)
         let valueBeforeEditing = dataPoint;
         let templateRef = templates[measurementSection][key];
         if (templateRef) {
-            if (templateRef.hasOwnProperty("units"))
+            labelText = templateRef.label;
+            if (templateRef.hasOwnProperty("units")) {
                 units = Array.isArray(templateRef.units) ? `(${templateRef.units[0]} / ${templateRef.units[1]})` : `(${templateRef.units})`;
-            else units = "";
-            labelText = `${templateRef.label} ${units}:`;
+                labelText += ` ${units}:`;
+            } else labelText += ':';
             if (templateRef.hasOwnProperty("roundTo")) {
                 dataPoint *= 1;
                 dataPoint = dataPoint.toFixed(templateRef.roundTo);
@@ -146,8 +147,18 @@ 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 = "--";
-            doc.text(valueText, alignRight(valueText, xRight, 8), y);
+            if (!valueText) valueText = "--";
+            let fs = 8;
+            if (key == "capacityActualNormalized" || key == "capacitySensibleNormalized" || key == "capacityLatentNormalized") {
+                doc.setFontSize(6);
+                fs = 6;
+                y -= .05;
+            }
+            doc.text(valueText, alignRight(valueText, xRight, fs), y);
+            if (key == "capacityActualNormalized" || key == "capacitySensibleNormalized" || key == "capacityLatentNormalized") {
+                doc.setFontSize(8);
+                y += .05;
+            }
             if (printRangeIcons) {
                 let rangeIconRef = getRangeIcon(key, valueBeforeEditing, currentSnapshot);
                 if (rangeIconRef) doc.addImage(graphics[rangeIconRef], "JPEG", xRight + .05, y - .12, .16, .16);
@@ -256,7 +267,7 @@ function printSystemDiagnostics() {
         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(diagnosticIcon, "PNG", 7.9, y, .18, .18);
+        if (diagnosticIcon) doc.addImage(diagnosticIcon, "PNG", 7.8, y + .1, .18, .18);
         y += .2;
         doc.text(diagnostics[key].title, 4.4375, y);
         doc.text(`${diagnostics[key].score}`, 7.5, y);
@@ -445,6 +456,11 @@ function resizeAndPrintStaticImages() {
             profileImage = profileSettings.base64ProfilePhotoSquare;
         if (profileImage)
             doc.addImage(profileImage, "PNG", x_profile, y_profile, size_profile, size_profile);
+        if (profileSettings.techName) {
+            doc.setTextColor(0, 0, 0);
+            doc.text(profileSettings.techName, x_profile, y_profile + size_profile);
+            doc.setTextColor(255, 255, 255);
+        }
     }
 }
 
@@ -475,7 +491,7 @@ function setColor(measure) {
 function getRangeIcon(key, actualValue, currentSnapshot) {
     // Special Case
     let rangeIconRef = null;
-    if (key == 'benchmarked') {
+    if (key == 'systemBenchmarked') {
         if (actualValue == 'Yes') rangeIconRef = "iconThumbprintGreen";
         else if (actualValue == 'Yes, under duress') rangeIconRef = "iconCautionTriangleYellow";
         else rangeIconRef = "iconThumbprintRed";

package/package.json

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

package/templates/js/templates.js

@@ -284,11 +284,9 @@ export const indoorMeasurements = {
     },
     "airHandlerVoltage": {
         "label": "AHU Voltage",
-        "roundTo": 1
     },
     "airHandlerAmperage": {
         "label": "AHU Amperage",
-        "roundTo": 1
     },
     "power_factor_ahu": {
         "label": "AHU Power Factor",