@measurequick/measurequick-report-generator 1.2.17 → 1.2.19

package/package.json

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

package/report-gen-scripts/corrective-measures.js

@@ -53,7 +53,11 @@ export async function getReport(payload) {
     let systemScorePercentage = +payload.meta.system_score.toFixed(0);
     let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
     let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
-    form.getTextField(`YourSystemScore${systemScoreColor}`).setText(`${systemScorePercentage}% ${systemScoreGrade}`);
+    if (!payload.tests[0].testInfo.canScoreVitals) {
+      systemScorePercentage = "--";
+      systemScoreGrade = "";
+    } else systemScorePercentage += "%";
+    form.getTextField(`YourSystemScore${systemScoreColor}`).setText(`${systemScorePercentage} ${systemScoreGrade}`);
 
     form.getTextField(`Block1-Title`).setText(payload.system_data.title1);
     for (let rowNum = 1; rowNum < 12; rowNum++) {

package/report-gen-scripts/measurement-details.js

@@ -119,7 +119,11 @@ export async function getReport(payload) {
     let systemScorePercentage = +payload.meta.system_score.toFixed(0);
     let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
     let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
-    form.getTextField(`YourSystemScore${systemScoreColor}`).setText(`${systemScorePercentage}% ${systemScoreGrade}`);
+    if (!payload.tests[0].testInfo.canScoreVitals) {
+      systemScorePercentage = "--";
+      systemScoreGrade = "";
+    } else systemScorePercentage += "%";
+    form.getTextField(`YourSystemScore${systemScoreColor}`).setText(`${systemScorePercentage} ${systemScoreGrade}`);
 
     if (mapImagePg1 && t == 0) form.getButton('Map Image').setImage(mapImagePg1);
     if (mapImagePg2 && t == 1) form.getButton('Map Image').setImage(mapImagePg2);

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

@@ -5,57 +5,46 @@ import * as photos6 from '../base-64/photos6.js';
 import * as base64 from '../base-64/icons.js';
 import * as util from '../util.js';
 
-export async function getReport(payload) { console.log("Photos Report"); console.log(payload);
-    let docs = [], forms = [], page = photos6, size = "Small";
+export async function getReport(payload) {
+
+    // Layout Configuration
+    let docs = [], forms = [], page = photos6, pSize = "Small";
     if (payload.meta.pdf_settings.maxPhotosPerPage == 4) {
         page = photos4;
-        size = "Mid";
+        pSize = "Mid";
     } else if (payload.meta.pdf_settings.maxPhotosPerPage == 2) {
         page = photos2;
-        size = "Large";
+        pSize = "Large";
     }
-    let keys = ["project", "equipment", "site", "customer"];
-    let lastTag, currentTag;
-    for (let k = 0; k < keys.length; k++) {
-        let photoCount = 0, pageCount = 0, sectionNum = 0, count = 0;
-        if (payload.photos[keys[k]]) {
-            currentTag = keys[k];
-            let sections = Object.keys(payload.photos[keys[k]]);
-            for (const [section, data] of Object.entries(payload.photos[keys[k]])) photoCount += data.photos.length;
-            pageCount = Math.ceil(photoCount / payload.meta.pdf_settings.maxPhotosPerPage);
-            for (let i = 0; i < pageCount; i++) {
-                const doc = await PDFDocument.load(util._base64ToArrayBuffer(page.base64));
-                const form = doc.getForm();
-                form.getTextField("Header").setText(`${util.capitalizeFirstLetter(keys[k])} Photos`);
-                const mqLogoBytes =  util._base64ToArrayBuffer(base64.mqLogo);
-                const mqLogo =   await doc.embedPng(mqLogoBytes);
-                form.getButton("FullWidthLogo").setImage(mqLogo);
-                docs.push(doc);
-                forms.push(form);
-                for (let j = 1; j <= payload.meta.pdf_settings.maxPhotosPerPage; j++) {
-                    let image;
-                    if (!payload.photos[keys[k]][sections[sectionNum]].photos[count]) {
-                        count = 0;
-                        sectionNum++;
-                        if (!payload.photos[keys[k]][sections[sectionNum]]) break;
-                    }
-                    let photo;
-                    if (payload.photos[keys[k]][sections[sectionNum]].photos[count]) {
-                        photo = payload.photos[keys[k]][sections[sectionNum]].photos[count].base64;
-                        count++;
-                        if (photo.includes("image/jpeg")) image = await doc.embedJpg(util._base64ToArrayBuffer(photo));
-                        else if (photo.includes("image/png")) image = await doc.embedPng(util._base64ToArrayBuffer(photo));
-                        if (image) form.getButton(`photo${size}${j}`).setImage(image);
-                        let firstPhoto = (lastTag != currentTag);
-                        lastTag = currentTag;
-                        let notes = payload.photos[keys[k]][sections[sectionNum]].name;
-                        if (payload.photos[keys[k]][sections[sectionNum]].hasNotes && firstPhoto) notes += ": " + payload.photos[keys[k]][sections[sectionNum]].notes;
-                        form.getTextField(`Notes${j}`).setText(`${notes}`);
-                    }
-                }
-            }
+
+    // Process All Photos
+    let previousPhotoCollectionName;
+    let photoCollectionNames = ["project", "equipment", "site", "customer"];
+    for (let pcnIndex = 0; pcnIndex < photoCollectionNames.length; pcnIndex++) {
+      let photoCollectionName = photoCollectionNames[pcnIndex];
+      let photoCollection = payload.photos[photoCollectionName];
+      let photoSectionKeys = Object.keys(photoCollection);
+      for (let pskIndex = 0; pskIndex < photoSectionKeys.length; pskIndex++) {
+        let photoSectionKey = photoSectionKeys[pskIndex];
+        let photoSection = photoCollection[photoSectionKey];
+        let photos = photoSection.photos;
+        if (!photos || photos.length == 0) break;
+        for (let pIndex = 0; pIndex < photos.length; pIndex++) {
+          let photo = photos[pIndex];
+          let imageToSet;
+          if (photo.base64.includes("image/jpeg")) imageToSet = await pdfDoc.embedJpg(util._base64ToArrayBuffer(photo.base64));
+          else if (photo.base64.includes("image/png")) imageToSet = await pdfDoc.embedPng(util._base64ToArrayBuffer(photo.base64));
+          if (imageToSet) form.getButton(`photo${pSize}${pIndex}`).setImage(imageToSet);
+          let photoSubText = photoSection.name;
+          let isFirstPhotoOfSection = previousPhotoSectionName == photoCollectionName;
+          if (isFirstPhotoOfSection && photoSection.hasNotes) photoSubText += `: ${photoSection.notes}`;
+          form.getTextField(`Notes${pIndex}`).setText(`${photoSubText}`);
+          previousPhotoCollectionName = photoCollectionName;
         }
+      }
     }
+
+    // Prepare Deliverable
     forms.forEach(form => { form.flatten() });
     let pdfDoc = await PDFDocument.create();
     for (let i = 0; i < docs.length; i++) {
@@ -64,6 +53,3 @@ export async function getReport(payload) { console.log("Photos Report"); console
     }
     return await pdfDoc.saveAsBase64({ dataUri: true });
 }
-
-// MAX # of Characters for 2-Photo Pages: 95 Characters
-// MAX # of Characters for 4-Photo & 6-Photo Pages: 42 Characters