@measurequick/measurequick-report-generator 1.0.8 → 1.0.10

package/assets/templates.js

@@ -249,4 +249,34 @@ export const footerData = [
     "systemSerial"
 ];
 
-export const 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.`;
+export const profilePictureCoordinates = {
+    "header": {
+        "x": 1,
+        "y": 1,
+        "w": 1,
+        "h": 1
+    },
+    "footer": {
+        "x": 1,
+        "y": 9,
+        "w": 1,
+        "h": 1
+    }
+};
+
+export const companyLogoCoordinates = {
+    "header": {
+        "x": 6.5,
+        "y": 1,
+        "w": 1,
+        "h": 1
+    },
+    "footer": {
+        "x": 6.5,
+        "y": 9,
+        "w": 1,
+        "h": 1
+    }
+};
+
+// export const 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.`;

package/index.js

@@ -36,6 +36,7 @@ export function getReport(data=null) {
 
 function printBoilerPlate(theme) {
     doc.addImage(graphics.headerMeasureQuick, "JPEG", 0, 0, 8.5, 1);
+    doc.addImage(graphics.footerMeasureQuick, "JPEG", 0, 7.75, 8.5, 4.5);
     doc.addImage(graphics.companyLogoMeasureQuickLight, "JPEG", .25, 10, 2.15625, .5);
 
     doc.setLineWidth(0.025);
@@ -51,23 +52,18 @@ function printBoilerPlate(theme) {
     doc.addImage(graphics.iconInfo, "JPEG", 6.044, 1.625, 2, 2);
     doc.addImage(graphics.iconPerformance, "JPEG", 1.15625, 4.9375, 2, 2);
 
-    doc.addImage(graphics.footerMeasureQuick, "JPEG", 0, 7.75, 8.5, 4.5);
-
     doc.setFontSize(6.5);
     doc.setFontStyle("bolditalic");
-    if (theme == "dark") doc.setTextColor(255, 255, 255);
-    disclaimer = doc.splitTextToSize(templates.disclaimer.toUpperCase(), 8);
+    doc.setTextColor(255, 255, 255);
+    var 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);
 }
 
 function printHeaderData(reportName, techName, profilePicture, companyLogo) {
-    var x = 0;
-    var y = 0;
-    var w = 0;
-    var h = 0;
     doc.text(reportName, 0.25, .75);
-    if (profilePicture) printProfilePicture(techName, profilePicture);
-    if (companyLogo) printCompanyLogo(companyLogo);
+    if (profilePicture) printProfilePicture("header", techName, profilePicture);
+    if (companyLogo) printCompanyLogo("header", companyLogo);
 }
 
 function printBodyData(geolocationMap) {
@@ -101,34 +97,24 @@ function printMap(geolocationMap) {
     doc.addImage(geolocationMap, "JPEG", 4.3125, 4.25, 4.0625, 3.375);
 }
 
-function printProfilePicture(techName, profilePicture) {
-    var x = 0;
-    var y = 0;
-    var w = 0;
-    var h = 0;
-    doc.addImage(profilePicture, "JPEG", x, y, w, h);
-    doc.text(techName, x, y, w, h);
+function printProfilePicture(picturePlacement, techName, profilePicture) {
+    var coords = templates.profilePictureCoordinates[picturePlacement];
+    doc.addImage(profilePicture, "JPEG", coords.x, coords.y, coords.w, coords.h);
+    doc.text(techName, coords.x, coords.y + 1, coords.w, coords.h);
 }
 
-function printCompanyLogo(companyLogo) {
-    var x = 0;
-    var y = 0;
-    var w = 0;
-    var h = 0;
-    doc.addImage(companyLogo, "JPEG", x, y, w, h);
+function printCompanyLogo(logoPlacement, companyLogo) {
+    var coords = templates.profilePictureCoordinates[picturePlacement];
+    doc.addImage(companyLogo, "JPEG", coords.x, coords.y, coords.w, coords.h);
 }
 
 function printFooterData(techName, profilePicture, companyLogo) {
-    var x = 0;
-    var y = 0;
-    var w = 0;
-    var h = 0;
-    if (profilePicture) printProfilePicture(techName, profilePicture);
-    if (companyLogo) printCompanyLogo(companyLogo);
+    if (profilePicture) printProfilePicture("footer", techName, profilePicture);
+    if (companyLogo) printCompanyLogo("footer", companyLogo);
 
     var s = .2;
-    var x = 0;
-    var y = 0;
+    var x = 1;
+    var y = 7;
     templates.footerData.forEach(key => {
         doc.text(reportData.values[key], x, y);
         y += s;

package/package.json

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