@measurequick/measurequick-report-generator 1.0.62 → 1.0.64

package/jspdf/mq-report-generator.js

@@ -11,16 +11,11 @@ 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) {
-            if (testNumber > 0) doc.addPage();
-            printBoilerPlateStandard();
-            printHeaderData();
-            printBodyData(currentSnapshot);
-            printFooterData();
-            resizeAndPrintStaticImages();
-            testNumber++;
-        }
+        printBoilerPlateStandard();
+        printHeaderData();
+        printBodyData(reportData.test);
+        printFooterData();
+        resizeAndPrintStaticImages();
         printDiagnosticPage();
         printInfoPage();
         printPhotoPages();
@@ -31,11 +26,12 @@ export function generateReport(reportType, payload) {
 }
 
 function printBoilerPlateStandard() {
-    doc.addImage(graphics.headerMeasureQuick, "JPEG", 0, 0, 8.5, 1);
-    doc.addImage(graphics.footerMeasureQuick, "JPEG", 0, 7.75, 8.5, 4.5);
-    let mqLogo = graphics.companyLogoMeasureQuickLight;
-    if (reportData.meta.reportTheme == "light")
-        mqLogo = graphics.companyLogoMeasureQuickDark;
+    let theme = JSON.parse(reportData.reportSettings).colorTheme;
+    if (theme == "dark") {
+        doc.addImage(graphics.headerMeasureQuick, "JPEG", 0, 0, 8.5, 1);
+        doc.addImage(graphics.footerMeasureQuick, "JPEG", 0, 7.75, 8.5, 4.5);
+    }
+    let mqLogo = theme == "dark" ? graphics.companyLogoMeasureQuickLight : graphics.companyLogoMeasureQuickDark;
     doc.addImage(mqLogo, "JPEG", .25, 10, 2.15625, .5);
     doc.setLineWidth(0.025);
     doc.setDrawColor(0);
@@ -62,14 +58,20 @@ function printBoilerPlateStandard() {
     doc.text(headers.headerSection4Subsection3, 2.25, 5.655);
     doc.setFontSize(6.5);
     doc.setFontStyle("bolditalic");
-    doc.setTextColor(255, 255, 255);
+    theme == "dark" ? doc.setTextColor(255, 255, 255) : doc.setTextColor(0, 0, 0);
     let disclaimer = `Disclaimer: This report was prepared by your service technician who is solely responsible for its content.  This report is provided “as-is” excluding all warranties expressed or implied including without limitation the warranty of merchantability. ©2017-${new Date().getFullYear()} Manifold Cloud Services Ltd.`;
     disclaimer = doc.splitTextToSize(disclaimer.toUpperCase(), 8);
     doc.text(disclaimer, .125, 10.66);
+    doc.setTextColor(255, 255, 255);
 }
 
 function printBoilerPlateDiagnostic() {
-    doc.addImage(graphics.headerMeasureQuick, "JPEG", 0, 0, 8.5, 1);
+    if (JSON.parse(reportData.reportSettings).colorTheme == "dark") doc.addImage(graphics.headerMeasureQuick, "JPEG", 0, 0, 8.5, 1);
+    doc.setFontSize(12);
+    doc.setFontStyle("bold");
+    JSON.parse(reportData.reportSettings).colorTheme == "dark" ? doc.setTextColor(255, 255, 255) : doc.setTextColor(0, 0, 0);
+    doc.text("Diagnostic Report", .25, .35);
+    doc.setTextColor(255, 255, 255);
     doc.setLineWidth(0.025);
     doc.setDrawColor(0);
     doc.setFillColor(242, 242, 242);
@@ -92,7 +94,9 @@ function printHeaderData() {
     do { size -= .5; } while ((doc.getStringUnitWidth(reportData.meta.reportName) * size / 72) > 4.5);
     doc.setFontSize(size);
     doc.setFontStyle("bold");
+    JSON.parse(reportData.reportSettings).colorTheme == "dark" ? doc.setTextColor(255, 255, 255) : doc.setTextColor(0, 0, 0);
     doc.text(reportData.meta.reportName, 0.25, .75);
+    doc.setTextColor(255, 255, 255);
 }
 
 function printBodyData(currentSnapshot) {
@@ -114,8 +118,7 @@ function printBodyData(currentSnapshot) {
 }
 
 function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y) {
-    let dataPoints = JSON.parse(reportData.snapshots[currentSnapshot][measurementSection]);
-    let printRangeIcons = true;
+    let dataPoints = JSON.parse(currentSnapshot[measurementSection]);
     let units = "";
     let labelText = "";
     let valueText = "";
@@ -129,10 +132,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,13 +150,23 @@ 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 (printRangeIcons) {
+            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 (JSON.parse(reportData.reportSettings).includeRangeIndicators) {
                 let rangeIconRef = getRangeIcon(key, valueBeforeEditing, currentSnapshot);
                 if (rangeIconRef) doc.addImage(graphics[rangeIconRef], "JPEG", xRight + .05, y - .12, .16, .16);
             }
-            let toolIconRef = getToolIcon(reportData.snapshots[currentSnapshot].toolIcons[key]);
+            let toolIconRef = getToolIcon(JSON.parse(currentSnapshot.toolIcons)[key]);
             if (toolIconRef) doc.addImage(graphics[toolIconRef], "JPEG", xRight + .25, y - .12, .16, .16);
             y += (s * sMultiplier);
         } else if (key == "newColumn") {
@@ -256,7 +270,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 +459,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,12 +494,12 @@ 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";
     } else {
-        let ranges = JSON.parse(reportData.snapshots[currentSnapshot].rangeIcons);
+        let ranges = JSON.parse(currentSnapshot.rangeIcons);
         let target = null, low = null, high = null;
         if (ranges[key]) {
             target = parseFloat(ranges[key]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measurequick/measurequick-report-generator",
-  "version": "1.0.62",
+  "version": "1.0.64",
   "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",