@measurequick/measurequick-report-generator 1.0.28 → 1.0.30

package/assets/templates.js

@@ -229,6 +229,69 @@ export const systemInfo = {
     }
 };
 
+export const footerData = {
+    "headerLabel": "Customer",
+    "customerFirstName": {
+        "label": ""
+    },
+    "customerLastName": {
+        "label": ""
+    },
+    "customerAddressLine1": {
+        "label": ""
+    },
+    "customerAddressLine2": {
+        "label": ""
+    },
+    "customerCity": {
+        "label": ""
+    },
+    "customerState": {
+        "label": ""
+    },
+    "customerZip": {
+        "label": ""
+    },
+    "customerEmail": {
+        "label": ""
+    },
+    "customerPhone": {
+        "label": ""
+    },
+    "columnBreak": {
+        "label": ""
+    },
+    "headerLabel": "Customer",
+    "systemNumber": {
+        "label": ""
+    },
+    "systenName": {
+        "label": ""
+    },
+    "systemId": {
+        "label": "ID"
+    },
+    "systemLat": {
+        "label": ""
+    },
+    "systemLng": {
+        "label": ""
+    },
+    "subHeaderLabel": "Condenser",
+    "systemType": {
+        "label": ""
+    },
+    "systemMake": {
+        "label": ""
+    },
+    "systemModel": {
+        "label": ""
+    },
+    "systemSerial": {
+        "label": ""
+    }
+};
+
 export const profilePictureCoordinates = {
     "header": {
         "x": 7.5,

package/index.js

@@ -78,13 +78,14 @@ function printHeaderData(reportName, techName, profilePicture, companyLogo) {
 function printBodyData(geolocationMap) {
     doc.setTextColor(0, 0, 0);
     printMap(geolocationMap);
-    printSingleBodySection(templates.outdoorMeasurements, .25, 2.317, 1.55);
-    printSingleBodySection(templates.indoorMeasurements, 3.042, 5.109, 1.55);
-    printSingleBodySection(templates.systemInfo, 5.834, 7.9, 1.55);
-    printSingleBodySection(templates.performanceData, .25, 2, 4.655);
+    printSingleBodySection(templates.outdoorMeasurements, .25, 2.317, 1.33);
+    printSingleBodySection(templates.indoorMeasurements, 3.042, 5.109, 1.33);
+    printSingleBodySection(templates.systemInfo, 5.834, 7.9, 1.33);
+    printSingleBodySection(templates.performanceData, .25, 2, 4.435);
 }
 
 function printSingleBodySection(dataPoints, xLeft, xRight, y) {
+    var yTop = y;
     var s = .2;
     var dataPoint;
     var val;
@@ -94,18 +95,21 @@ function printSingleBodySection(dataPoints, xLeft, xRight, y) {
     for (let key in dataPoints) {
         if (key == "headerLabel") {
             doc.setFontStyle("bold");
-            doc.text(dataPoints.headerLabel, xLeft, y - .22);
+            doc.text(dataPoints.headerLabel, xLeft, y);
             doc.setFontStyle("normal");
+            y += .22;
         } else if (key.includes("subHeaderLabel")) {
             doc.setFontStyle("bold");
-            doc.text(dataPoints[`subHeaderLabel${i}`], xLeft, y - .22);
+            doc.text(dataPoints[`subHeaderLabel${i}`], xLeft, y);
             doc.setFontStyle("normal");
+            y += .22;
             i++;
         } else if (key == "columnBreak") {
             xLeft += 2;
             xRight += 2;
+            y = yTop;
         } else if (key == "rowBreak") {
-            y += .2;
+            y += .3;
         } else {
             dataPoint = dataPoints[key];
             val = reportData.values[key];
@@ -113,8 +117,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 - .1, .16, .16);
-            doc.addImage(graphics[reportData.toolIcons[key]], "JPEG", xRight+.3, y - .1, .16, .16);
+            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);
             y += s;
         }
     }

package/package.json

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