@measurequick/measurequick-report-generator 1.5.221 → 1.5.223

package/package.json

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

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

@@ -254,6 +254,8 @@ export async function getReport(payload, _test) {
       return isFinite(n) ? n : NaN;
     }
     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,
@@ -511,16 +513,57 @@ export async function getReport(payload, _test) {
         passFails.splice(3, 1);
         pfLabels.splice(3, 1);
       }
+
+      // CO threshold color helpers
+      function getCOIcon(coValue) {
+        if (coValue === null || coValue === undefined || isNaN(coValue)) {
+          return iconRangeGreen;
+        }
+        if (coValue <= 9) {
+          return iconRangeGreen;
+        } else if (coValue > 9 && coValue <= 35) {
+          return iconRangeYellow;
+        } else {
+          return iconRangeRed;
+        }
+      }
+
+      function getCOTextColor(coValue) {
+        if (coValue === null || coValue === undefined || isNaN(coValue)) {
+          return rgb(0, 0, 0);
+        }
+        if (coValue <= 9) {
+          return rgb(0, 0, 0); // black - OK
+        } else if (coValue > 9 && coValue <= 35) {
+          return rgb(1, 0.6, 0); // orange - Elevated
+        } else {
+          return rgb(0.96, 0.26, 0.21); // red - Dangerous
+        }
+      }
+
+      function getCOStatus(coValue) {
+        if (coValue === null || coValue === undefined || isNaN(coValue)) {
+          return "";
+        }
+        if (coValue <= 9) {
+          return "OK";
+        } else {
+          return "Elevated";
+        }
+      }
+
+      // Collect valid items first (no gaps)
+      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;
@@ -529,53 +572,85 @@ 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 - show actual values
         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
-          } 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;
+          // Calculate CO delta
+          const coDelta = (isFinite(coSupRaw) && isFinite(coRetRaw)) ? (coSupRaw - coRetRaw) : null;
+          const hasCODeltaWarning = test.testInfo.ambient_pass_fail_co_delta_warning || (coDelta !== null && coDelta >= 1);
+
+          // Add CO Ambient with value
+          if (isFinite(coAmbRaw)) {
+            const coAmbIcon = getCOIcon(coAmbRaw);
+            const coAmbColor = getCOTextColor(coAmbRaw);
+            const coAmbStatus = getCOStatus(coAmbRaw);
+            const coAmbLabel = "CO Ambient: " + Math.round(coAmbRaw) + " ppm (" + coAmbStatus + ")" + suffix;
+            validItems.push({ label: coAmbLabel, icon: coAmbIcon, textColor: coAmbColor });
+          } else if (meas) {
+            // No CO value but has pass/fail - show generic
+            const isFail = !(meas === "Pass" || meas === "High" || meas === "Mid" || meas === "Caution");
+            if (isFail) {
+              validItems.push({ label: "CO Ambient: Elevated" + suffix, icon: iconRangeYellow, textColor: rgb(1, 0.6, 0) });
+            } else {
+              validItems.push({ label: "CO Ambient: OK" + suffix, icon: iconRangeGreen, textColor: rgb(0, 0, 0) });
+            }
+          }
+
+          // Add CO Return with value (if available and not boiler)
+          if (isFinite(coRetRaw) && !payload.meta.boiler_type) {
+            const coRetIcon = getCOIcon(coRetRaw);
+            const coRetColor = getCOTextColor(coRetRaw);
+            const coRetStatus = getCOStatus(coRetRaw);
+            const coRetLabel = "CO Return: " + Math.round(coRetRaw) + " ppm (" + coRetStatus + ")";
+            validItems.push({ label: coRetLabel, icon: coRetIcon, textColor: coRetColor });
+          }
+
+          // Add CO Supply with value (if available and not boiler)
+          if (isFinite(coSupRaw) && !payload.meta.boiler_type) {
+            const coSupIcon = getCOIcon(coSupRaw);
+            const coSupColor = getCOTextColor(coSupRaw);
+            const coSupStatus = getCOStatus(coSupRaw);
+            const coSupLabel = "CO Supply: " + Math.round(coSupRaw) + " ppm (" + coSupStatus + ")";
+            validItems.push({ label: coSupLabel, icon: coSupIcon, textColor: coSupColor });
           }
