@measurequick/measurequick-report-generator 1.5.205 → 1.5.207

package/package.json

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

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

@@ -1,4 +1,7 @@
 import * as base64 from "../base-64/icons.js";
+import { PDFDocument } from "pdf-lib";
+import * as notesSummaryPage from "./notes-summary-page.js";
+import * as util from "../util.js";
 
 let doc,
   globalVars,
@@ -1595,7 +1598,7 @@ export async function getReport(payload) {
               testo_size,
               testo_size
             );
-          } else if (testObj.source["voltage" + src] == "iDVM550") {
+          } else if (testObj.source["voltage" + src] == "iDVM550" || testObj.source["voltage" + src] == "iDVM-550") {
             doc.addImage(
               base64.iconRedfish550,
               "PNG",
@@ -1649,7 +1652,7 @@ export async function getReport(payload) {
               testo_size,
               testo_size
             );
-          } else if (testObj.source["amperage" + src] == "iDVM550") {
+          } else if (testObj.source["amperage" + src] == "iDVM550" || testObj.source["amperage" + src] == "iDVM-550") {
             doc.addImage(
               base64.iconRedfish550,
               "PNG",
@@ -1704,7 +1707,7 @@ export async function getReport(payload) {
             testo_size,
             testo_size
           );
-        } else if (testObj.source.power_factor == "iDVM550") {
+        } else if (testObj.source.power_factor == "iDVM550" || testObj.source.power_factor == "iDVM-550") {
           doc.addImage(
             base64.iconRedfish550,
             "PNG",
@@ -1751,7 +1754,7 @@ export async function getReport(payload) {
             testo_size,
             testo_size
           );
-        } else if (testObj.source.power_condenser == "iDVM550") {
+        } else if (testObj.source.power_condenser == "iDVM550" || testObj.source.power_condenser == "iDVM-550") {
           doc.addImage(
             base64.iconRedfish550,
             "PNG",
@@ -2421,7 +2424,7 @@ export async function getReport(payload) {
           text = vd;
           position = alignRight(text, pos_right, 8);
           doc.text(text, position, pos_vert); //page width,page height
-          if (testObj.source.voltage_l1_ahu == "iDVM550") {
+          if (testObj.source.voltage_l1_ahu == "iDVM550" || testObj.source.voltage_l1_ahu == "iDVM-550") {
             doc.addImage(
               base64.iconRedfish550,
               "PNG",
@@ -2475,7 +2478,7 @@ export async function getReport(payload) {
           text = ad;
           position = alignRight(text, pos_right, 8);
           doc.text(text, position, pos_vert); //page width,page height
-          if (testObj.source.amperage_l1_ahu == "iDVM550") {
+          if (testObj.source.amperage_l1_ahu == "iDVM550" || testObj.source.amperage_l1_ahu == "iDVM-550") {
             doc.addImage(
               base64.iconRedfish550,
               "PNG",
@@ -2530,7 +2533,7 @@ export async function getReport(payload) {
           : "--";
         position = alignRight(text, pos_right, 8);
         doc.text(text, position, pos_vert); //page width,page height
-        if (testObj.source.power_factor_ahu == "iDVM550") {
+        if (testObj.source.power_factor_ahu == "iDVM550" || testObj.source.power_factor_ahu == "iDVM-550") {
           doc.addImage(
             base64.iconRedfish550,
             "PNG",
@@ -2586,7 +2589,7 @@ export async function getReport(payload) {
             testo_size,
             testo_size
           );
-        } else if (testObj.source.power_ahu == "iDVM550") {
+        } else if (testObj.source.power_ahu == "iDVM550" || testObj.source.power_ahu == "iDVM-550") {
           doc.addImage(
             base64.iconRedfish550,
             "PNG",
@@ -7065,7 +7068,33 @@ export async function getReport(payload) {
       );
     }
 
-    return { status: 200, data: await doc.output("datauristring") };
+    // Get jsPDF output as base64
+    const jsPdfOutput = await doc.output("datauristring");
+
+    // Add AI summary pages if available
+    const aiSummary = util.getAiSummary ? util.getAiSummary(payload) : null;
+    const notes = util.getAiNotes ? util.getAiNotes(payload) : null;
+
+    if (aiSummary || notes) {
+      try {
+        // Convert jsPDF output to pdf-lib format
+        const base64Data = jsPdfOutput.split(",")[1];
+        const pdfBytes = util._base64ToArrayBuffer(base64Data);
+        const pdfDoc = await PDFDocument.load(pdfBytes);
+
+        // Add AI summary pages
+        await notesSummaryPage.addNotesSummaryPages(pdfDoc, payload);
+
+        // Return combined PDF
+        return { status: 200, data: await pdfDoc.saveAsBase64({ dataUri: true }) };
+      } catch (aiError) {
+        // If AI summary fails, return original PDF without it
+        console.error("Failed to add AI summary pages:", aiError);
+        return { status: 200, data: jsPdfOutput };
+      }
+    }
+
+    return { status: 200, data: jsPdfOutput };
   } catch (error) {
     return { status: 400, data: error };
   }
@@ -7135,6 +7164,7 @@ function drawManufacturerIcon(field) {
     case "iDVM510":
       return base64.iconRedfish510;
     case "iDVM550":
+    case "iDVM-550":
       return base64.iconRedfish550;
     case "VOLT-100":
       return base64.iconVolt100;

package/util.js

@@ -164,10 +164,22 @@ export function capitalizeFirstLetter(string) {
 
 export function getToolIcon(test, ref, embeddedIcons) {
   let toolIcon;
+  // Get source value, with fallback for L2/L3 to use L1 source (3-phase systems often only set L1 source)
+  let sourceValue = test.source[ref];
+  if (!sourceValue && ref) {
+    // Try L1 fallback for L2/L3 measurements
+    if (ref.includes("_l2") || ref.includes("_l3")) {
+      const l1Ref = ref.replace(/_l[23]/, "_l1");
+      sourceValue = test.source[l1Ref];
+    } else if (ref.includes("_l2_") || ref.includes("_l3_")) {
+      const l1Ref = ref.replace(/_l[23]_/, "_l1_");
+      sourceValue = test.source[l1Ref];
+    }
+  }
   if (test.data.calculated && test.data.calculated[ref])
     toolIcon = embeddedIcons.iconCalculator;
   else {
-    switch (test.source[ref]) {
+    switch (sourceValue) {
       case "Testo":
         toolIcon = embeddedIcons.iconTesto;
         break;
@@ -209,6 +221,7 @@ export function getToolIcon(test, ref, embeddedIcons) {
         toolIcon = embeddedIcons.iconRedfish510;
         break;
       case "iDVM550":
+      case "iDVM-550":
         toolIcon = embeddedIcons.iconRedfish550;
         break;
       case "VOLT-100":
@@ -237,7 +250,7 @@ export function getToolIcon(test, ref, embeddedIcons) {
         break;
     }
   }
-  if (test.source[ref] == "iDVM510" && ref.includes("amperage"))
+  if (sourceValue == "iDVM510" && ref.includes("amperage"))
     toolIcon = embeddedIcons.iconRedfish510333;
   return toolIcon;
 }
@@ -354,7 +367,7 @@ export function getElectricalData(test, suffix, embeddedIcons) {
   if (vDisplay) {
     if (test.source["voltage" + src] == "ComfortGuard")
       vIcon = embeddedIcons.iconSensi;
-    else if (test.source["voltage" + src] == "iDVM550")
+    else if (test.source["voltage" + src] == "iDVM550" || test.source["voltage" + src] == "iDVM-550")
       vIcon = embeddedIcons.iconRedfish550;
     else if (test.source["voltage" + src] == "VOLT-100")
       vIcon = embeddedIcons.iconVolt100;
@@ -366,7 +379,7 @@ export function getElectricalData(test, suffix, embeddedIcons) {
   if (aDisplay) {
     if (test.source["amperage" + src] == "ComfortGuard")
       aIcon = embeddedIcons.iconSensi;
-    else if (test.source["amperage" + src] == "iDVM550")
+    else if (test.source["amperage" + src] == "iDVM550" || test.source["amperage" + src] == "iDVM-550")
       aIcon = embeddedIcons.iconRedfish550;
     else if (test.source["amperage" + src] == "VOLT-100")
       aIcon = embeddedIcons.iconVolt100;