@measurequick/measurequick-report-generator 1.2.155 → 1.2.157

package/package.json

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

package/report-gen-scripts/classic-report.js

@@ -49,8 +49,8 @@ export async function getReport(payload) {
 
         let testObjs = [];
         if (payload.tests) {
-            if (payload.tests.hvac_tuneup_test_in) testObjs.push(payload.tests.hvac_tuneup_test_in);
-            if (payload.tests.hvac_tuneup_test_out) testObjs.push(payload.tests.hvac_tuneup_test_out);
+            if (payload.tests[0] && payload.tests[0].testInfo) testObjs.push(payload.tests[0].testInfo);
+            if (payload.tests[1] && payload.tests[1].testInfo) testObjs.push(payload.tests[1].testInfo);
         } else testObjs.push(payload.test);
 
         let testo_size = .16,
@@ -3723,15 +3723,12 @@ export async function getReport(payload) {
         }
 
         // PRINT PHOTOS TAKEN IN PHOTO DOCUMENTATION SECTION
-
-        let photos = equipObj.photos;
-        if (projectObj.show_photo_documentation) {
+        let photos = payload.images.equipment;
+        if (projectObj) {
             for (let i = 0; i < 4; i++) {
                 if (hasPhotos(photos)) {
-                    if (cloud_generation)
-                        doc.addPage();
-                    else
-                        doc.addPage(8.5, 11);
+                    if (cloud_generation) doc.addPage();
+                    else doc.addPage(8.5, 11);
                     doc.setTextColor(0, 0, 0);
                     let x = .25,
                         y = [.45, .6, .7, 4.85, 5, 5.5], // [0]: tag, [1]: "photos", [2]: photos, [3]: "notes", [4]: notes, [5]: divider
@@ -3746,7 +3743,6 @@ export async function getReport(payload) {
                         maxPhotosPerRow = 2,
                         rowCount = 0,
                         photosInRow = 0;
-
                     doc.setFontSize(9);
                     doc.setFontStyle('bold');
                     let type = 'Equipment';
@@ -3755,17 +3751,12 @@ export async function getReport(payload) {
                     else if (i == 3) type = 'Customer';
                     doc.text(type + ' Photos', x, y[0]);
                     doc.setFontStyle('normal');
-
-                    let //ki,
-                        len = Object.keys(photos).length;
+                    let len = Object.keys(photos).length;
                     for (let i = 0; i < len; i++) { // Loops Rows
                         let ki = Object.keys(photos)[i];
                         if (photos[ki].photos && Object.keys(photos[ki].photos).length > 0) { // Photos Exist
-                            //doc.setFontSize(9);
-                            //doc.text(photos[ki].name, x, y[0]);
                             doc.setFontSize(8);
                             doc.text(photos[ki].name, x, y[1]);
-
                             for (let j = 0; j < photos[ki].photos.length; j++) { // Loop Images
                                 if (photos[ki].photos[j].base64) {
                                     let r = photos[ki].photos[j].aspect_ratio * 1;
@@ -3833,9 +3824,9 @@ export async function getReport(payload) {
                         }
                     }
                 }
-                if (i == 0) photos = projectObj.photos;
-                else if (i == 1) photos = siteObj.photos;
-                else if (i == 2) photos = siteObj.customer.photos;
+                if (i == 0) photos = payload.images.project;
+                else if (i == 1) photos = payload.images.site;
+                else if (i == 2) photos = payload.images.customer;
             }
         }