@measurequick/measurequick-report-generator 1.2.108 → 1.2.109

package/package.json

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

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

@@ -11,19 +11,15 @@ import * as util from '../util.js';
 
 let embeddedIcons = {};
 
-export async function getReport(payload) { console.log(payload);
+export async function getReport(payload) {
   try {
     let b64 = payload.tests.length < 2 ? pdf : pdf2;
     const pdfDoc = await PDFDocument.load(util._base64ToArrayBuffer(b64.base64));
     const form = pdfDoc.getForm();
-
-    let text1 = "Lorem Ipsum \n is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum.";
+    // TODO: Embed Proper Font From Local File -- Eliminate Remote Request
     const fontBytes = await fetch('https://pdf-lib.js.org/assets/ubuntu/Ubuntu-R.ttf').then(res => res.arrayBuffer());
     pdfDoc.registerFontkit(fontkit);
     const font = await pdfDoc.embedFont(fontBytes);
-    const textWidth = font.widthOfTextAtSize(text1, 12);
-    const textHeight = font.heightAtSize(12);
-    form.getTextField("Text1").setText(textWidth + " x " + textHeight);
 
     let labels = ["iconRangeHigh", "iconRangeLow", "iconRangeNormal", "iconTesto", "iconCalculator", "iconFieldpiece",
       "iconUei", "iconSporlanPro", "iconSporlanLegacy", "iconIconnect", "iconImanifold", "iconSensi", "iconDg8",
@@ -109,49 +105,25 @@ export async function getReport(payload) { console.log(payload);
 
     form.getTextField(`Block3-Title`).setText(payload.system_data.title3);
 
-    let header = "", text = "", maxWidth = 200, maxHeight = 1000;
+    let header, text = "", maxWidth = 165, maxHeight = 362, col = 1, maxLines = 20; // TODO: Calculate Max Lines
     for (let i = 0; i < payload.system_data.block3.length; i++) {
       let action = payload.system_data.block3[i];
-      if (header != action.ref) text += header + "\n";
+      if (header != action.ref) text += `\n${action.ref}\n`;
       header = action.ref;
-      let textWidth = font.widthOfTextAtSize(action.label, 12);
-      let textHeight = font.heightAtSize(12);
+      let textWidth = font.widthOfTextAtSize(action.label, 8);
+      let textHeight = font.heightAtSize(8);
       let numLines = 1;
       if (textWidth > maxWidth) {
         numLines = textWidth / maxWidth;
         let words = action.label.split(" ");
+        // TODO: Calculate Line & Column Splits
       }
       text += action.label + "\n";
+      if (true) { // TODO: Calculate Condition
+        form.getTextField(`Text${col}`).setText(text);
+        col++;
+      }
     }
-    form.getTextField('Text2').setText(text);
-
-    // let header, caIndex = 0;
-    // for (let colNum = 1; colNum <= 3; colNum++) {
-    //   let row = 1;
-    //   let caMeas = payload.system_data.block3[caIndex];
-    //     if (caMeas && header == caMeas.ref) {
-    //       form.getTextField(`CA-Col${colNum}-Row${row}-Bold`).setText(`${caMeas.ref} (Cont.)`);
-    //       row++;
-    //     }
-    //     for (let rowNum = row; rowNum < 24; rowNum++) {
-    //       caMeas = payload.system_data.block3[caIndex];
-    //       if (caMeas && (payload.meta.report_type == 'CorrectiveMeasures' || (payload.meta.report_type == 'FullReport' && caMeas.ref != 'Condensate Drain System' && caMeas.ref != 'Outdoor Equipment' && caMeas.ref != 'Indoor Equipment' && caMeas.ref != 'Cooling Efficiency'))) {
-    //         if (header !== caMeas.ref) {
-    //           if (rowNum + 2 > 23) {
-    //             colNum++;
-    //             rowNum = 1;
-    //           } else {
-    //             if (rowNum != 1) rowNum++;
-    //             form.getTextField(`CA-Col${colNum}-Row${rowNum}-Bold`).setText(caMeas.ref);
-    //             rowNum++;
-    //           }
-    //         }
-    //         header = caMeas.ref;
-    //         form.getTextField(`CA-Col${colNum}-Row${rowNum}`).setText(caMeas.label);
-    //         caIndex++;
-    //       } else caIndex++;
-    //     }
-    // }
 
     form.flatten();
     return await pdfDoc.saveAsBase64({

package/report-gen-scripts/vitals-heating-report.js

@@ -206,9 +206,7 @@ export async function getReport(payload, _test) {
     form.flatten();
     const pdfBase64 = await pdfDoc.saveAsBase64({ dataUri: true });
     return pdfBase64;
-  } catch (error) {
-    console.log(error);
-  }
+  } catch (error) { }
 }
 
 function getTextFields(payload, test) {