@measurequick/measurequick-report-generator 1.2.103 → 1.2.105

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measurequick/measurequick-report-generator",
-  "version": "1.2.103",
+  "version": "1.2.105",
   "description": "Generates PDF documents for various MeasureQuick applications.",
   "main": "index.js",
   "scripts": {
@@ -8,6 +8,7 @@
   },
   "dependencies": {
     "@pdf-lib/fontkit": "^1.1.1",
+    "@pdf-lib/standard-fonts": "^1.0.0",
     "jspdf": "^1.5.3",
     "pdf-lib": "^1.16.0"
   },

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

@@ -1,6 +1,9 @@
 import {
-  PDFDocument
+  PDFDocument,
+  PDFFont,
+  StandardFonts
 } from 'pdf-lib';
+import fontkit from '@pdf-lib/fontkit';
 import * as base64 from '../base-64/icons.js';
 import * as pdf from '../base-64/corrective-measures-page.js';
 import * as pdf2 from '../base-64/corrective-measures-page-2.js';
@@ -8,14 +11,23 @@ import * as util from '../util.js';
 
 let embeddedIcons = {};
 
-export async function getReport(payload) {
+export async function getReport(payload) { console.log(payload);
   try {
     let b64 = payload.tests.length < 2 ? pdf : pdf2;
 
     const pdfDoc = await PDFDocument.load(util._base64ToArrayBuffer(b64.base64));
 
+    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.";
+    const fontBytes = await fetch('https://pdf-lib.js.org/assets/ubuntu/Ubuntu-R.ttf').then(res => res.arrayBuffer());
+    pdfDoc.registerFontkit(fontkit);
+    const customFont = await pdfDoc.embedFont(fontBytes);
+    const textWidth = customFont.widthOfTextAtSize(text1, 12);
+    const textHeight = customFont.heightAtSize(12);
+
     const form = pdfDoc.getForm();
 
+    form.getTextField("Text1").setText(textWidth + " x " + textHeight);
+
     let labels = ["iconRangeHigh", "iconRangeLow", "iconRangeNormal", "iconTesto", "iconCalculator", "iconFieldpiece",
       "iconUei", "iconSporlanPro", "iconSporlanLegacy", "iconIconnect", "iconImanifold", "iconSensi", "iconDg8",
       "iconBluflame", "iconRedfish510", "iconRedfish510333", "iconRedfish550", "iconDg1000", "iconTrueflow", "iconThumbprintRed", "iconThumbprintGreen", "iconThumbprintYellow", "whiteBox"
@@ -99,34 +111,34 @@ export async function getReport(payload) {
     }
 
     form.getTextField(`Block3-Title`).setText(payload.system_data.title3);
-    let caIndex = 0;
-    let header;
-    for (let colNum = 1; colNum < 4; 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++;
-        }
-    }
+
+    // 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({