@measurequick/measurequick-report-generator 1.0.53 → 1.0.55

package/index.js

@@ -1,12 +1,12 @@
 import * as mqReportGenerator from "./jspdf/mq-report-generator.js";
-import * as mqSystemVitalsReportGenerator from "./pdflib/mq-system-vitals-report-generator.js";
+import * as mqSystemVitalsReportGenerator from "./mq-system-vitals-report-generator.js";
 
 export function generateReport(reportType, payload) {
     if (reportType == "mqStandard") reportType = "mqCooling";
     switch (reportType) {
         case "mqCooling":
         case "mqHeating":              return mqReportGenerator.generateReport(reportType, payload);
-        case "mqSystemVitalsFillable": return mqSystemVitalsReportGenerator.generateReport(payload);
+        case "mqSystemVitals":         return mqSystemVitalsReportGenerator.generateReport(payload);
         default:                       return false;
     }
 }

package/jspdf/mq-report-generator.js

@@ -8,8 +8,6 @@ let reportData;
 let currentSnapshot;
 
 export function generateReport(reportType, payload) {
-    console.log("reportType " + reportType);
-    console.log(payload);
     try {
         reportData = JSON.parse(JSON.stringify(payload));
         let testNumber = 0;
@@ -115,7 +113,6 @@ function printBodyData(currentSnapshot) {
 }
 
 function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y) {
-    console.log("David: " + measurementSection + ": " +  JSON.stringify(reportData.snapshots[currentSnapshot]));
     let dataPoints = JSON.parse(reportData.snapshots[currentSnapshot][measurementSection]);
     let printRangeIcons = true;
     let units = "";
@@ -147,6 +144,7 @@ function printBodySection(currentSnapshot, measurementSection, xLeft, xRight, y)
                 valueText = `${dataPoint} / ${secondaryDataPoint}`;
             } else valueText = `${dataPoint}`;
             if (templateRef.label) doc.text(labelText, xLeft, y);
+            if (isNaN(valueText) || !valueText) valueText = "--";
             doc.text(valueText, alignRight(valueText, xRight, 8), y);
             if (printRangeIcons) {
                 let rangeIconRef = getRangeIcon(key, valueBeforeEditing, currentSnapshot);
@@ -227,18 +225,16 @@ function printDiagnosticPage() {
     doc.addPage();
     printBoilerPlateDiagnostic();
     printSubsystemReview();
-    printSystemDiagnostics();
+    // printSystemDiagnostics();
     printCorrectiveActions();
 }
 
 function printSubsystemReview() {
     let y = 1;
     let templateRef = templates[`${reportData.meta.reportType}SubsystemReview`];
-    console.log("templateRef is " + templateRef);
     let ssr = JSON.parse(reportData.subsystemReview);
     for (let i = 0; i < Object.keys(ssr).length; i++) {
         let key = Object.keys(ssr)[i];
-        console.log("key is " + key);
         doc.text(templateRef[key], .25, y);
         doc.text(ssr[key], 3, y);
         y += .15;
@@ -247,7 +243,6 @@ function printSubsystemReview() {
 
 function printSystemDiagnostics() {
     let y = 1;
-    console.log("DIAG: " + reportData.systemDiagnostics);
     let diagnostics = JSON.parse(reportData.systemDiagnostics);
     for (let i = 0; i < Object.keys(diagnostics).length; i++) {
         let key = Object.keys(diagnostics)[i];
@@ -341,13 +336,13 @@ function printPhotoPages() {
                     }
                     currentQuadrant++;
                 }
-                // if (currentSection[key].hasNotes && currentSection[key].notes != "") {
-                //     let notes = doc.splitTextToSize(`${currentSection[key].notes}`, 7.5);
-                //     doc.setFontStyle("bold");
-                //     doc.text("Notes:", x, y + hPic + .3);
-                //     doc.setFontStyle("normal");
-                //     doc.text(notes, x, y + hPic + .4);
-                // }
+                if (currentSection[key].hasNotes && currentSection[key].notes != "") {
+                    let notes = doc.splitTextToSize(`${currentSection[key].notes}`, 7.5);
+                    doc.setFontStyle("bold");
+                    doc.text("Notes:", x, y + hPic + .3);
+                    doc.setFontStyle("normal");
+                    doc.text(notes, x, y + hPic + .4);
+                }
             }
         }
     }

package/{pdflib/mq-system-vitals-report-generator.js → mq-system-vitals-report-generator.js}

@@ -1,18 +1,19 @@
 import { PDFDocument } from 'pdf-lib';
+import * as base64 from './graphics.js';
 
 export async function generateReport(payload) {
     // fetch and load form
-    const formPdfBytes = await fetch("../../assets/pdf_templates/MQ-system-vitals-report.pdf").then(res => res.arrayBuffer());
+    const formPdfBytes = _base64ToArrayBuffer(base64.systemVitalsPdfTemplate)
     const pdfDoc =       await PDFDocument.load(formPdfBytes);
 
     // fetch resources
-    const iconRangeGreenBytes = await fetch(`../../assets/img/icon-range-green.png`).then(res => res.arrayBuffer());
-    const iconRangeRedBytes =   await fetch(`../../assets/img/icon-range-red.png`).then(res => res.arrayBuffer());
-    const iconFlagBlackBytes =  await fetch(`../../assets/img/icon-flag-black.png`).then(res => res.arrayBuffer());
-    const iconFlagGreenBytes =  await fetch(`../../assets/img/icon-flag-green.png`).then(res => res.arrayBuffer());
-    const iconFlagRedBytes =    await fetch(`../../assets/img/icon-flag-red.png`).then(res => res.arrayBuffer());
-    const iconFlagYellowBytes = await fetch(`../../assets/img/icon-flag-yellow.png`).then(res => res.arrayBuffer());
-    const iconStabilityBytes =  await fetch(`../../assets/img/icon-stability.png`).then(res => res.arrayBuffer());
+    const iconRangeGreenBytes = _base64ToArrayBuffer(base64.iconRangeGreen);
+    const iconRangeRedBytes =   _base64ToArrayBuffer(base64.iconRangeRed);
+    const iconFlagBlackBytes =  _base64ToArrayBuffer(base64.iconFlagBlack);
+    const iconFlagGreenBytes =  _base64ToArrayBuffer(base64.iconFlagGreen);
+    const iconFlagRedBytes =    _base64ToArrayBuffer(base64.iconFlagRed);
+    const iconFlagYellowBytes = _base64ToArrayBuffer(base64.iconFlagYellow);
+    const iconStabilityBytes =  _base64ToArrayBuffer(base64.iconStability);
 
     // load resources
     const iconRangeGreen =  await pdfDoc.embedPng(iconRangeGreenBytes);
@@ -163,3 +164,14 @@ function getTextFields(payload) {
         "fltrFace": payload.test.data.velocity_face_filter1 ? payload.test.data.velocity_face_filter1.toFixed(1) + " SCFM" : "--"
     }
 }
+
+function _base64ToArrayBuffer(base64) {
+    base64 = base64.replace(/^[^,]+,/, '').replace(/\s/g, '');
+    var binary_string = window.atob(base64);
+    var len = binary_string.length;
+    var bytes = new Uint8Array(len);
+    for (var i = 0; i < len; i++) {
+        bytes[i] = binary_string.charCodeAt(i);
+    }
+    return bytes.buffer;
+}

package/package.json

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