@measurequick/measurequick-report-generator 1.5.19 → 1.5.20

package/package.json

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

package/report-gen-scripts/nci-report.js

@@ -172,9 +172,15 @@ export async function getReport(payload, _test) {
             if (test.ductScreeningAirflow){
                 form.getTextField('FanAirflow').setText(`${test.ductScreeningAirflow.toString()} SCFM`);
             }
+            else {
+                form.getTextField('FanAirflow').setText('--');
+            }
             if (test.ductScreeningAirflowTarget){
                 form.getTextField('FanAirflowTarget').setText(`${test.ductScreeningAirflowTarget.toString()}`);
             }
+            else {
+                form.getTextField('FanAirflowTarget').setText('--');
+            }
         
             //Add logic here for which image
             if (test["ductScreeningAirflowResult"]){
@@ -194,9 +200,15 @@ export async function getReport(payload, _test) {
         if (test.ductScreeningTESP){
             form.getTextField('TotalExternalStaticPressure').setText(`${test.ductScreeningTESP.toString()} inH2O`);
         }
+        else {
+            form.getTextField('TotalExternalStaticPressure').setText('--');
+        }
         if (test.ductScreeningTESPTarget){
             form.getTextField('TotalExternalStaticPressureTarget').setText(`${test.ductScreeningTESPTarget.toString()}`);
         }
+        else {
+            form.getTextField('TotalExternalStaticPressureTarget').setText('--');
+        }
         //Add logic here for which image
         meas = "";
         if (test["ductScreeningTESPResult"]){
@@ -211,8 +223,14 @@ export async function getReport(payload, _test) {
         //Filter Pressure Drop
         if (test["ductScreeningPressureDrop"+filter_pressure_drop])
             form.getTextField('FilterPressureDrop').setText(test['ductScreeningPressureDrop'+filter_pressure_drop].toString() + ' inH2O');
+        else {
+            form.getTextField('FilterPressureDrop').setText('--');
+        }
         if (test['ductScreeningPressureDrop'+filter_pressure_drop+'Target'])
             form.getTextField('FilterPressureDropTarget').setText(test['ductScreeningPressureDrop'+filter_pressure_drop+'Target'].toString());
+        else {
+            form.getTextField('FilterPressureDropTarget').setText('--');
+        }
         //Add logic here for which image
         meas = "";
         if (test["ductScreeningPressureDrop"+filter_pressure_drop+"Result"]){
@@ -228,8 +246,14 @@ export async function getReport(payload, _test) {
         if (test.ductScreeningTestPoint3){
             if (test["ductScreeningPressureDrop"+coil_pressure_drop] || test["ductScreeningPressureDrop"+coil_pressure_drop]===0)
                 form.getTextField('IndoorCoilPressureDrop').setText(test["ductScreeningPressureDrop"+coil_pressure_drop].toString() + ' inH2O');
+            else {
+                form.getTextField('IndoorCoilPressureDrop').setText('--');
+            }
             if (test["ductScreeningPressureDrop"+coil_pressure_drop+'Target'])
                 form.getTextField('IndoorCoilPressureDropTarget').setText(test["ductScreeningPressureDrop"+coil_pressure_drop+'Target'].toString());
+            else {
+                form.getTextField('IndoorCoilPressureDropTarget').setText('--');
+            }
             //Add logic here for which image
             meas = "";
             if (test["ductScreeningPressureDrop"+coil_pressure_drop+"Result"]){
@@ -248,8 +272,12 @@ export async function getReport(payload, _test) {
         //Return Duct Pressure
         if (test["ductScreeningPressureDrop"+return_pressure_drop])
             form.getTextField('ReturnDuctPressure').setText(test["ductScreeningPressureDrop"+return_pressure_drop].toString() + ' inH2O');
+        else 
+            form.getTextField('ReturnDuctPressure').setText('--');
         if (test["ductScreeningPressureDrop"+return_pressure_drop+'Target'])
             form.getTextField('ReturnDuctPressureTarget').setText(test["ductScreeningPressureDrop"+return_pressure_drop+'Target'].toString());
+        else 
+            form.getTextField('ReturnDuctPressureTarget').setText('--');
         //Add logic here for which image
         meas = "";
         if (test["ductScreeningPressureDrop"+return_pressure_drop+"Result"]){
@@ -264,8 +292,14 @@ export async function getReport(payload, _test) {
         //Supply Duct Pressure
         if (test["ductScreeningPressureDrop"+supply_pressure])
             form.getTextField('SupplyDuctPressure').setText(test["ductScreeningPressureDrop"+supply_pressure].toString() + ' inH2O');
+        else {
+            form.getTextField('SupplyDuctPressure').setText('--');
+        }
         if (test["ductScreeningPressureDrop"+supply_pressure+'Target'])
             form.getTextField('SupplyDuctPressureTarget').setText(test["ductScreeningPressureDrop"+supply_pressure+'Target'].toString());
+        else {
+            form.getTextField('SupplyDuctPressureTarget').setText('--');
+        }
         //Add logic here for which image
         meas = "";
         if (test["ductScreeningPressureDrop"+supply_pressure+"Result"]){
@@ -278,34 +312,41 @@ export async function getReport(payload, _test) {
             form.getButton('ImageSupplyDuctPressure'+meas).setImage(icon);
 
         //Additional Supporting Data
+        let position = 1;
         if (test.ductScreeningType){
-            let value = test.ductScreeningType === 1 ? 'Duct Analysis' : test.ductScreeningType === 2 ? 'Duct Analysis w/Fan Table' : 'Duct System Screening';
-            form.getTextField('AdditionalSupportingDataLabel1').setText(`Test Type:`);
-            form.getTextField('AdditionalSupportingDataValue1').setText(value);
+            let value = test.ductScreeningType === 1 ? 'Duct System Analysis' : test.ductScreeningType === 2 ? 'Duct Analysis w/Fan Table' : 'Duct System Screening';
+            form.getTextField('AdditionalSupportingDataLabel'+position).setText(`Test Type:`);
+            form.getTextField('AdditionalSupportingDataValue'+position).setText(value);
+            position++;
         }
         //form.getButton('ImageAdditionalSupportingData1').setImage(icon);
         if (test.ductScreeningSystemType){
-            form.getTextField('AdditionalSupportingDataLabel2').setText(`System Type:`);
-            form.getTextField('AdditionalSupportingDataValue2').setText(test.ductScreeningSystemType);
+            form.getTextField('AdditionalSupportingDataLabel'+position).setText(`System Type:`);
+            form.getTextField('AdditionalSupportingDataValue'+position).setText(test.ductScreeningSystemType);
+            position++;
         }
         //form.getButton('ImageAdditionalSupportingData2').setImage(icon);
         if (test.ductScreeningFilterLocation){
-            form.getTextField('AdditionalSupportingDataLabel3').setText(`Filter Location:`);
-            form.getTextField('AdditionalSupportingDataValue3').setText(test.ductScreeningFilterLocation);
+            form.getTextField('AdditionalSupportingDataLabel'+position).setText(`Filter Location:`);
+            form.getTextField('AdditionalSupportingDataValue'+position).setText(test.ductScreeningFilterLocation);
+            position++;
         }
         //form.getButton('ImageAdditionalSupportingData3').setImage(icon);
         if (test.tonnage_nominal){
-            form.getTextField('AdditionalSupportingDataLabel4').setText(`Nominal Tonnage:`);
-            form.getTextField('AdditionalSupportingDataValue4').setText(test.tonnage_nominal + ' tons');
+            form.getTextField('AdditionalSupportingDataLabel'+position).setText(`Nominal Tonnage:`);
+            form.getTextField('AdditionalSupportingDataValue'+position).setText(test.tonnage_nominal + ' tons');
+            position++;
         }
         //form.getButton('ImageAdditionalSupportingData4').setImage(icon);
         if (test.ductScreeningType!==3&&test.airflow_rated){
-            form.getTextField('AdditionalSupportingDataLabel5').setText(`Airflow (Rated):`);
-            form.getTextField('AdditionalSupportingDataValue5').setText(test.airflow_rated + ' SCFM');
+            form.getTextField('AdditionalSupportingDataLabel'+position).setText(`Airflow (Rated):`);
+            form.getTextField('AdditionalSupportingDataValue'+position).setText(test.airflow_rated + ' SCFM');
+            position++;
         } else if (test.ductScreeningType!==3&&test.airflow_nominal&&test.tonnage_nominal){
             let value = test.tonnage_nominal * test.airflow_nominal;
-            form.getTextField('AdditionalSupportingDataLabel5').setText(`Airflow (Nominal):`);
-            form.getTextField('AdditionalSupportingDataValue5').setText(value + ' SCFM');
+            form.getTextField('AdditionalSupportingDataLabel'+position).setText(`Airflow (Nominal):`);
+            form.getTextField('AdditionalSupportingDataValue'+position).setText(value + ' SCFM');
+            position++;
         }
         //form.getButton('ImageAdditionalSupportingData5').setImage(icon);
         form.getTextField('AdditionalSupportingDataLabel6').setText(``);
@@ -325,22 +366,22 @@ export async function getReport(payload, _test) {
 
         let recommendations = '';
         if (test.ductScreeningTESPResult!==0 && test.ductScreeningTESPResultText){
-            recommendations += (test.ductScreeningTESPResultText + '\n');
+            recommendations += ("• " + test.ductScreeningTESPResultText + '\n');
         }
         if (test.ductScreeningAirflowResult!==0 && test.ductScreeningAirflowResultText){
-            recommendations += (test.ductScreeningAiflowResultText + '\n');
+            recommendations += ("• " + test.ductScreeningAirflowResultText + '\n');
         }
         if (test.ductScreeningPressureDrop1Result!==0 && test.ductScreeningPressureDrop1ResultText){
-            recommendations += (test.ductScreeningPressureDrop1ResultText + '\n');
+            recommendations += ("• " + test.ductScreeningPressureDrop1ResultText + '\n');
         }
         if (test.ductScreeningPressureDrop2Result!==0 && test.ductScreeningPressureDrop2ResultText){
-            recommendations += (test.ductScreeningPressureDrop2ResultText + '\n');
+            recommendations += ("• " + test.ductScreeningPressureDrop2ResultText + '\n');
         }
         if (test.ductScreeningPressureDrop3Result!==0 && test.ductScreeningPressureDrop3ResultText){
-            recommendations += (test.ductScreeningPressureDrop3ResultText + '\n');
+            recommendations += ("• " + test.ductScreeningPressureDrop3ResultText + '\n');
         }
         if (test.ductScreeningPressureDrop4Result!==0 && test.ductScreeningPressureDrop4ResultText){
-            recommendations += (test.ductScreeningPressureDrop4ResultText + '\n');
+            recommendations += ("• " + test.ductScreeningPressureDrop4ResultText + '\n');
         }
         if (!recommendations) {
             recommendations = 'No recommendations. System passed all diagnostics!';
@@ -352,8 +393,13 @@ export async function getReport(payload, _test) {
         else form.getTextField('FanAirflowPassFail').setText('N/A');
         if (test.ductScreeningTESPResult||test.ductScreeningTESPResult===0)
             form.getTextField('StaticPressurePassFail').setText(getPassFailText(test.ductScreeningTESPResult));
+        else 
+            form.getTextField('StaticPressurePassFail').setText('--');
         if (test['ductScreeningPressureDrop'+filter_pressure_drop+'Result']||test['ductScreeningPressureDrop'+filter_pressure_drop+'Result']===0)
             form.getTextField('AirFilterPassFail').setText(getPassFailText(test['ductScreeningPressureDrop'+filter_pressure_drop+'Result']));
+        else {
+            form.getTextField('AirFilterPassFail').setText('--');
+        }
         if (test.ductScreeningTestPoint3||test.ductScreeningTestPoint3===0){
             if (test['ductScreeningPressureDrop'+coil_pressure_drop+'Result']||test['ductScreeningPressureDrop'+coil_pressure_drop+'Result']===0)
                 form.getTextField('CoilPassFail').setText(getPassFailText(test['ductScreeningPressureDrop'+coil_pressure_drop+'Result']));
@@ -362,8 +408,12 @@ export async function getReport(payload, _test) {
         }
         if (test['ductScreeningPressureDrop'+supply_pressure+'Result']||test['ductScreeningPressureDrop'+supply_pressure+'Result']===0)
             form.getTextField('SupplyDuctPassFail').setText(getPassFailText(test['ductScreeningPressureDrop'+supply_pressure+'Result']));
+        else 
+            form.getTextField('SupplyDuctPassFail').setText('--');
         if (test['ductScreeningPressureDrop'+return_pressure_drop+'Result']||test['ductScreeningPressureDrop'+return_pressure_drop+'Result']===0)
             form.getTextField('ReturnDuctPassFail').setText(getPassFailText(test['ductScreeningPressureDrop'+return_pressure_drop+'Result']));
+        else
+            form.getTextField('ReturnDuctPassFail').setText('--');
         if (test.ductScreeningResult){
             if (test.ductScreeningResult === 'PASS'){
                 form.getTextField('TestResultBreakdownPage').setText('PASS');