@measurequick/measurequick-report-generator 1.5.223 → 1.5.225

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measurequick/measurequick-report-generator",
-  "version": "1.5.223",
+  "version": "1.5.225",
   "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/report-gen-scripts/vitals-heating-report-no-combustion.js

@@ -256,18 +256,67 @@ export async function getReport(payload, _test) {
     var coAmbRaw = toNum(data && data.co_ambient);
     var coRetRaw = toNum(data && data.co_return);
     var coSupRaw = toNum(data && data.co_supply);
-    if (isFinite(coAmbRaw) && coAmbRaw > 9) {
-      safeSetText(
-        form,
-        "COWarning",
-        "WARNING: Elevated CO Above 9 ppm Detected!\nVentilate the area and investigate the source."
-      );
-      safeSetText(
-        form,
-        "COWarning2",
-        "WARNING: Elevated CO Above 9 ppm Detected! Ventilate the area and investigate the source."
-      );
+
+    // CO level helper function
+    // Normal: 0-8 ppm, Elevated: 9-35 ppm, Dangerous: 36-69 ppm, Emergency: 70+ ppm
+    function getCOLevel(ppm) {
+      if (!isFinite(ppm) || ppm <= 8) return "Normal";
+      if (ppm >= 9 && ppm <= 35) return "Elevated";
+      if (ppm >= 36 && ppm <= 69) return "Dangerous";
+      return "Emergency";
+    }
+
+    var reasons = [];
+    if (isFinite(coAmbRaw) && coAmbRaw > 8) reasons.push({ type: "Ambient", value: coAmbRaw, level: getCOLevel(coAmbRaw) });
+    if (isFinite(coRetRaw) && coRetRaw > 8) reasons.push({ type: "Return", value: coRetRaw, level: getCOLevel(coRetRaw) });
+    if (isFinite(coSupRaw) && coSupRaw > 8) reasons.push({ type: "Supply", value: coSupRaw, level: getCOLevel(coSupRaw) });
+    var coHigh = reasons.length > 0;
+
+    if (coHigh) {
+      // Find the highest severity level and the ambient CO reading
+      var highestLevel = "Elevated";
+      var ambientReading = null;
+      for (var r = 0; r < reasons.length; r++) {
+        if (reasons[r].type === "Ambient") ambientReading = reasons[r];
+        if (reasons[r].level === "Emergency") highestLevel = "Emergency";
+        else if (reasons[r].level === "Dangerous" && highestLevel !== "Emergency") highestLevel = "Dangerous";
+      }
+
+      // Build warning message focused on ambient CO
+      var warningMsg, warningMsg2;
+      if (ambientReading) {
+        warningMsg = "WARNING: " + ambientReading.level + " Ambient CO " + Math.round(ambientReading.value) + " ppm\nVentilate the area and investigate source.";
+        warningMsg2 = "WARNING: " + ambientReading.level + " Ambient CO " + Math.round(ambientReading.value) + " ppm. Ventilate the area and investigate source.";
+      } else {
+        // Fallback if no ambient reading (use first reading)
+        var firstReading = reasons[0];
+        warningMsg = "WARNING: " + firstReading.level + " " + firstReading.type + " CO " + Math.round(firstReading.value) + " ppm\nVentilate the area and investigate source.";
+        warningMsg2 = "WARNING: " + firstReading.level + " " + firstReading.type + " CO " + Math.round(firstReading.value) + " ppm. Ventilate the area and investigate source.";
+      }
+
+      // Set text with color based on severity level
+      // Orange for Elevated, Red for Dangerous, Dark Red for Emergency
+      var warningColor;
+      if (highestLevel === "Emergency") {
+        warningColor = rgb(0.72, 0.11, 0.11); // Dark red (#b71c1c)
+      } else if (highestLevel === "Dangerous") {
+        warningColor = rgb(0.96, 0.26, 0.21); // Red (#f44336)
+      } else {
+        warningColor = rgb(1, 0.6, 0); // Orange (#ff9800)
+      }
+
+      try {
+        var tf1 = form.getTextField("COWarning");
+        tf1.setText(warningMsg);
+        tf1.setTextColor(warningColor);
+      } catch (e) {}
+      try {
+        var tf2 = form.getTextField("COWarning2");
+        tf2.setText(warningMsg2);
+        tf2.setTextColor(warningColor);
+      } catch (e) {}
     } else {
+      // clear warnings if not applicable
       safeSetText(form, "COWarning", "");
       safeSetText(form, "COWarning2", "");
     }

package/util.js

@@ -403,6 +403,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 +417,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,