@measurequick/measurequick-report-generator 1.5.204 → 1.5.206

package/package.json

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

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

@@ -1595,7 +1595,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 +1649,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 +1704,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 +1751,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 +2421,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 +2475,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 +2530,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 +2586,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",
@@ -7135,6 +7135,7 @@ function drawManufacturerIcon(field) {
     case "iDVM510":
       return base64.iconRedfish510;
     case "iDVM550":
+    case "iDVM-550":
       return base64.iconRedfish550;
     case "VOLT-100":
       return base64.iconVolt100;

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

@@ -499,7 +499,8 @@ export async function getReport(payload) {
               .setText(`${displayLabel} ${units}`);
 
             // Use derated value if available for gas_input_rated
-            let val = measurement.value !== null && measurement.value !== undefined
+            // Also check for empty string - middleman passes "" when it expects lookup from test.data
+            let val = measurement.value !== null && measurement.value !== undefined && measurement.value !== ""
               ? measurement.value
               : +test.data[measurement.ref];
             if (
@@ -509,20 +510,24 @@ export async function getReport(payload) {
               val = payload.equipment.gas_input_derated;
             }
 
-            // Special handling for CO measurements - allow 0 as valid value
+            // Special handling for CO measurements - allow 0 as valid value, no decimals
             const isCOMeasurement =
               measurement.label == "Ambient CO" ||
               measurement.label == "Return CO" ||
               measurement.label == "Supply CO";
 
-            if (!val && !isCOMeasurement) val = "--";
-            else if (measurement.fixTo && typeof val == "number")
+            // For CO measurements: if value is null/undefined, show "--"; if valid, show as integer (no decimals)
+            if (isCOMeasurement) {
+              if (measurement.value === null || measurement.value === undefined) {
+                val = "--";
+              } else {
+                val = Math.round(Number(val)).toString();
+              }
+            } else if (!val) {
+              val = "--";
+            } else if (measurement.fixTo && typeof val == "number") {
               val = val.toFixed(measurement.fixTo);
-            if (
-              isCOMeasurement &&
-              (measurement.value === null || measurement.value === undefined)
-            )
-              val = "0.0";
+            }
             if (typeof val == "number" || !isNaN(val))
               val = val.toLocaleString("en-US");
             if (measurement.fixTo && typeof val == "number")

package/util.js

@@ -209,6 +209,7 @@ export function getToolIcon(test, ref, embeddedIcons) {
         toolIcon = embeddedIcons.iconRedfish510;
         break;
       case "iDVM550":
+      case "iDVM-550":
         toolIcon = embeddedIcons.iconRedfish550;
         break;
       case "VOLT-100":
@@ -354,7 +355,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 +367,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;