@measurequick/measurequick-report-generator 1.0.37 → 1.0.39

package/assets/request.js

@@ -219,9 +219,9 @@ export const body = {
         "systemModel": "4582384532",
         "systemSerial": "8459296520",
         "subHeaderLabel2": "Air Handler",
-        "systemMake": "Newman",
-        "systemModel": "123456789",
-        "systemSerial": "asdfghjkl"
+        "airHandlerMake": "Newman",
+        "airHandlerModel": "123456789",
+        "airHandlerSerial": "asdfghjkl"
     },
     "photos": {
         "profilePicture": "data:image/jpeg;base64,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",

package/index.js

@@ -92,8 +92,10 @@ function printSingleBodySection(dataPoints, xLeft, xRight, y) {
     var units;
     var text;
     var i = 1;
+    var printIcons = true;
     for (let key in dataPoints) {
         if (key == "headerLabel") {
+            printIcons = !(dataPoints.headerLabel == "Performance Calculations");
             doc.setFontStyle("bold");
             doc.setFontSize(9);
             doc.text(dataPoints.headerLabel, xLeft, y);
@@ -122,8 +124,8 @@ function printSingleBodySection(dataPoints, xLeft, xRight, y) {
             text = dataPoint.hasOwnProperty("secondaryValue") ? `${val} / ${reportData.values[dataPoint.secondaryValue]}` : val;
             doc.text(`${dataPoint.label}${units}:`, xLeft, y);
             doc.text(text, alignRight(text, xRight, 8), y);
-            doc.addImage(graphics[reportData.rangeIcons[key]], "JPEG", xRight + .05, y - .12, .16, .16);
-            doc.addImage(graphics[reportData.toolIcons[key]], "JPEG", xRight+.25, y - .12, .16, .16);
+            if (printIcons) doc.addImage(graphics[reportData.rangeIcons[key]], "JPEG", xRight + .05, y - .12, .16, .16);
+            if (printIcons) doc.addImage(graphics[reportData.toolIcons[key]], "JPEG", xRight+.25, y - .12, .16, .16);
             y += s;
         }
     }
@@ -158,7 +160,7 @@ function printFooterData(techName, profilePicture, companyLogo) {
     doc.setFontType("bold");
     doc.setFontSize(12);
     doc.text("Customer", x, y);
-    doc.text(reportData.footerData.systemName, x + 2, y);
+    doc.text(reportData.footerData.systemName, x + 2.5, y);
     doc.setFontType("normal");
     doc.setFontSize(10);
 
@@ -166,7 +168,7 @@ function printFooterData(techName, profilePicture, companyLogo) {
 
     for (let key in reportData.footerData) {
         if (key == "columnBreak") {
-            x += 2;
+            x += 2.5;
             y = 8 + s;
         } else if (key.includes("subHeaderLabel")) {
             doc.setFontType("bold");
@@ -182,13 +184,23 @@ function printFooterData(techName, profilePicture, companyLogo) {
 
 function printPhotos(photoArray) {
     doc.addPage();
+    var x = 0;
+    var y = 0;
+    var i = 0;
     for (let photo in photoArray) {
-
+        doc.addImage(photo.base64, "PNG", x, y, 4, 4);
+        y += 4;
+        i++;
+        if (i == 2) {
+            i = 0;
+            doc.addPage();
+        }
     }
 }
 
 function printInfoPage(reportType) {
     doc.addPage();
+    doc.setTextColor(0, 0, 0);
     if (reportType == "cooling") {
         doc.text(templates.coolingInfoPage.body, 1, 1);
     } else if (reportType == "heating") {

package/package.json

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