@measurequick/measurequick-report-generator 1.5.219 → 1.5.221

package/package.json

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

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

@@ -318,23 +318,48 @@ export async function getReport(payload, _test) {
 
     if (coHigh) {
       VH_LOG("Setting CO warnings in form fields: COWarning / COWarning2");
-      // Find the highest severity level
+      // Find the highest severity level and the ambient CO reading
       var highestLevel = "Elevated";
-      var maxPpm = 0;
+      var ambientReading = null;
       for (var r = 0; r < reasons.length; r++) {
-        if (reasons[r].value > maxPpm) maxPpm = reasons[r].value;
+        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 details string showing each elevated reading
-      var details = reasons.map(function(r) { return r.type + ": " + Math.round(r.value) + " ppm (" + r.level + ")"; }).join(", ");
+      // Build warning message focused on ambient CO
+      var warningMsg, warningMsg2;
+      if (ambientReading) {
+        warningMsg = "WARNING: " + ambientReading.level + " Ambient CO Detected: " + Math.round(ambientReading.value) + " ppm\nVentilate the area and investigate source.";
+        warningMsg2 = "WARNING: " + ambientReading.level + " Ambient CO Detected: " + 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 Detected: " + Math.round(firstReading.value) + " ppm\nVentilate the area and investigate source.";
+        warningMsg2 = "WARNING: " + firstReading.level + " " + firstReading.type + " CO Detected: " + Math.round(firstReading.value) + " ppm. Ventilate the area and investigate source.";
+      }
 
-      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.";
+      // 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)
+      }
 
-      safeSetText(form, "COWarning", warningMsg);
-      safeSetText(form, "COWarning2", warningMsg2);
+      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 {
       VH_LOG("Clearing CO warnings (values within threshold)");
       // clear warnings if not applicable
@@ -644,29 +669,39 @@ export async function getReport(payload, _test) {
 
         // Special handling for Ambient CO
         if (passFails[i] === "ambient_pass_fail") {
-          const coValue = test.data && test.data.co_ambient !== undefined && test.data.co_ambient !== null
-            ? Number(test.data.co_ambient)
-            : null;
+          // Use coAmbRaw which is already defined and validated earlier in the function
+          const coValue = isFinite(coAmbRaw) ? coAmbRaw : null;
 
           // Use CO-specific icon based on actual value
-          if (coValue !== null && !isNaN(coValue)) {
+          if (coValue !== null) {
             icon = getCOIcon(coValue);
             const stateText = getCOStateText(coValue);
-            label = "Ambient CO: " + Math.round(coValue) + " ppm" + (stateText ? " (" + stateText + ")" : "") + suffix;
+
+            // Format label based on CO level
+            if (coValue <= 8) {
+              // Normal - just show value
+              label = "Ambient CO: " + Math.round(coValue) + " ppm" + suffix;
+            } else {
+              // Elevated/Dangerous/Emergency - show level and "Investigate!"
+              label = "CO Ambient " + stateText + " " + Math.round(coValue) + " ppm, Investigate!" + suffix;
+            }
 
             // Set text color based on CO level
-            if (coValue >= 36) {
-              textColor = rgb(1, 0, 0); // Red for Dangerous/Emergency
+            // Orange for Elevated, Red for Dangerous, Dark Red for Emergency
+            if (coValue >= 70) {
+              textColor = rgb(0.72, 0.11, 0.11); // Dark red for Emergency
+            } else if (coValue >= 36) {
+              textColor = rgb(0.96, 0.26, 0.21); // Red for Dangerous
             } else if (coValue >= 9) {
-              textColor = rgb(0.8, 0.4, 0); // Orange for Elevated
+              textColor = rgb(1, 0.6, 0); // Orange for Elevated
             }
           } else {
             // 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;
+              label = "CO Ambient Elevated, Investigate!" + suffix;
+              textColor = rgb(1, 0.6, 0); // Orange
+              icon = iconRangeYellow;
             }
           }
         }