@measurequick/measurequick-report-generator 1.5.232 → 1.5.234

package/package.json

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

package/report-gen-scripts/measurement-details.js

@@ -450,56 +450,38 @@ export async function getReport(payload) {
           let condDisplay = util.getElectricalData(test, "", embeddedIcons);
           let ahuDisplay = util.getElectricalData(test, "_ahu", embeddedIcons);
           if (measurement) {
-            // Debug log for V/A icon checking
-            if (measurement.label == "Cond. Volts" || measurement.label == "Cond. Amps" ||
-                measurement.label == "AHU Volts" || measurement.label == "AHU Amps") {
-              console.log("[measurement-details] Checking label:", measurement.label);
-              console.log("[measurement-details] isGoettlInstall:", isGoettlInstall);
-              console.log("[measurement-details] condDisplay.voltageIcon:", !!condDisplay.voltageIcon);
-              console.log("[measurement-details] condDisplay.amperageIcon:", !!condDisplay.amperageIcon);
-              console.log("[measurement-details] ahuDisplay.voltageIcon:", !!ahuDisplay.voltageIcon);
-              console.log("[measurement-details] ahuDisplay.amperageIcon:", !!ahuDisplay.amperageIcon);
-            }
             if (
               !isGoettlInstall &&
               measurement.label == "Cond. Volts" &&
               condDisplay.voltageIcon
-            ) {
-              console.log("[measurement-details] Setting Cond. Volts icon!");
+            )
               form
                 .getButton(`Block${blockNum}-Row${rowNum}-Col4`)
                 .setImage(condDisplay.voltageIcon);
-            }
             else if (
               !isGoettlInstall &&
               measurement.label == "Cond. Amps" &&
               condDisplay.amperageIcon
-            ) {
-              console.log("[measurement-details] Setting Cond. Amps icon!");
+            )
               form
                 .getButton(`Block${blockNum}-Row${rowNum}-Col4`)
                 .setImage(condDisplay.amperageIcon);
-            }
             else if (
               !isGoettlInstall &&
               measurement.label == "AHU Volts" &&
               ahuDisplay.voltageIcon
-            ) {
-              console.log("[measurement-details] Setting AHU Volts icon!");
+            )
               form
                 .getButton(`Block${blockNum}-Row${rowNum}-Col4`)
                 .setImage(ahuDisplay.voltageIcon);
-            }
             else if (
               !isGoettlInstall &&
               measurement.label == "AHU Amps" &&
               ahuDisplay.amperageIcon
-            ) {
-              console.log("[measurement-details] Setting AHU Amps icon!");
+            )
               form
                 .getButton(`Block${blockNum}-Row${rowNum}-Col4`)
                 .setImage(ahuDisplay.amperageIcon);
-            }
 
             let units = measurement.units ? `(${measurement.units})` : "";
             let altLabel = "";

package/util.js

