@measurequick/measurequick-report-generator 1.2.63 → 1.2.65

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

@@ -4,8 +4,9 @@ import * as coverPage           from './cover-page.js';
 import * as measurementDetails  from './measurement-details.js';
 import * as correctiveMeasures  from './corrective-measures.js';
 import * as photosReport        from './photos-report.js';
-import * as photosReportS3        from './photos-report-s3.js';
+import * as photosReportS3      from './photos-report-s3.js';
 import * as understandingPage   from './understanding-page.js';
+import * as systemInfoPage      from './system-info-page.js';
 import * as vitalsCoolingReport from './vitals-cooling-report.js';
 import * as vitalsHeatingReport from './vitals-heating-report.js';
 import * as util from '../util.js';
@@ -25,36 +26,30 @@ export async function getReport(payload) { console.log("Full Report"); console.l
     } catch (e) {} // error printed in original pdf script
 
     try {
-      if (payload.meta.report_mode == "goettl") {
+      if (payload.meta.report_mode == "goettl" || payload.tests.length > 1) {
         if (payload.tests && payload.tests[0] && payload.tests[0].testInfo && payload.tests[0].testInfo) {
           let vitalsReportBase64 = await vitalsCoolingReport.getReport(payload, payload.tests[0]);
           const vitalsReportDoc = await PDFDocument.load(util._base64ToArrayBuffer(vitalsReportBase64));
           const [_vitalsReportPg1] = await coreDoc.copyPages(vitalsReportDoc, [0]);
           const [_vitalsReportPg2] = await coreDoc.copyPages(vitalsReportDoc, [1]);
-          const [_vitalsReportPg3] = await coreDoc.copyPages(vitalsReportDoc, [2]);
           coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg1);
           coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg2);
-          coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg3);
         }
         if (payload.tests && payload.tests[1] && payload.tests[1].testInfo && payload.tests[1].testInfo) {
           let vitalsReportBase64_ = await vitalsHeatingReport.getReport(payload, payload.tests[1]);
           const vitalsReportDoc_ = await PDFDocument.load(util._base64ToArrayBuffer(vitalsReportBase64_));
           const [_vitalsReportPg1_] = await coreDoc.copyPages(vitalsReportDoc_, [0]);
           const [_vitalsReportPg2_] = await coreDoc.copyPages(vitalsReportDoc_, [1]);
-          const [_vitalsReportPg3_] = await coreDoc.copyPages(vitalsReportDoc_, [2]);
           coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg1_);
           coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg2_);
-          coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg3_);
         }
       } else if (payload.tests && payload.tests[0] && payload.tests[0].testInfo && payload.tests[0].testInfo) {
         let vitalsReportBase64 = payload.meta.report_mode == "cooling" ? await vitalsCoolingReport.getReport(payload) : await vitalsHeatingReport.getReport(payload);
         const vitalsReportDoc = await PDFDocument.load(util._base64ToArrayBuffer(vitalsReportBase64));
         const [_vitalsReportPg1] = await coreDoc.copyPages(vitalsReportDoc, [0]);
         const [_vitalsReportPg2] = await coreDoc.copyPages(vitalsReportDoc, [1]);
-        const [_vitalsReportPg3] = await coreDoc.copyPages(vitalsReportDoc, [2]);
         coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg1);
         coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg2);
-        coreDoc.insertPage(coreDoc.getPages().length, _vitalsReportPg3);
       }
     } catch (e) {} // error printed in original pdf script
 
@@ -86,6 +81,13 @@ export async function getReport(payload) { console.log("Full Report"); console.l
       }
     } catch (e) {} // error printed in original pdf script
 
+    try {
+      let systemInfoPageBase64 = await systemInfoPage.getReport(payload);
+      const systemInfoPageDoc = systemInfoPageBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(systemInfoPageBase64)) : false;
+      const [_systemInfoPageDoc] = systemInfoPageDoc ? await coreDoc.copyPages(systemInfoPageDoc, [0]) : false;
+      if (_systemInfoPageDoc) coreDoc.insertPage(coreDoc.getPages().length, _systemInfoPageDoc);
+    } catch (e) {} // error printed in original pdf script
+
     let b64 = await coreDoc.saveAsBase64({ dataUri: true });
     console.log(b64);
     return b64;

package/report-gen-scripts/system-info-page.js

@@ -0,0 +1,15 @@
+import { PDFDocument } from 'pdf-lib';
+import * as pdfCooling from '../base-64/understanding-cooling.js';
+import * as pdfHeating from '../base-64/understanding-heating.js';
+import * as util from '../util.js';
+
+export async function getReport(payload) { console.log("Understanding Report");
+    const pdfDoc = payload.meta.report_mode == "heating" ? await PDFDocument.load(util._base64ToArrayBuffer(pdfHeating.base64)) : await PDFDocument.load(util._base64ToArrayBuffer(pdfCooling.base64));
+    const form = pdfDoc.getForm();
+    const mqLogoBytes =  util._base64ToArrayBuffer(base64.mqLogo);
+    const mqLogo =   await pdfDoc.embedPng(mqLogoBytes);
+    form.getButton("FullWidthLogo").setImage(mqLogo);
+    form.flatten();
+    const pdfBase64 = await pdfDoc.saveAsBase64({ dataUri: true });
+    return pdfBase64;
+}

package/report-gen-scripts/understanding-page.js

@@ -1,9 +1,9 @@
 import { PDFDocument } from 'pdf-lib';
-import * as pdfCooling from '../base-64/understanding-cooling.js';
-import * as pdfHeating from '../base-64/understanding-heating.js';
+import * as pdfCooling from '../base-64/system-info-cooling.js';
+import * as pdfHeating from '../base-64/system-info-heating.js';
 import * as util from '../util.js';
 
-export async function getReport(payload) { console.log("Understanding Report");
+export async function getReport(payload) { console.log("System Info Page");
     const pdfDoc = payload.meta.report_mode == "heating" ? await PDFDocument.load(util._base64ToArrayBuffer(pdfHeating.base64)) : await PDFDocument.load(util._base64ToArrayBuffer(pdfCooling.base64));
     const form = pdfDoc.getForm();
     const mqLogoBytes =  util._base64ToArrayBuffer(base64.mqLogo);