@measurequick/measurequick-report-generator 1.5.76 → 1.5.78

package/package.json

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

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

@@ -195,8 +195,9 @@ export async function getReport(payload) {
   
       // Check if nciReportDoc is properly initialized before copying pages
       if (nciReportDoc) {
-        const [_nciReportDoc] = await coreDoc.copyPages(nciReportDoc, [0]);
-        if (_nciReportDoc) coreDoc.insertPage(coreDoc.getPages().length, _nciReportDoc);
+        const [nciReportPage0, nciReportPage1] = await coreDoc.copyPages(nciReportDoc, [0, 1]);
+        if (nciReportPage0) coreDoc.insertPage(coreDoc.getPages().length, nciReportPage0);
+        if (nciReportPage1) coreDoc.insertPage(coreDoc.getPages().length, nciReportPage1);
       }
     }
   } catch (error) {

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

@@ -8,7 +8,6 @@ import * as util from '../util.js';
 
 export async function getReport(payload, _test) {
     try {
-        console.log('payload',payload);
         // fetch and load form
         const formPdfBytes = util._base64ToArrayBuffer(pdf.base64);
         const pdfDoc = await PDFDocument.load(formPdfBytes);

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

@@ -32,6 +32,7 @@ export async function getReport(payload) {
     // Process All Photos
     let docIndex = 0;
     let photos = payload.photos.project;
+    let hasPhotos = false;
     if (photos.unsynced && typeof photo.unsynced === 'object') delete photos.unsynced;
     if (photos && Object.keys(photos) && Object.keys(photos).length > 0) {
       let s3ReferenceIds = Object.keys(photos);
@@ -58,6 +59,7 @@ export async function getReport(payload) {
         }
         let imageToSet;
         if (photo && photo.base64 && typeof photo.base64 == 'string') {
+          hasPhotos = true;
           if (photo.base64 && photo.base64.includes("image/jpeg")) imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
           else if (photo.base64 && photo.base64.includes("image/png")) imageToSet = await docs[docIndex].embedPng(util._base64ToArrayBuffer(photo.base64));
         }
@@ -68,7 +70,8 @@ export async function getReport(payload) {
         photoPosition++;
         prevSection = currSection;
       }
-      docIndex++;
+      if (hasPhotos)
+        docIndex++;
     }
 
     // Prepare Deliverable

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

@@ -98,7 +98,7 @@ export async function getReport(payload) {
         }
       }
       if (hasPhotos)
-        this.docIndex++;
+        docIndex++;
     }
 
     let initialEquipmentPhotoPageLoaded = false;