+
+          // Add CO Delta (if both return and supply available and not boiler)
+          if (coDelta !== null && !payload.meta.boiler_type) {
+            const deltaIcon = hasCODeltaWarning ? iconRangeRed : iconRangeGreen;
+            const deltaColor = hasCODeltaWarning ? rgb(0.96, 0.26, 0.21) : rgb(0, 0, 0);
+            const deltaStatus = hasCODeltaWarning ? "Investigate Heat Exchanger" : "OK";
+            const deltaLabel = "CO Delta: " + Math.round(coDelta) + " ppm (" + deltaStatus + ")";
+            validItems.push({ label: deltaLabel, icon: deltaIcon, textColor: deltaColor });
+          }
+
+          continue; // Skip adding the default ambient_pass_fail item
         }
 
-        // 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];
+        safeSetImage(form, `ImageSubsystem${i + 1}_af_image`, item.icon);
         try {
-          const tf = form.getTextField(fieldName);
-          tf.setText(label);
-          tf.setTextColor(rgb(0, 0, 0));
+          const tf = form.getTextField(`SSR${i + 1}`);
+          tf.setText(item.label);
+          tf.setTextColor(item.textColor);
         } catch (e) {}
       }
+
+      // Clear any remaining unused fields
+      for (let i = validItems.length; i < passFails.length + 3; i++) {
+        safeSetText(form, `SSR${i + 1}`, "");
+      }
     } else safeSetText(form, `SSR1`, "Not yet reviewed");
 
     if (payload.meta.report_type != "FullReport") {

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

@@ -330,13 +330,13 @@ export async function getReport(payload, _test) {
       // 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.";
+        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 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.";
+        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
@@ -672,13 +672,23 @@ export async function getReport(payload, _test) {
           // Use coAmbRaw which is already defined and validated earlier in the function
           const coValue = isFinite(coAmbRaw) ? coAmbRaw : null;
 
+          // Check for CO delta warning (Supply - Return >= 1 ppm)
+          const coDelta = (isFinite(coSupRaw) && isFinite(coRetRaw)) ? (coSupRaw - coRetRaw) : null;
+          const hasCODeltaWarning = test.testInfo.ambient_pass_fail_co_delta_warning || (coDelta !== null && coDelta >= 1);
+
           // Use CO-specific icon based on actual value
           if (coValue !== null) {
             icon = getCOIcon(coValue);
             const stateText = getCOStateText(coValue);
 
-            // Format label based on CO level
-            if (coValue <= 8) {
+            // Format label based on CO level and delta warning
+            if (hasCODeltaWarning) {
+              // CO delta detected - recommend heat exchanger investigation
+              icon = iconRangeRed;
+              textColor = rgb(0.96, 0.26, 0.21); // Red
+              const deltaValue = coDelta !== null ? Math.round(coDelta) : "";
+              label = "CO Delta " + deltaValue + " ppm: Investigate heat exchanger" + suffix;
+            } else if (coValue <= 8) {
               // Normal - just show value
               label = "Ambient CO: " + Math.round(coValue) + " ppm" + suffix;
             } else {
@@ -686,15 +696,23 @@ export async function getReport(payload, _test) {
               label = "CO Ambient " + stateText + " " + Math.round(coValue) + " ppm, Investigate!" + suffix;
             }
 
-            // Set text color based on CO level
-            // 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(1, 0.6, 0); // Orange for Elevated
+            // Set text color based on CO level (if not already set by delta warning)
+            if (!hasCODeltaWarning) {
+              // 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(1, 0.6, 0); // Orange for Elevated
+              }
             }
+          } else if (hasCODeltaWarning) {
+            // No ambient CO value but delta warning detected
+            icon = iconRangeRed;
+            textColor = rgb(0.96, 0.26, 0.21); // Red
+            const deltaValue = coDelta !== null ? Math.round(coDelta) : "";
+            label = "CO Delta " + deltaValue + " ppm: Investigate heat exchanger" + suffix;
           } else {
             // No CO value, use pass/fail status
             const isFail = !(meas === "Pass" || meas === "High" || meas === "Mid" || meas === "Caution");