@measurequick/measurequick-report-generator 1.5.235 → 1.5.236

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measurequick/measurequick-report-generator",
-  "version": "1.5.235",
+  "version": "1.5.236",
   "description": "Generates PDF documents for various measureQuick applications.",
   "main": "index.js",
   "scripts": {
@@ -12,7 +12,8 @@
     "jspdf": "^1.3.5",
     "pako": "^2.0.4",
     "pdf-lib": "^1.16.0",
-    "prettier": "^3.5.3"
+    "prettier": "^3.5.3",
+    "qrcode": "^1.5.4"
   },
   "keywords": [
     "measurequick"

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

@@ -7,6 +7,7 @@ import * as photos4nci from '../base-64/photos4nci.js';
 import * as photos6nci from '../base-64/photos6nci.js';
 import * as base64 from '../base-64/icons.js';
 import * as util from '../util.js';
+import { getButtonRect, drawVideoQrOverlay } from './video-qr-helper.js';
 
 export async function getReport(payload) {
   try {
@@ -18,9 +19,9 @@ export async function getReport(payload) {
      console.log('payload',payload);
      let nci = payload&&payload.test&&payload.test.ductScreeningType;
      console.log('nci',nci);
- 
+
      page = nci ? photos6nci : page;
- 
+
      if (maxPhotosPerPage == 4) {
        page = nci ? photos4nci : photos4;
        pSize = "Mid";
@@ -29,6 +30,9 @@ export async function getReport(payload) {
        pSize = "Large";
      }
 
+    // Track video overlays to draw after flattening
+    let videoOverlays = [];
+
     // Process All Photos
     let docIndex = 0;
     let photos = payload.photos.project;
@@ -63,7 +67,17 @@ export async function getReport(payload) {
           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));
         }
-        if (imageToSet) forms[docIndex].getButton(`photo${pSize}${photoPosition}`).setImage(imageToSet);
+        let fieldName = `photo${pSize}${photoPosition}`;
+        if (imageToSet) forms[docIndex].getButton(fieldName).setImage(imageToSet);
+
+        // Track video for QR overlay
+        if (photo.isVideo && photo.viewerUrl) {
+          let rect = getButtonRect(forms[docIndex], fieldName);
+          if (rect) {
+            videoOverlays.push({ docIndex: docIndex, rect: rect, viewerUrl: photo.viewerUrl });
+          }
+        }
+
         let caption = photo.section;
         if (prevSection == currSection) caption += photo.notes;
         forms[docIndex].getTextField(`Notes${photoPosition}`).setText(caption);
@@ -76,6 +90,13 @@ export async function getReport(payload) {
 
     // Prepare Deliverable
     forms.forEach(form => { form.flatten() });
+
+    // Draw video QR overlays on flattened pages
+    for (let overlay of videoOverlays) {
+      let docPage = docs[overlay.docIndex].getPage(0);
+      await drawVideoQrOverlay(docs[overlay.docIndex], docPage, overlay.rect, overlay.viewerUrl);
+    }
+
     let pdfDoc = await PDFDocument.create();
     for (let i = 0; i < docs.length; i++) {
       const [nextPage] = await pdfDoc.copyPages(docs[i], [0]);

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

@@ -7,6 +7,7 @@ import * as photos4nci from '../base-64/photos4nci.js';
 import * as photos6nci from '../base-64/photos6nci.js';
 import * as base64 from '../base-64/icons.js';
 import * as util from '../util.js';
+import { getButtonRect, drawVideoQrOverlay } from './video-qr-helper.js';
 
 // Check if project is CoolMaxx or HeatMaxx (NCI branded)
 function isNCIProject(payload) {
@@ -50,6 +51,9 @@ export async function getReport(payload) {
       }
     }
 
+    // Track video overlays to draw after flattening
+    let videoOverlays = []; // { docIndex, rect, s3ReferenceId }
+
     // Process All Photos
     let canProcessReport = false;
     let previousPhotoSectionName;
@@ -95,7 +99,17 @@ export async function getReport(payload) {
                 else if (photo.base64.includes("image/png")) imageToSet = await docs[docIndex].embedPng(util._base64ToArrayBuffer(photo.base64));
                 else imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
               }
-              if (imageToSet) forms[docIndex].getButton(`photo${pSize}${photoPosition}`).setImage(imageToSet);
+              let fieldName = `photo${pSize}${photoPosition}`;
+              if (imageToSet) forms[docIndex].getButton(fieldName).setImage(imageToSet);
+
+              // Track video for QR overlay
+              if (photo.isVideo && photo.viewerUrl) {
+                let rect = getButtonRect(forms[docIndex], fieldName);
+                if (rect) {
+                  videoOverlays.push({ docIndex: docIndex, rect: rect, viewerUrl: photo.viewerUrl });
+                }
+              }
+
               let photoSubText = photoSection.name;
               let isFirstPhotoOfSection = previousPhotoSectionName !== photoSectionName;
               if (isFirstPhotoOfSection && photoSection.hasNotes && photoSection.notes) photoSubText += `: ${photoSection.notes}`;
@@ -160,7 +174,17 @@ export async function getReport(payload) {
                 }
                 //else imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
               }
-              if (imageToSet) forms[docIndex].getButton(`photo${pSize}${photoPosition}`).setImage(imageToSet);
+              let fieldName = `photo${pSize}${photoPosition}`;
+              if (imageToSet) forms[docIndex].getButton(fieldName).setImage(imageToSet);
+
+              // Track video for QR overlay
+              if (photo.isVideo && photo.viewerUrl) {
+                let rect = getButtonRect(forms[docIndex], fieldName);
+                if (rect) {
+                  videoOverlays.push({ docIndex: docIndex, rect: rect, viewerUrl: photo.viewerUrl });
+                }
+              }
+
               let photoSubText = photoSection.name;
               let isFirstPhotoOfSection = previousPhotoSectionName !== photoSectionName;
               if (isFirstPhotoOfSection && photoSection.hasNotes && photoSection.notes) photoSubText += `: ${photoSection.notes}`;
@@ -178,6 +202,13 @@ export async function getReport(payload) {
     // Prepare Deliverable
     if (canProcessReport) {
       forms.forEach(form => { form.flatten() });
+
+      // Draw video QR overlays on flattened pages
+      for (let overlay of videoOverlays) {
+        let docPage = docs[overlay.docIndex].getPage(0);
+        await drawVideoQrOverlay(docs[overlay.docIndex], docPage, overlay.rect, overlay.viewerUrl);
+      }
+
       let pdfDoc = await PDFDocument.create();
       for (let i = 0; i < docs.length; i++) {
         const [nextPage] = await pdfDoc.copyPages(docs[i], [0]);

package/report-gen-scripts/video-qr-helper.js

@@ -0,0 +1,84 @@
+import QRCode from 'qrcode';
+import { rgb } from 'pdf-lib';
+import * as util from '../util.js';
+
+/**
+ * Generate QR code as PNG bytes for a viewer URL
+ */
+export async function generateQrPngBytes(viewerUrl) {
+  const dataUrl = await QRCode.toDataURL(viewerUrl, {
+    width: 200,
+    margin: 1,
+    color: { dark: '#000000', light: '#ffffff' }
+  });
+  return util._base64ToArrayBuffer(dataUrl);
+}
+
+/**
+ * Get the rectangle of a form button field
+ */
+export function getButtonRect(form, fieldName) {
+  try {
+    const button = form.getButton(fieldName);
+    const widgets = button.acroField.getWidgets();
+    if (widgets.length > 0) {
+      return widgets[0].getRectangle();
+    }
+  } catch (e) {
+    // field not found
+  }
+  return null;
+}
+
+/**
+ * Draw QR code overlay with "VIEW VIDEO" text on a PDF page
+ * Centered in the given rectangle area
+ */
+export async function drawVideoQrOverlay(doc, page, rect, viewerUrl) {
+  if (!rect || !viewerUrl) return;
+
+  const qrBytes = await generateQrPngBytes(viewerUrl);
+  if (!qrBytes) return;
+
+  const qrImage = await doc.embedPng(qrBytes);
+
+  // Size the QR code to ~40% of the photo area width, min 50, max 100
+  let qrSize = Math.min(Math.max(rect.width * 0.4, 50), 100);
+  const padding = 8;
+  const textHeight = 12;
+  const totalHeight = qrSize + padding * 2 + textHeight + 4;
+  const totalWidth = qrSize + padding * 2;
+
+  // Center the overlay in the photo area
+  const boxX = rect.x + (rect.width - totalWidth) / 2;
+  const boxY = rect.y + (rect.height - totalHeight) / 2;
+
+  // White background box
+  page.drawRectangle({
+    x: boxX,
+    y: boxY,
+    width: totalWidth,
+    height: totalHeight,
+    color: rgb(1, 1, 1),
+    borderColor: rgb(0.8, 0.8, 0.8),
+    borderWidth: 0.5
+  });
+
+  // QR code image
+  page.drawImage(qrImage, {
+    x: boxX + padding,
+    y: boxY + textHeight + 4 + padding,
+    width: qrSize,
+    height: qrSize
+  });
+
+  // "VIEW VIDEO" text centered below QR
+  const fontSize = 8;
+  const textWidth = fontSize * 6.5; // approximate width of "VIEW VIDEO"
+  page.drawText('VIEW VIDEO', {
+    x: boxX + (totalWidth - textWidth) / 2,
+    y: boxY + padding,
+    size: fontSize,
+    color: rgb(0, 0, 0)
+  });
+}