@@ -294,18 +294,14 @@ export function getElectricalData(test, suffix, embeddedIcons) {
   if (!test.source) test.source = {};
   if (!test.data) test.data = {};
 
-  // Debug logging to help diagnose icon issues
-  console.log("[getElectricalData] suffix:", suffix);
-  console.log("[getElectricalData] test.source:", JSON.stringify(test.source));
-  console.log("[getElectricalData] test.source.voltage_l1:", test.source.voltage_l1);
-  console.log("[getElectricalData] test.source.voltage_l1_ahu:", test.source.voltage_l1_ahu);
-
   let voltage = test.data[`voltage_nominal${suffix}`];
   let phase = test.data[`phase${suffix}`];
   let src = "_l1";
   let vDisplay, aDisplay, vIcon, aIcon;
 
-  if (test.electrical_capture_type !== "Power") {
+  // Use the correct capture type for the section (condenser vs AHU)
+  let captureType = suffix ? (test[`electrical_capture_type${suffix}`] || test.electrical_capture_type) : test.electrical_capture_type;
+  if (captureType !== "Power") {
     if (phase === "Single") {
       if (
         (voltage == "115" || voltage == "120") &&
@@ -356,12 +352,8 @@ export function getElectricalData(test, suffix, embeddedIcons) {
       }
     } else if (
       phase === "Three" &&
-      test.data[`voltage_l1${suffix}`] &&
-      test.data[`voltage_l2${suffix}`] &&
-      test.data[`voltage_l3${suffix}`] &&
-      test.data[`amperage_l1${suffix}`] &&
-      test.data[`amperage_l2${suffix}`] &&
-      test.data[`amperage_l3${suffix}`]
+      (+test.data[`voltage_l1${suffix}`]) > 0 && (+test.data[`voltage_l2${suffix}`]) > 0 && (+test.data[`voltage_l3${suffix}`]) > 0 &&
+      test.data[`amperage_l1${suffix}`] && test.data[`amperage_l2${suffix}`] && test.data[`amperage_l3${suffix}`]
     ) {
       vDisplay =
         (+test.data[`voltage_l1${suffix}`]).toFixed(1) +
@@ -376,9 +368,9 @@ export function getElectricalData(test, suffix, embeddedIcons) {
         " / " +
         (+test.data[`amperage_l3${suffix}`]).toFixed(1);
     }
-  } else if (test.electrical_capture_type === "Power") {
-    vDisplay = (+test.data[`voltage_l1`]).toFixed(1);
-    aDisplay = (+test.data[`amperage_l1`]).toFixed(1);
+  } else if (captureType === "Power") {
+    vDisplay = (+test.data[`voltage_l1${suffix}`]).toFixed(1);
+    aDisplay = (+test.data[`amperage_l1${suffix}`]).toFixed(1);
   }
 
   // Fallback: If vDisplay/aDisplay not set but data exists, use the data directly
@@ -396,10 +388,6 @@ export function getElectricalData(test, suffix, embeddedIcons) {
   const vSourceKey = suffixAlreadyInSrc ? "voltage" + src : "voltage" + src + suffix;
   const aSourceKey = suffixAlreadyInSrc ? "amperage" + src : "amperage" + src + suffix;
 
-  console.log("[getElectricalData] src:", src, "suffix:", suffix);
-  console.log("[getElectricalData] suffixAlreadyInSrc:", suffixAlreadyInSrc);
-  console.log("[getElectricalData] vSourceKey:", vSourceKey, "aSourceKey:", aSourceKey);
-
   // Build fallback source keys for multimeter sources (used when L1/L2/L3 sources aren't set)
   // For condenser (suffix=""), check voltage_multimeter_condenser then voltage_multimeter
   // For AHU (suffix="_ahu"), check voltage_multimeter_ahu then voltage_multimeter
@@ -408,52 +396,22 @@ export function getElectricalData(test, suffix, embeddedIcons) {
 
   // Get voltage source with fallback chain
   let vSource = test.source[vSourceKey];
-  console.log("[getElectricalData] vSource from vSourceKey:", vSource);
   // Direct fallback for HAC/DL599 - check voltage_l1 directly for condenser, voltage_l1_ahu for AHU
-  if (!vSource && suffix === "") {
-    vSource = test.source["voltage_l1"];
-    console.log("[getElectricalData] vSource fallback voltage_l1:", vSource);
-  }
-  if (!vSource && suffix === "_ahu") {
-    vSource = test.source["voltage_l1_ahu"];
-    console.log("[getElectricalData] vSource fallback voltage_l1_ahu:", vSource);
-  }
-  if (!vSource) {
-    vSource = test.source[vMultimeterKey];
-    console.log("[getElectricalData] vSource fallback", vMultimeterKey + ":", vSource);
-  }
-  if (!vSource) {
-    vSource = test.source["voltage_multimeter"];
-    console.log("[getElectricalData] vSource fallback voltage_multimeter:", vSource);
-  }
-  console.log("[getElectricalData] FINAL vSource:", vSource);
+  if (!vSource && suffix === "") vSource = test.source["voltage_l1"];
+  if (!vSource && suffix === "_ahu") vSource = test.source["voltage_l1_ahu"];
+  if (!vSource) vSource = test.source[vMultimeterKey];
+  if (!vSource) vSource = test.source["voltage_multimeter"];
 
   // Get amperage source with fallback chain
   let aSource = test.source[aSourceKey];
-  console.log("[getElectricalData] aSource from aSourceKey:", aSource);
   // Direct fallback for HAC/DL599 - check amperage_l1 directly for condenser, amperage_l1_ahu for AHU
-  if (!aSource && suffix === "") {
-    aSource = test.source["amperage_l1"];
-    console.log("[getElectricalData] aSource fallback amperage_l1:", aSource);
-  }
-  if (!aSource && suffix === "_ahu") {
-    aSource = test.source["amperage_l1_ahu"];
-    console.log("[getElectricalData] aSource fallback amperage_l1_ahu:", aSource);
-  }
-  if (!aSource) {
-    aSource = test.source[aMultimeterKey];
-    console.log("[getElectricalData] aSource fallback", aMultimeterKey + ":", aSource);
-  }
-  if (!aSource) {
-    aSource = test.source["amperage_multimeter"];
-    console.log("[getElectricalData] aSource fallback amperage_multimeter:", aSource);
-  }
-  console.log("[getElectricalData] FINAL aSource:", aSource);
+  if (!aSource && suffix === "") aSource = test.source["amperage_l1"];
+  if (!aSource && suffix === "_ahu") aSource = test.source["amperage_l1_ahu"];
+  if (!aSource) aSource = test.source[aMultimeterKey];
+  if (!aSource) aSource = test.source["amperage_multimeter"];
 
   // Set icons based on source - don't require vDisplay/aDisplay to be set
   // This ensures icons show up even if the display value logic doesn't match
-  console.log("[getElectricalData] Setting icons - vSource:", vSource, "aSource:", aSource);
-  console.log("[getElectricalData] embeddedIcons.iconUei exists:", !!embeddedIcons.iconUei);
   if (vSource == "ComfortGuard")
     vIcon = embeddedIcons.iconSensi;
   else if (vSource == "iDVM550" || vSource == "iDVM-550")
@@ -464,10 +422,8 @@ export function getElectricalData(test, suffix, embeddedIcons) {
     vIcon = embeddedIcons.iconRedfish510;
   else if (vSource == "Fieldpiece")
     vIcon = embeddedIcons.iconFieldpiece;
-  else if (vSource == "UEi HAC" || vSource == "UEi DL599" || vSource == "UEi HUB") {
+  else if (vSource == "UEi HAC" || vSource == "UEi DL599" || vSource == "UEi HUB")
     vIcon = embeddedIcons.iconUei;
-    console.log("[getElectricalData] MATCHED UEi for voltage! vIcon set:", !!vIcon);
-  }
 
   if (aSource == "ComfortGuard")
     aIcon = embeddedIcons.iconSensi;
@@ -479,11 +435,8 @@ export function getElectricalData(test, suffix, embeddedIcons) {
     aIcon = embeddedIcons.iconRedfish510;
   else if (aSource == "Fieldpiece")
     aIcon = embeddedIcons.iconFieldpiece;
-  else if (aSource == "UEi HAC" || aSource == "UEi DL599" || aSource == "UEi HUB") {
+  else if (aSource == "UEi HAC" || aSource == "UEi DL599" || aSource == "UEi HUB")
     aIcon = embeddedIcons.iconUei;
-    console.log("[getElectricalData] MATCHED UEi for amperage! aIcon set:", !!aIcon);
-  }
-  console.log("[getElectricalData] Final icons - vIcon:", !!vIcon, "aIcon:", !!aIcon);
   return {
     voltage: vDisplay,
     amperage: aDisplay,