@measurequick/measurequick-report-generator 1.5.216 → 1.5.218

package/package.json

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

package/report-gen-scripts/vitals-heating-report.js

@@ -1,4 +1,4 @@
-import { PDFDocument } from "pdf-lib";
+import { PDFDocument, rgb } from "pdf-lib";
 import * as base64 from "../base-64/icons.js";
 import * as pdf from "../base-64/mq-vitals-heating.js";
 import * as systemInfoPage from "./system-info-page.js";
@@ -283,25 +283,41 @@ export async function getReport(payload, _test) {
       coSupRaw,
     });
 
+    // 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 > 9) reasons.push("ambient=" + coAmbRaw);
-    if (isFinite(coRetRaw) && coRetRaw > 9) reasons.push("return=" + coRetRaw);
-    if (isFinite(coSupRaw) && coSupRaw > 9) reasons.push("supply=" + coSupRaw);
+    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;
-    VH_LOG("CO threshold check > 9 ppm:", { coHigh, reasons });
+    VH_LOG("CO threshold check > 8 ppm:", { coHigh, reasons });
 
     if (coHigh) {
       VH_LOG("Setting CO warnings in form fields: COWarning / COWarning2");
-      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."
-      );
+      // Find the highest severity level
+      var highestLevel = "Elevated";
+      var maxPpm = 0;
+      for (var r = 0; r < reasons.length; r++) {
+        if (reasons[r].value > maxPpm) maxPpm = reasons[r].value;
+        if (reasons[r].level === "Emergency") highestLevel = "Emergency";
+        else if (reasons[r].level === "Dangerous" && highestLevel !== "Emergency") highestLevel = "Dangerous";
+      }
+
+      // Build details string showing each elevated reading
+      var details = reasons.map(function(r) { return r.type + ": " + Math.round(r.value) + " ppm (" + r.level + ")"; }).join(", ");
+
+      var warningMsg = "WARNING: " + highestLevel + " CO Detected! " + details + "\nVentilate the area and investigate the source.";
+      var warningMsg2 = "WARNING: " + highestLevel + " CO Detected! " + details + " Ventilate the area and investigate the source.";
+
+      safeSetText(form, "COWarning", warningMsg);
+      safeSetText(form, "COWarning2", warningMsg2);
     } else {
       VH_LOG("Clearing CO warnings (values within threshold)");
       // clear warnings if not applicable
@@ -548,16 +564,51 @@ export async function getReport(payload, _test) {
         passFails.splice(3, 1);
         pfLabels.splice(3, 1);
       }
+
+      // CO threshold levels (matching mq-hvac app)
+      // Normal: 0-8 ppm (Green)
+      // Elevated: 9-35 ppm (Yellow/Orange)
+      // Dangerous: 36-69 ppm (Red)
+      // Emergency: 70+ ppm (Red)
+      function getCOIcon(coValue) {
+        if (coValue === null || coValue === undefined || isNaN(coValue)) {
+          return iconRangeGreen; // default to green if no value
+        }
+        if (coValue <= 8) {
+          return iconRangeGreen; // Normal
+        } else if (coValue >= 9 && coValue <= 35) {
+          return iconRangeYellow; // Elevated
+        } else {
+          return iconRangeRed; // Dangerous (36-69) or Emergency (70+)
+        }
+      }
+
+      function getCOStateText(coValue) {
+        if (coValue === null || coValue === undefined || isNaN(coValue)) {
+          return "";
+        }
+        if (coValue <= 8) {
+          return "Normal";
+        } else if (coValue >= 9 && coValue <= 35) {
+          return "Elevated";
+        } else if (coValue >= 36 && coValue <= 69) {
+          return "Dangerous";
+        } else {
+          return "Emergency";
+        }
+      }
+
+      // Collect items that have values
+      let validItems = [];
       for (let i = 0; i < passFails.length; i++) {
         const meas = test.testInfo[passFails[i]];
 
-        // If no value provided, hide the label (set empty) and skip icon
+        // Skip items with no value
         if (meas === undefined || meas === null || meas === "") {
-          safeSetText(form, `SSR${i + 1}`, "");
           continue;
         }
 
-        // Choose icon based on value
+        // Determine icon based on value
         let icon;
         if (meas === "Caution") {
           icon = iconRangeYellow;
@@ -566,53 +617,65 @@ export async function getReport(payload, _test) {
         } else {
           icon = iconRangeRed;
         }
-        if (passFails[i] === "heating_efficiency_pass_fail")
+        if (passFails[i] === "heating_efficiency_pass_fail") {
           icon = iconRangeGreen;
-
-        // Set the icon as before
-        safeSetImage(form, `ImageSubsystem${i + 1}_af_image`, icon);
+        }
 
         const suffix = test.testInfo[passFails[i] + "_override"] ? " *" : "";
-        const fieldName = `SSR${i + 1}`;
-
-        // Default label for non-special cases
         let label = pfLabels[i] + suffix;
+        let textColor = rgb(0, 0, 0); // default black
 
-        // Special handling: Ambient CO failure should be red and show a stronger warning
+        // Special handling for Ambient CO
         if (passFails[i] === "ambient_pass_fail") {
-          const isFail = !(
-            meas === "Pass" ||
-            meas === "High" ||
-            meas === "Mid" ||
-            meas === "Caution"
-          );
-
-          if (isFail) {
-            label = "CO Ambient High, Investigate Source!";
-            try {
-              const tf = form.getTextField(fieldName);
-              tf.setText(label);
-              tf.setTextColor(rgb(1, 0, 0)); // red
-            } catch (e) {}
-            continue; // move to next item; we've already set text & color
+          const coValue = test.data && test.data.co_ambient !== undefined && test.data.co_ambient !== null
+            ? Number(test.data.co_ambient)
+            : null;
+
+          // Use CO-specific icon based on actual value
+          if (coValue !== null && !isNaN(coValue)) {
+            icon = getCOIcon(coValue);
+            const stateText = getCOStateText(coValue);
+            label = "Ambient CO: " + Math.round(coValue) + " ppm" + (stateText ? " (" + stateText + ")" : "") + suffix;
+
+            // Set text color based on CO level
+            if (coValue >= 36) {
+              textColor = rgb(1, 0, 0); // Red for Dangerous/Emergency
+            } else if (coValue >= 9) {
+              textColor = rgb(0.8, 0.4, 0); // Orange for Elevated
+            }
           } else {
-            // Non-fail states: ensure text is black
-            try {
-              const tf = form.getTextField(fieldName);
-              tf.setText(label);
-              tf.setTextColor(rgb(0, 0, 0)); // black
-            } catch (e) {}
-            continue;
+            // No CO value, use pass/fail status
+            const isFail = !(meas === "Pass" || meas === "High" || meas === "Mid" || meas === "Caution");
+            if (isFail) {
+              label = "CO Ambient High, Investigate Source!" + suffix;
+              textColor = rgb(1, 0, 0);
+              icon = iconRangeRed;
+            }
           }
         }
 
-        // All other pass/fail items: keep existing label, ensure black text
+        validItems.push({ label, icon, textColor });
+      }
+
+      // Fill fields sequentially with valid items (no gaps)
+      for (let i = 0; i < validItems.length; i++) {
+        const item = validItems[i];
+        const fieldName = `SSR${i + 1}`;
+
+        safeSetImage(form, `ImageSubsystem${i + 1}_af_image`, item.icon);
+
         try {
           const tf = form.getTextField(fieldName);
-          tf.setText(label);
-          tf.setTextColor(rgb(0, 0, 0));
+          tf.setText(item.label);
+          tf.setTextColor(item.textColor);
         } catch (e) {}
       }
+
+      // Clear any remaining unused fields
+      for (let i = validItems.length; i < passFails.length; i++) {
+        safeSetText(form, `SSR${i + 1}`, "");
+        // Clear the icon by not setting it (or set to null if needed)
+      }
     } else safeSetText(form, `SSR1`, "Not yet reviewed");
 
     if (payload.meta.report_type != "FullReport") {