@measurequick/measurequick-report-generator 1.5.156 → 1.5.159

package/package.json

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

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

@@ -196,17 +196,27 @@ export async function getReport(payload, _test) {
       `${systemScorePercentage} ${systemScoreGrade}`
     );
 
-    if (+textFields.co_ambient > 9) {
+    // CO warning based on ambient CO only
+    var data = t && t.data ? t.data : {};
+    function toNum(v) {
+      var n = Number(v);
+      return isFinite(n) ? n : NaN;
+    }
+    var coAmbRaw = toNum(data && data.co_ambient);
+    if (isFinite(coAmbRaw) && coAmbRaw > 9) {
       safeSetText(
         form,
         "COWarning",
-        `WARNING: Elevated CO above 9 ppm Detected!\nVentilate the area and investigate the source.`
+        "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.`
+        "WARNING: Elevated CO above 9 ppm Detected! Ventilate the area and investigate the source."
       );
+    } else {
+      safeSetText(form, "COWarning", "");
+      safeSetText(form, "COWarning2", "");
     }
 
     //form.getTextField("COaf").setText(`${textFields.coaf} ppm`);

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

@@ -196,21 +196,36 @@ export async function getReport(payload, _test) {
       `${systemScorePercentage} ${systemScoreGrade}`
     );
 
-    if (
-      +textFields.co_ambient > 9 ||
-      +textFields.co_return > 9 ||
-      +textFields.co_supply > 9
-    ) {
+    // Show CO warnings based on raw values (avoid false negatives from rounded display strings)
+    var data = t && t.data ? t.data : {};
+    function toNum(v) {
+      var n = Number(v);
+      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);
+
+    var coHigh =
+      (isFinite(coAmbRaw) && coAmbRaw > 9) ||
+      (isFinite(coRetRaw) && coRetRaw > 9) ||
+      (isFinite(coSupRaw) && coSupRaw > 9);
+
+    if (coHigh) {
       safeSetText(
         form,
         "COWarning",
-        `WARNING: Elevated CO above 9 ppm Detected!\nVentilate the area and investigate the source.`
+        "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.`
+        "WARNING: Elevated CO above 9 ppm Detected! Ventilate the area and investigate the source."
       );
+    } else {
+      // clear warnings if not applicable
+      safeSetText(form, "COWarning", "");
+      safeSetText(form, "COWarning2", "");
     }
 
     safeSetText(form, "COaf", `${textFields.coaf} ppm`);