@measurequick/measurequick-report-generator 1.2.122 → 1.2.124

package/package.json

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

package/report-gen-scripts/measurement-details.js

@@ -148,11 +148,11 @@ export async function getReport(payload) {
             if (!val) val = "--";
             else if (measurement.fixTo && typeof val == 'number') val = val.toFixed(measurement.fixTo);
             if ((measurement.label == 'Ambient CO' || measurement.label == 'Return CO' || measurement.label == 'Supply CO') && !measurement.value) val = '0.0';
-            if (typeof val == 'number' || !isNaN(val)) val = val.toLocaleString("en-US");
-            else if (!isNaN(parseFloat(val))) val = parseFloat(val).toLocaleString("en-US");
+            if (measurement.ref != 'gas_input_rated' && measurement.ref != 'gas_input_after') {
+              if (typeof val == 'number' || !isNaN(val)) val = val.toLocaleString("en-US");
+              else if (!isNaN(parseFloat(val))) val = parseFloat(val).toLocaleString("en-US");
+            }
             if (measurement.fixTo && typeof val == 'number') val = val.toFixed(measurement.fixTo);
-            // gas_input_rated
-            // gas_input_after
             if (measurement.ref == 'co' || measurement.ref == 'o2' || measurement.ref == 'temperature_air' || measurement.ref == 'temperature_stack' || measurement.ref == 'coaf' || measurement.ref == 'excess_air' || measurement.ref == 'efficiency_gcv' || measurement.ref == 'efficiency_ncv' || measurement.ref == 'dew_point') val = measurement.value;
             form.getTextField(`Block${blockNum}-Row${rowNum}-Col2`).setText(`${val}`);
             if (blockNum != 4) {

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

@@ -178,20 +178,17 @@ export async function getReport(payload, _test) {
     } else if (test.testInfo.data.coaf > 400) specialCasePlacement = "High";
     form.getButton(`ImageCOaf${specialCasePlacement}`).setImage(specialCaseIcon);
 
-    specialCaseIcon = iconRangeRed;
     specialCasePlacement = "Low";
-    if (test.testInfo.data.efficiency_gcv >= 90) {
-        specialCasePlacement = "High";
-        specialCaseIcon = iconRangeGreen;
-    } else if (test.testInfo.data.efficiency_gcv >= 80) specialCasePlacement = "Mid";
-    form.getButton(`ImageEfficiency${specialCasePlacement}`).setImage(specialCaseIcon);
+    if (test.testInfo.data.efficiency_gcv >= 90) specialCasePlacement = "High";
+    else if (test.testInfo.data.efficiency_gcv >= 80) specialCasePlacement = "Mid";
+    form.getButton(`ImageEfficiency${specialCasePlacement}`).setImage(iconRangeGreen);
 
     // print pass fail measures
     if (test.testInfo.subsystem_review_complete) {
       let passFails = ["ambient_co_pass_fail", "control_system_pass_fail", "electrical_system_pass_fail", "air_distribution_system_pass_fail", "air_filtration_system_pass_fail", "condensate_drain_system_pass_fail", "indoor_equipment_pass_fail", "venting_system_pass_fail", "fuel_delivery_system_pass_fail", "make_up_air_system_pass_fail", "heat_exchanger_pass_fail", "safety_system_pass_fail", "heating_operation_pass_fail", "combustion_safety_pass_fail", "combustion_efficiency_pass_fail"];
       let pfLabels = ["Ambient CO", "Control system (thermostat)", "Electrical system", "Air distribution system", "Air filtration system", "Condensate drain system", "Indoor equipment", "Venting system", "Fuel delivery system", "Make up air (CAZ)", "Heat exchanger", "Safety system", "Heating operation", "Combustion Safety", "Combustion efficiency"];
       for (let i = 1; i <= passFails.length; i++) {
-          let meas = test[passFails[i - 1]];
+          let meas = test.testInfo[passFails[i - 1]];
           let icon = meas == "Pass" || meas == "High" || meas == "Mid"  ? iconRangeGreen : iconRangeRed;
           form.getButton(`ImageSubsystem${i}_af_image`).setImage(icon);
           form.getTextField(`SSR${i}`).setText(pfLabels[i-1]);