@measurequick/measurequick-report-generator 1.5.224 → 1.5.226

package/package.json

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

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

@@ -1634,6 +1634,15 @@ export async function getReport(payload) {
               testo_size,
               testo_size
             );
+          } else if (testObj.source["voltage" + src] == "UEi HAC" || testObj.source["voltage" + src] == "UEi DL599") {
+            doc.addImage(
+              base64.iconUei,
+              "PNG",
+              pos_right + testo_offset_x,
+              pos_vert - testo_offset_y,
+              testo_size,
+              testo_size
+            );
           }
           pos_vert += spacing;
         }
@@ -1688,6 +1697,15 @@ export async function getReport(payload) {
               testo_size,
               testo_size
             );
+          } else if (testObj.source["amperage" + src] == "UEi HAC" || testObj.source["amperage" + src] == "UEi DL599") {
+            doc.addImage(
+              base64.iconUei,
+              "PNG",
+              pos_right + testo_offset_x,
+              pos_vert - testo_offset_y,
+              testo_size,
+              testo_size
+            );
           }
           pos_vert += spacing;
         }
@@ -2661,6 +2679,15 @@ export async function getReport(payload) {
             testo_size,
             testo_size
           );
+        } else if (testObj.source.power_ahu == "UEi HAC" || testObj.source.power_ahu == "UEi DL599") {
+          doc.addImage(
+            base64.iconUei,
+            "PNG",
+            pos_right + testo_offset_x,
+            pos_vert - testo_offset_y,
+            testo_size,
+            testo_size
+          );
         } else if (
           testObj.electrical_capture_type_ahu !== "Power" &&
           testObj.data.power_ahu

package/util.js

@@ -370,6 +370,16 @@ export function getElectricalData(test, suffix, embeddedIcons) {
     vDisplay = (+test.data[`voltage_l1`]).toFixed(1);
     aDisplay = (+test.data[`amperage_l1`]).toFixed(1);
   }
+
+  // Fallback: If vDisplay/aDisplay not set but data exists, use the data directly
+  // This handles cases like Power_HAC mode or other capture types that don't fit standard conditions
+  if (!vDisplay && test.data && test.data[`voltage_l1${suffix}`]) {
+    vDisplay = (+test.data[`voltage_l1${suffix}`]).toFixed(1);
+  }
+  if (!aDisplay && test.data && test.data[`amperage_l1${suffix}`]) {
+    aDisplay = (+test.data[`amperage_l1${suffix}`]).toFixed(1);
+  }
+
   // Build the source key with suffix for AHU support
   // Note: for ph_to_gnd cases, src already includes the suffix, so don't add it again
   const suffixAlreadyInSrc = src.includes(suffix) && suffix !== "";
@@ -384,11 +394,17 @@ export function getElectricalData(test, suffix, embeddedIcons) {
 
   // Get voltage source with fallback chain
   let vSource = test.source[vSourceKey];
+  // Direct fallback for HAC/DL599 - check voltage_l1 directly for condenser, voltage_l1_ahu for AHU
+  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];
+  // Direct fallback for HAC/DL599 - check amperage_l1 directly for condenser, amperage_l1_ahu for AHU
+  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"];
 
@@ -403,6 +419,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")
+      vIcon = embeddedIcons.iconUei;
   }
   if (aDisplay) {
     if (aSource == "ComfortGuard")
@@ -415,6 +433,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")
+      aIcon = embeddedIcons.iconUei;
   }
   return {
     voltage: vDisplay,