npm - @measurequick/measurequick-report-generator - Versions diffs - 1.5.102 → 1.5.104 - Mend

@measurequick/measurequick-report-generator 1.5.102 → 1.5.104

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/package.json +1 -1
package/report-gen-scripts/nci-report-contractor.js +736 -259
package/report-gen-scripts/nci-report-customer.js +42 -42

package/package.json CHANGED Viewed

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

package/report-gen-scripts/nci-report-contractor.js CHANGED Viewed

@@ -1,117 +1,661 @@
-import { PDFDocument } from 'pdf-lib';
-import * as base64 from '../base-64/icons.js';
-import * as pdf from '../base-64/nci-report-contractor.js';
-import * as util from '../util.js';
+import { PDFDocument } from "pdf-lib";
+import * as base64 from "../base-64/icons.js";
+import * as pdf from "../base-64/nci-report-contractor.js";
+import * as util from "../util.js";
 export async function getReport(payload, _test) {
-    try {
-        // fetch and load form
-        const formPdfBytes = util._base64ToArrayBuffer(pdf.base64);
-        const pdfDoc = await PDFDocument.load(formPdfBytes);
-        var errors = [];
-        // fetch resources
-        const iconRangeGreenBytes = util._base64ToArrayBuffer(base64.iconRangeGreen);
-        const iconRangeRedBytes = util._base64ToArrayBuffer(base64.iconRangeRed);
-        const iconFlagBlackBytes = util._base64ToArrayBuffer(base64.iconFlagBlack);
-        const iconFlagGreenBytes = util._base64ToArrayBuffer(base64.iconFlagGreen);
-        const iconFlagRedBytes = util._base64ToArrayBuffer(base64.iconFlagRed);
-        const iconFlagYellowBytes = util._base64ToArrayBuffer(base64.iconFlagYellow);
-        const iconStabilityBytes = util._base64ToArrayBuffer(base64.iconStability);
-        const iconThumbprintGreenBytes = util._base64ToArrayBuffer(base64.iconThumbprintGreen);
-        const iconThumbprintRedBytes = util._base64ToArrayBuffer(base64.iconThumbprintRed);
-        const mqLogoBytes = util._base64ToArrayBuffer(base64.mqLogo);
-        const gauge100Bytes = util._base64ToArrayBuffer(base64.gauge100);
-        const gauge90Bytes = util._base64ToArrayBuffer(base64.gauge90);
-        const gauge80Bytes = util._base64ToArrayBuffer(base64.gauge80);
-        const gauge70Bytes = util._base64ToArrayBuffer(base64.gauge70);
-        const gauge60Bytes = util._base64ToArrayBuffer(base64.gauge60);
-        const gauge50Bytes = util._base64ToArrayBuffer(base64.gauge50);
-        const gauge40Bytes = util._base64ToArrayBuffer(base64.gauge40);
-        const gauge30Bytes = util._base64ToArrayBuffer(base64.gauge30);
-        const gauge20Bytes = util._base64ToArrayBuffer(base64.gauge20);
-        const gauge10Bytes = util._base64ToArrayBuffer(base64.gauge10);
-        // load resources
-        const iconRangeGreen = await pdfDoc.embedPng(iconRangeGreenBytes);
-        const iconRangeRed = await pdfDoc.embedPng(iconRangeRedBytes);
-        const iconFlagBlack = await pdfDoc.embedPng(iconFlagBlackBytes);
-        const iconFlagGreen = await pdfDoc.embedPng(iconFlagGreenBytes);
-        const iconFlagRed = await pdfDoc.embedPng(iconFlagRedBytes);
-        const iconFlagYellow = await pdfDoc.embedPng(iconFlagYellowBytes);
-        const iconStability = await pdfDoc.embedPng(iconStabilityBytes);
-        const iconThumbprintGreen = await pdfDoc.embedPng(iconThumbprintGreenBytes);
-        const iconThumbprintRed = await pdfDoc.embedPng(iconThumbprintRedBytes);
-        const mqLogo = await pdfDoc.embedPng(mqLogoBytes);
-        const gauge100 = await pdfDoc.embedPng(gauge100Bytes);
-        const gauge90 = await pdfDoc.embedPng(gauge90Bytes);
-        const gauge80 = await pdfDoc.embedPng(gauge80Bytes);
-        const gauge70 = await pdfDoc.embedPng(gauge70Bytes);
-        const gauge60 = await pdfDoc.embedPng(gauge60Bytes);
-        const gauge50 = await pdfDoc.embedPng(gauge50Bytes);
-        const gauge40 = await pdfDoc.embedPng(gauge40Bytes);
-        const gauge30 = await pdfDoc.embedPng(gauge30Bytes);
-        const gauge20 = await pdfDoc.embedPng(gauge20Bytes);
-        const gauge10 = await pdfDoc.embedPng(gauge10Bytes);
+  try {
+    // fetch and load form
+    const formPdfBytes = util._base64ToArrayBuffer(pdf.base64);
+    const pdfDoc = await PDFDocument.load(formPdfBytes);
+    var errors = [];
-        const form = pdfDoc.getForm();
+    // fetch resources
+    const iconRangeGreenBytes = util._base64ToArrayBuffer(
+      base64.iconRangeGreen
+    );
+    const iconRangeRedBytes = util._base64ToArrayBuffer(base64.iconRangeRed);
+    const iconFlagBlackBytes = util._base64ToArrayBuffer(base64.iconFlagBlack);
+    const iconFlagGreenBytes = util._base64ToArrayBuffer(base64.iconFlagGreen);
+    const iconFlagRedBytes = util._base64ToArrayBuffer(base64.iconFlagRed);
+    const iconFlagYellowBytes = util._base64ToArrayBuffer(
+      base64.iconFlagYellow
+    );
+    const iconStabilityBytes = util._base64ToArrayBuffer(base64.iconStability);
+    const iconThumbprintGreenBytes = util._base64ToArrayBuffer(
+      base64.iconThumbprintGreen
+    );
+    const iconThumbprintRedBytes = util._base64ToArrayBuffer(
+      base64.iconThumbprintRed
+    );
+    const mqLogoBytes = util._base64ToArrayBuffer(base64.mqLogo);
+    const gauge100Bytes = util._base64ToArrayBuffer(base64.gauge100);
+    const gauge90Bytes = util._base64ToArrayBuffer(base64.gauge90);
+    const gauge80Bytes = util._base64ToArrayBuffer(base64.gauge80);
+    const gauge70Bytes = util._base64ToArrayBuffer(base64.gauge70);
+    const gauge60Bytes = util._base64ToArrayBuffer(base64.gauge60);
+    const gauge50Bytes = util._base64ToArrayBuffer(base64.gauge50);
+    const gauge40Bytes = util._base64ToArrayBuffer(base64.gauge40);
+    const gauge30Bytes = util._base64ToArrayBuffer(base64.gauge30);
+    const gauge20Bytes = util._base64ToArrayBuffer(base64.gauge20);
+    const gauge10Bytes = util._base64ToArrayBuffer(base64.gauge10);
+    // load resources
+    const iconRangeGreen = await pdfDoc.embedPng(iconRangeGreenBytes);
+    const iconRangeRed = await pdfDoc.embedPng(iconRangeRedBytes);
+    const iconFlagBlack = await pdfDoc.embedPng(iconFlagBlackBytes);
+    const iconFlagGreen = await pdfDoc.embedPng(iconFlagGreenBytes);
+    const iconFlagRed = await pdfDoc.embedPng(iconFlagRedBytes);
+    const iconFlagYellow = await pdfDoc.embedPng(iconFlagYellowBytes);
+    const iconStability = await pdfDoc.embedPng(iconStabilityBytes);
+    const iconThumbprintGreen = await pdfDoc.embedPng(iconThumbprintGreenBytes);
+    const iconThumbprintRed = await pdfDoc.embedPng(iconThumbprintRedBytes);
+    const mqLogo = await pdfDoc.embedPng(mqLogoBytes);
+    const gauge100 = await pdfDoc.embedPng(gauge100Bytes);
+    const gauge90 = await pdfDoc.embedPng(gauge90Bytes);
+    const gauge80 = await pdfDoc.embedPng(gauge80Bytes);
+    const gauge70 = await pdfDoc.embedPng(gauge70Bytes);
+    const gauge60 = await pdfDoc.embedPng(gauge60Bytes);
+    const gauge50 = await pdfDoc.embedPng(gauge50Bytes);
+    const gauge40 = await pdfDoc.embedPng(gauge40Bytes);
+    const gauge30 = await pdfDoc.embedPng(gauge30Bytes);
+    const gauge20 = await pdfDoc.embedPng(gauge20Bytes);
+    const gauge10 = await pdfDoc.embedPng(gauge10Bytes);
+    const form = pdfDoc.getForm();
+    let textFields = getTextFields(payload);
+    //PAGE 1
+    //Header
+    let isCooling = true;
+    if (isCooling)
+      form.getTextField("Title").setText("Cooling System Verify Test");
+    else form.getTextField("Title").setText("Heating System Verify Test");
+    //Customer
+    let customerParts = [];
+    if (textFields.cName) customerParts.push(textFields.cName);
+    if (textFields.address) customerParts.push(textFields.address);
+    if (textFields.address2) customerParts.push(textFields.address2);
+    let cityLine = "";
+    if (textFields.city) cityLine += textFields.city;
+    if (textFields.state)
+      cityLine += `${textFields.city ? ", " : ""}${textFields.state}`;
+    if (textFields.zip)
+      cityLine += `${textFields.state ? " " : ""}${textFields.zip}`;
+    if (cityLine) customerParts.push(cityLine);
+    let customer =
+      customerParts.length > 0
+        ? customerParts.join("\n")
+        : "Customer data not entered";
+    form.getTextField("Customer").setText(customer);
+    //Location
+    //Location information
+    let location = "";
+    if (payload && payload.site && payload.site.site_name)
+      location += payload.site.site_name;
+    form.getTextField("Location").setText(location);
+    //Testing Organization
+    let contractor = "";
+    if (payload && payload.meta && payload.meta.company_name)
+      contractor += payload.meta.company_name;
+    //TODO: get company address and phone number
+    form.getTextField("TestingOrganization").setText(contractor);
+    //Test Information & Conditions
+    let technicianParts = [];
+    if (payload && payload.meta && payload.meta.technician_name)
+      technicianParts.push(payload.meta.technician_name);
+    if (payload && payload.meta && payload.meta.date_of_service)
+      technicianParts.push("Date of Service: " + payload.meta.date_of_service);
+    if (payload && payload.meta && payload.meta.time_of_service)
+      technicianParts.push("Time of Service: " + payload.meta.time_of_service);
+    if (technicianParts.length > 0) technicianParts.push(" ");
+    if (
+      payload &&
+      payload.project &&
+      payload.project.tests &&
+      payload.project.tests[payload.project.tests.length - 1] &&
+      payload.project.tests[payload.project.tests.length - 1].testInfo &&
+      payload.project.tests[payload.project.tests.length - 1].testInfo
+        .weather &&
+      payload.project.tests[payload.project.tests.length - 1].testInfo.weather
+        .currently &&
+      payload.project.tests[payload.project.tests.length - 1].testInfo.weather
+        .currently.temperature
+    ) {
+      technicianParts.push(
+        payload.project.tests[payload.project.tests.length - 1].testInfo.weather
+          .currently.temperature + " degF"
+      );
+    }
+    if (
+      payload &&
+      payload.project &&
+      payload.project.tests &&
+      payload.project.tests[payload.project.tests.length - 1] &&
+      payload.project.tests[payload.project.tests.length - 1].testInfo &&
+      payload.project.tests[payload.project.tests.length - 1].testInfo.data &&
+      (payload.project.tests[payload.project.tests.length - 1].testInfo.data
+        .elevation ||
+        payload.project.tests[payload.project.tests.length - 1].testInfo.data
+          .elevation)
+    ) {
+      technicianParts.push(
+        payload.project.tests[payload.project.tests.length - 1].testInfo.data
+          .elevation + " ft"
+      );
+    }
+    let technician =
+      technicianParts.length > 0
+        ? technicianParts.join("\n")
+        : "Technician data not entered";
+    form.getTextField("TestInformationConditions").setText(technician);
+    //System Information
+    let equipment = "";
+    if (payload && payload.equipment && payload.equipment.name)
+      equipment += payload.equipment.name;
+    if (!equipment) equipment = "Not entered";
+    let equipment_type = "";
+    if (
+      payload &&
+      payload.equipment &&
+      payload.equipment.tonnage_nominal &&
+      payload.equipment.system_type
+    )
+      equipment_type +=
+        payload.equipment.tonnage_nominal +
+        " Ton " +
+        payload.equipment.system_type;
+    if (!equipment_type) equipment_type = "Not entered";
+    form.getTextField("SystemType").setText(equipment_type);
+    let area = "";
+    if (payload && payload.equipment && payload.equipment.area_served)
+      area += payload.equipment.area_served + " sq ft";
+    if (!area) area = "Not entered";
+    form.getTextField("AreaServed").setText(area);
+    //Gas Furnace info
+    if (
+      payload.equipment &&
+      payload.equipment.heat_type &&
+      payload.equipment.heat_type !== "Heat Pump" &&
+      payload.equipment.heat_type !== "None"
+    ) {
+      let afue = "N/A";
+      if (payload.equipment.heat_type.includes("90")) afue = "90+";
+      else if (payload.equipment.heat_type.includes("80")) afue = "80+";
+      else if (payload.equipment.heat_type.includes("70")) afue = "70+";
+      form.getTextField("AFUERating").setText(afue);
+      form
+        .getTextField("FuelType")
+        .setText(
+          payload.equipment.fuel_type ? payload.equipment.fuel_type : "N/A"
+        );
+      form
+        .getTextField("FurnaceType")
+        .setText(
+          payload.equipment.heat_type ? payload.equipment.heat_type : "N/A"
+        );
+      form
+        .getTextField("FurnaceManufacturer")
+        .setText(
+          payload.equipment.ahu_make ? payload.equipment.ahu_make : "N/A"
+        );
+      form
+        .getTextField("FurnaceModel")
+        .setText(
+          payload.equipment.ahu_model ? payload.equipment.ahu_model : "N/A"
+        );
+      form
+        .getTextField("RatedBTUInput")
+        .setText(
+          payload.equipment.gas_input_rated
+            ? payload.equipment.gas_input_rated
+            : "N/A"
+        );
+      form
+        .getTextField("RatedBTUOutput")
+        .setText(
+          payload.equipment.gas_output_rated
+            ? payload.equipment.gas_output_rated
+            : "N/A"
+        );
+      form
+        .getTextField("FurnaceSerial")
+        .setText(
+          payload.equipment.ahu_serial ? payload.equipment.ahu_serial : "N/A"
+        );
+      form
+        .getTextField("FurnaceYear")
+        .setText(
+          payload.equipment.year_installed_ahu_furnace
+            ? payload.equipment.year_installed_ahu_furnace
+            : "N/A"
+        );
+    }
+    let duct_test =
+      payload && payload.project && payload.project.duct_screening
+        ? payload.project.duct_screening
+        : {};
+    //Air Filter
+    form
+      .getTextField("AirFilterLocation")
+      .setText(
+        duct_test.ductScreeningFilterLocation
+          ? duct_test.ductScreeningFilterLocation
+          : "N/A"
+      );
+    //Cooling Condenser
+    form
+      .getTextField("NominalCapacity")
+      .setText(
+        payload.equipment.tonnage_nominal
+          ? (+payload.equipment.tonnage_nominal * 12000).toFixed(0)
+          : "N/A"
+      );
+    form
+      .getTextField("EER")
+      .setText(
+        payload.equipment.rated_eer ? payload.equipment.rated_eer : "N/A"
+      );
+    form
+      .getTextField("CondenserManufacturer")
+      .setText(
+        payload.equipment.condenser_make
+          ? payload.equipment.condenser_make
+          : "N/A"
+      );
+    form
+      .getTextField("CondenserModel")
+      .setText(
+        payload.equipment.condenser_model
+          ? payload.equipment.condenser_model
+          : "N/A"
+      );
+    form
+      .getTextField("SEER")
+      .setText(
+        payload.equipment.efficiency_seasonal
+          ? payload.equipment.efficiency_seasonal
+          : "N/A"
+      );
+    form
+      .getTextField("CondenserSerial")
+      .setText(
+        payload.equipment.condenser_serial
+          ? payload.equipment.condenser_serial
+          : "N/A"
+      );
+    form
+      .getTextField("CondenserYear")
+      .setText(
+        payload.equipment.year_installed
+          ? payload.equipment.year_installed
+          : "N/A"
+      );
+    //Fan
+    form
+      .getTextField("FanCondition")
+      .setText(
+        payload.project.fanCondition ? payload.project.fanCondition : "N/A"
+      );
+    form
+      .getTextField("FanRatedStaticPressure")
+      .setText(
+        payload.equipment.pressure_static_total_external_rated
+          ? payload.equipment.pressure_static_total_external_rated
+          : "N/A"
+      );
+    form
+      .getTextField("FanCapacity")
+      .setText(
+        payload.equipment.tonnage_nominal
+          ? (+payload.equipment.tonnage_nominal * 12000).toFixed(0)
+          : "N/A"
+      );
+    form
+      .getTextField("FanSpeedSetting")
+      .setText(
+        payload.project.endFanSpeed
+          ? capitalizeFirstLetter(payload.project.endFanSpeed)
+          : "N/A"
+      );
+    form
+      .getTextField("FanType")
+      .setText(
+        payload.equipment.blower_motor_type
+          ? getFanType(payload.equipment.blower_motor_type)
+          : "N/A"
+      );
+    //Coil
+    form
+      .getTextField("CoilManufacturer")
+      .setText(
+        payload.equipment.evaporator_make
+          ? payload.equipment.evaporator_make
+          : "N/A"
+      );
+    form
+      .getTextField("CoilModel")
+      .setText(
+        payload.equipment.evaporator_model
+          ? payload.equipment.evaporator_model
+          : "N/A"
+      );
+    form
+      .getTextField("CoilSerial")
+      .setText(
+        payload.equipment.evaporator_serial
+          ? payload.equipment.evaporator_serial
+          : "N/A"
+      );
+    form
+      .getTextField("CoilYear")
+      .setText(
+        payload.equipment.year_installed_evap
+          ? payload.equipment.year_installed_evap
+          : "N/A"
+      );
+    //PAGE 2
+    //Temperatures
+    //Equipment
+    form.getTextField("EquipmentEnteringDB").setText("EquipmentEnteringDB");
+    form.getTextField("EquipmentExitingDB").setText("EquipmentExitingDB");
+    form
+      .getTextField("EquipmentTemperatureChange")
+      .setText("EquipmentTemperatureChange");
+    //Return Duct System
+    form.getTextField("AverageReturnGrilleDB").setText("AverageReturnGrilleDB");
+    form
+      .getTextField("ReturnTemperatureChange")
+      .setText("ReturnTemperatureChange");
+    //Supply Duct System
+    form
+      .getTextField("AverageSupplyRegisterDB")
+      .setText("AverageSupplyRegisterDB");
+    form
+      .getTextField("SupplyTemperatureChange")
+      .setText("SupplyTemperatureChange");
+    //Static Pressures
+    //TESP
+    form.getTextField("TESPEntering").setText("TESPEntering");
+    form.getTextField("TESPExiting").setText("TESPExiting");
+    form.getTextField("TESPValue").setText("TESPValue");
+    form.getTextField("TESPRated").setText("TESPRated");
+    form.getTextField("TESPPercentRated").setText("TESPPercentRated");
+    //Air Filter
+    form.getTextField("AirFilterEntering").setText("AirFilterEntering");
+    form.getTextField("AirFilterExiting").setText("AirFilterExiting");
+    form.getTextField("AirFilterDrop").setText("AirFilterDrop");
+    form.getTextField("AirFilterBudget").setText("AirFilterBudget");
+    form
+      .getTextField("AirFilterPercentBudget")
+      .setText("AirFilterPercentBudget");
+    //Coil
+    form.getTextField("CoilExiting").setText("CoilExiting");
+    form.getTextField("CoilDrop").setText("CoilDrop");
+    form.getTextField("CoilBudget").setText("CoilBudget");
+    form.getTextField("CoilPercentBudget").setText("CoilPercentBudget");
+    form.getTextField("CoilEntering").setText("CoilEntering");
-        form.getTextField('SupplyAirflow1Location').setText('SupplyAirflow1Location');
-        form.getTextField('SupplyAirflow2Location').setText('SupplyAirflow2Location');
-        form.getTextField('SupplyAirflow3Location').setText('SupplyAirflow3Location');
-        form.getTextField('SupplyAirflow4Location').setText('SupplyAirflow4Location');
-        form.getTextField('SupplyAirflow5Location').setText('SupplyAirflow5Location');
-        form.getTextField('SupplyAirflow6Location').setText('SupplyAirflow6Location');
-        form.getTextField('SupplyAirflow7Location').setText('SupplyAirflow7Location');
-        form.getTextField('SupplyAirflow8Location').setText('SupplyAirflow8Location');
-        form.getTextField('SupplyAirflow9Location').setText('SupplyAirflow9Location');
-        form.getTextField('SupplyAirflow10Location').setText('SupplyAirflow10Location');
-        form.getTextField('SupplyAirflow11Location').setText('SupplyAirflow11Location');
-        form.getTextField('SupplyAirflow12Location').setText('SupplyAirflow12Location');
-        form.getTextField('SupplyAirflow13Location').setText('SupplyAirflow13Location');
-        form.getTextField('SupplyAirflow14Location').setText('SupplyAirflow14Location');
-        form.getTextField('SupplyAirflow15Location').setText('SupplyAirflow15Location');
-        form.getTextField('SupplyAirflow16Location').setText('SupplyAirflow16Location');
-        form.getTextField('SupplyAirflow17Location').setText('SupplyAirflow17Location');
-        form.getTextField('SupplyAirflow18Location').setText('SupplyAirflow18Location');
-        form.getTextField('SupplyAirflow19Location').setText('SupplyAirflow19Location');
-        form.getTextField('SupplyAirflow20Location').setText('SupplyAirflow20Location');
-        form.getTextField('SupplyAirflow21Location').setText('SupplyAirflow21Location');
-        form.getTextField('SupplyAirflow22Location').setText('SupplyAirflow22Location');
-        form.getTextField('SupplyAirflow23Location').setText('SupplyAirflow23Location');
-        form.getTextField('SupplyAirflow24Location').setText('SupplyAirflow24Location');
-        form.getTextField('SupplyAirflow1').setText('SupplyAirflow1');
-        form.getTextField('SupplyAirflow2').setText('SupplyAirflow2');
-        form.getTextField('SupplyAirflow3').setText('SupplyAirflow3');
-        form.getTextField('SupplyAirflow4').setText('SupplyAirflow4');
-        form.getTextField('SupplyAirflow5').setText('SupplyAirflow5');
-        form.getTextField('SupplyAirflow6').setText('SupplyAirflow6');
-        form.getTextField('SupplyAirflow7').setText('SupplyAirflow7');
-        form.getTextField('SupplyAirflow8').setText('SupplyAirflow8');
-        form.getTextField('SupplyAirflow9').setText('SupplyAirflow9');
-        form.getTextField('SupplyAirflow10').setText('SupplyAirflow10');
-        form.getTextField('SupplyAirflow11').setText('SupplyAirflow11');
-        form.getTextField('SupplyAirflow12').setText('SupplyAirflow12');
-        form.getTextField('SupplyAirflow13').setText('SupplyAirflow13');
-        form.getTextField('SupplyAirflow14').setText('SupplyAirflow14');
-        form.getTextField('SupplyAirflow15').setText('SupplyAirflow15');
-        form.getTextField('SupplyAirflow16').setText('SupplyAirflow16');
-        form.getTextField('SupplyAirflow17').setText('SupplyAirflow17');
-        form.getTextField('SupplyAirflow18').setText('SupplyAirflow18');
-        form.getTextField('SupplyAirflow19').setText('SupplyAirflow19');
-        form.getTextField('SupplyAirflow20').setText('SupplyAirflow20');
-        form.getTextField('SupplyAirflow21').setText('SupplyAirflow21');
-        form.getTextField('SupplyAirflow22').setText('SupplyAirflow22');
-        form.getTextField('SupplyAirflow23').setText('SupplyAirflow23');
-        form.getTextField('SupplyAirflow24').setText('SupplyAirflow24');
-        form.getTextField('SupplyAirflowTotal').setText('SupplyAirflowTotal');
-        form.getTextField('SupplyAverageDB').setText('SupplyAverageDB');
-        form.getTextField('EquipmentExitingDB').setText('EquipmentExitingDB');
-        form.getTextField('EquipmentTemperatureChange').setText('EquipmentTemperatureChange');
-        form.getTextField('AverageReturnGrilleDB').setText('AverageReturnGrilleDB');
-        form.getTextField('EquipmentEnteringDB').setText('EquipmentEnteringDB');
-        /* air_measurements - this is test values when leaving the user input page.. this needs to grab from acr-connect.data.X
+    //Return Duct System
+    form.getTextField("ReturnBudget").setText("ReturnBudget");
+    form.getTextField("ReturnPercentBudget").setText("ReturnPercentBudget");
+    form.getTextField("ReturnPressure").setText("ReturnPressure");
+    //Supply Duct System
+    form.getTextField("SupplyBudget").setText("SupplyBudget");
+    form.getTextField("SupplyPercentBudget").setText("SupplyPercentBudget");
+    form.getTextField("SupplyPressure").setText("SupplyPressure");
+    //PAGE 3
+    //Airflow
+    //Fan Airflow
+    form.getTextField("FanAirflowRequired").setText("FanAirflowRequired");
+    form.getTextField("FanAirflowMeasured").setText("FanAirflowMeasured");
+    form
+      .getTextField("FanAirflowPercentRequired")
+      .setText("FanAirflowPercentRequired");
+    //Return Duct Airflow
+    form.getTextField("ReturnAirflowTotal").setText("ReturnAirflowTotal");
+    form.getTextField("ReturnAirflowMeasured").setText("ReturnAirflowMeasured");
+    form.getTextField("ReturnDuctLeakage").setText("ReturnDuctLeakage");
+    form.getTextField("ReturnPercentLeakage").setText("ReturnPercentLeakage");
+    //Supply Duct Airflow
+    form.getTextField("SupplyAirflowMeasured").setText("SupplyAirflowMeasured");
+    form.getTextField("SupplyDuctLeakage").setText("SupplyDuctLeakage");
+    form.getTextField("SupplyPercentLeakage").setText("SupplyPercentLeakage");
+    //Equipment Performance
+    form.getTextField("EquipmentRatedBTU").setText("EquipmentRatedBTU");
+    form.getTextField("EquipmentDeliveredBTU").setText("EquipmentDeliveredBTU");
+    form
+      .getTextField("EquipmentMeasuredEfficiency")
+      .setText("EquipmentMeasuredEfficiency");
+    //Return Duct System Performance
+    form.getTextField("ReturnDuctLoss").setText("ReturnDuctLoss");
+    form.getTextField("ReturnPercentBTULoss").setText("ReturnPercentBTULoss");
+    //Supply Duct System Performance
+    form.getTextField("SupplyDuctLoss").setText("SupplyDuctLoss");
+    form.getTextField("SupplyPercentBTULoss").setText("SupplyPercentBTULoss");
+    //System Performance
+    form.getTextField("SystemDeliveredBTU").setText("SystemDeliveredBTU");
+    form
+      .getTextField("SystemMeasuredEfficiency")
+      .setText("SystemMeasuredEfficiency");
+    //PAGE 4
+    //Registers and Grilles
+    //Supply Registers
+    form
+      .getTextField("SupplyAirflow1Location")
+      .setText("SupplyAirflow1Location");
+    form
+      .getTextField("SupplyAirflow2Location")
+      .setText("SupplyAirflow2Location");
+    form
+      .getTextField("SupplyAirflow3Location")
+      .setText("SupplyAirflow3Location");
+    form
+      .getTextField("SupplyAirflow4Location")
+      .setText("SupplyAirflow4Location");
+    form
+      .getTextField("SupplyAirflow5Location")
+      .setText("SupplyAirflow5Location");
+    form
+      .getTextField("SupplyAirflow6Location")
+      .setText("SupplyAirflow6Location");
+    form
+      .getTextField("SupplyAirflow7Location")
+      .setText("SupplyAirflow7Location");
+    form
+      .getTextField("SupplyAirflow8Location")
+      .setText("SupplyAirflow8Location");
+    form
+      .getTextField("SupplyAirflow9Location")
+      .setText("SupplyAirflow9Location");
+    form
+      .getTextField("SupplyAirflow10Location")
+      .setText("SupplyAirflow10Location");
+    form
+      .getTextField("SupplyAirflow11Location")
+      .setText("SupplyAirflow11Location");
+    form
+      .getTextField("SupplyAirflow12Location")
+      .setText("SupplyAirflow12Location");
+    form
+      .getTextField("SupplyAirflow13Location")
+      .setText("SupplyAirflow13Location");
+    form
+      .getTextField("SupplyAirflow14Location")
+      .setText("SupplyAirflow14Location");
+    form
+      .getTextField("SupplyAirflow15Location")
+      .setText("SupplyAirflow15Location");
+    form
+      .getTextField("SupplyAirflow16Location")
+      .setText("SupplyAirflow16Location");
+    form
+      .getTextField("SupplyAirflow17Location")
+      .setText("SupplyAirflow17Location");
+    form
+      .getTextField("SupplyAirflow18Location")
+      .setText("SupplyAirflow18Location");
+    form
+      .getTextField("SupplyAirflow19Location")
+      .setText("SupplyAirflow19Location");
+    form
+      .getTextField("SupplyAirflow20Location")
+      .setText("SupplyAirflow20Location");
+    form
+      .getTextField("SupplyAirflow21Location")
+      .setText("SupplyAirflow21Location");
+    form
+      .getTextField("SupplyAirflow22Location")
+      .setText("SupplyAirflow22Location");
+    form
+      .getTextField("SupplyAirflow23Location")
+      .setText("SupplyAirflow23Location");
+    form
+      .getTextField("SupplyAirflow24Location")
+      .setText("SupplyAirflow24Location");
+    form.getTextField("SupplyAirflow1").setText("SupplyAirflow1");
+    form.getTextField("SupplyAirflow2").setText("SupplyAirflow2");
+    form.getTextField("SupplyAirflow3").setText("SupplyAirflow3");
+    form.getTextField("SupplyAirflow4").setText("SupplyAirflow4");
+    form.getTextField("SupplyAirflow5").setText("SupplyAirflow5");
+    form.getTextField("SupplyAirflow6").setText("SupplyAirflow6");
+    form.getTextField("SupplyAirflow7").setText("SupplyAirflow7");
+    form.getTextField("SupplyAirflow8").setText("SupplyAirflow8");
+    form.getTextField("SupplyAirflow9").setText("SupplyAirflow9");
+    form.getTextField("SupplyAirflow10").setText("SupplyAirflow10");
+    form.getTextField("SupplyAirflow11").setText("SupplyAirflow11");
+    form.getTextField("SupplyAirflow12").setText("SupplyAirflow12");
+    form.getTextField("SupplyAirflow13").setText("SupplyAirflow13");
+    form.getTextField("SupplyAirflow14").setText("SupplyAirflow14");
+    form.getTextField("SupplyAirflow15").setText("SupplyAirflow15");
+    form.getTextField("SupplyAirflow16").setText("SupplyAirflow16");
+    form.getTextField("SupplyAirflow17").setText("SupplyAirflow17");
+    form.getTextField("SupplyAirflow18").setText("SupplyAirflow18");
+    form.getTextField("SupplyAirflow19").setText("SupplyAirflow19");
+    form.getTextField("SupplyAirflow20").setText("SupplyAirflow20");
+    form.getTextField("SupplyAirflow21").setText("SupplyAirflow21");
+    form.getTextField("SupplyAirflow22").setText("SupplyAirflow22");
+    form.getTextField("SupplyAirflow23").setText("SupplyAirflow23");
+    form.getTextField("SupplyAirflow24").setText("SupplyAirflow24");
+    form.getTextField("SupplyAirflowTotal").setText("SupplyAirflowTotal");
+    form.getTextField("SupplyAverageDB").setText("SupplyAverageDB");
+    form
+      .getTextField("ReturnAirflow1Location")
+      .setText("ReturnAirflow1Location");
+    form
+      .getTextField("ReturnAirflow2Location")
+      .setText("ReturnAirflow2Location");
+    form
+      .getTextField("ReturnAirflow3Location")
+      .setText("ReturnAirflow3Location");
+    form
+      .getTextField("ReturnAirflow4Location")
+      .setText("ReturnAirflow4Location");
+    form
+      .getTextField("ReturnAirflow5Location")
+      .setText("ReturnAirflow5Location");
+    form
+      .getTextField("ReturnAirflow6Location")
+      .setText("ReturnAirflow6Location");
+    form
+      .getTextField("ReturnAirflow7Location")
+      .setText("ReturnAirflow7Location");
+    form
+      .getTextField("ReturnAirflow8Location")
+      .setText("ReturnAirflow8Location");
+    form
+      .getTextField("ReturnAirflow9Location")
+      .setText("ReturnAirflow9Location");
+    form
+      .getTextField("ReturnAirflow10Location")
+      .setText("ReturnAirflow10Location");
+    form
+      .getTextField("ReturnAirflow11Location")
+      .setText("ReturnAirflow11Location");
+    form
+      .getTextField("ReturnAirflow12Location")
+      .setText("ReturnAirflow12Location");
+    form
+      .getTextField("ReturnAirflow13Location")
+      .setText("ReturnAirflow13Location");
+    form
+      .getTextField("ReturnAirflow14Location")
+      .setText("ReturnAirflow14Location");
+    form
+      .getTextField("ReturnAirflow15Location")
+      .setText("ReturnAirflow15Location");
+    form
+      .getTextField("ReturnAirflow16Location")
+      .setText("ReturnAirflow16Location");
+    form
+      .getTextField("ReturnAirflow17Location")
+      .setText("ReturnAirflow17Location");
+    form
+      .getTextField("ReturnAirflow18Location")
+      .setText("ReturnAirflow18Location");
+    form
+      .getTextField("ReturnAirflow19Location")
+      .setText("ReturnAirflow19Location");
+    form
+      .getTextField("ReturnAirflow20Location")
+      .setText("ReturnAirflow20Location");
+    form.getTextField("ReturnAirflow1").setText("ReturnAirflow1");
+    form.getTextField("ReturnAirflow2").setText("ReturnAirflow2");
+    form.getTextField("ReturnAirflow3").setText("ReturnAirflow3");
+    form.getTextField("ReturnAirflow4").setText("ReturnAirflow4");
+    form.getTextField("ReturnAirflow5").setText("ReturnAirflow5");
+    form.getTextField("ReturnAirflow6").setText("ReturnAirflow6");
+    form.getTextField("ReturnAirflow7").setText("ReturnAirflow7");
+    form.getTextField("ReturnAirflow8").setText("ReturnAirflow8");
+    form.getTextField("ReturnAirflow9").setText("ReturnAirflow9");
+    form.getTextField("ReturnAirflow10").setText("ReturnAirflow10");
+    form.getTextField("ReturnAirflow11").setText("ReturnAirflow11");
+    form.getTextField("ReturnAirflow12").setText("ReturnAirflow12");
+    form.getTextField("ReturnAirflow13").setText("ReturnAirflow13");
+    form.getTextField("ReturnAirflow14").setText("ReturnAirflow14");
+    form.getTextField("ReturnAirflow15").setText("ReturnAirflow15");
+    form.getTextField("ReturnAirflow16").setText("ReturnAirflow16");
+    form.getTextField("ReturnAirflow17").setText("ReturnAirflow17");
+    form.getTextField("ReturnAirflow18").setText("ReturnAirflow18");
+    form.getTextField("ReturnAirflow19").setText("ReturnAirflow19");
+    form.getTextField("ReturnAirflow20").setText("ReturnAirflow20");
+    form.getTextField("ReturnAirflowTotal").setText("ReturnAirflowTotal");
+    form.getTextField("ReturnAverageDB").setText("ReturnAverageDB");
+    /* air_measurements - this is test values when leaving the user input page.. this needs to grab from acr-connect.data.X
         if (this.nciComfortMaxx) {
             this.project.air_measurements = {
               temperature_entering_dry_bulb: this.active.data.temperature_entering_dry_bulb,
@@ -124,122 +668,7 @@ export async function getReport(payload, _test) {
           }
             */
-        form.getTextField('ReturnTemperatureChange').setText('ReturnTemperatureChange');
-        form.getTextField('AverageSupplyRegisterDB').setText('AverageSupplyRegisterDB');
-        form.getTextField('SupplyTemperatureChange').setText('SupplyTemperatureChange');
-        form.getTextField('TESPEntering').setText('TESPEntering');
-        form.getTextField('TESPExiting').setText('TESPExiting');
-        form.getTextField('TESPValue').setText('TESPValue');
-        form.getTextField('TESPRated').setText('TESPRated');
-        form.getTextField('TESPPercentRated').setText('TESPPercentRated');
-        form.getTextField('AirFilterEntering').setText('AirFilterEntering');
-        form.getTextField('AirFilterExiting').setText('AirFilterExiting');
-        form.getTextField('AirFilterDrop').setText('AirFilterDrop');
-        form.getTextField('AirFilterBudget').setText('AirFilterBudget');
-        form.getTextField('AirFilterPercentBudget').setText('AirFilterPercentBudget');
-        form.getTextField('CoilExiting').setText('CoilExiting');
-        form.getTextField('CoilDrop').setText('CoilDrop');
-        form.getTextField('CoilBudget').setText('CoilBudget');
-        form.getTextField('CoilPercentBudget').setText('CoilPercentBudget');
-        form.getTextField('CoilEntering').setText('CoilEntering');
-        form.getTextField('ReturnBudget').setText('ReturnBudget');
-        form.getTextField('ReturnPercentBudget').setText('ReturnPercentBudget');
-        form.getTextField('ReturnPressure').setText('ReturnPressure');
-        form.getTextField('SupplyBudget').setText('SupplyBudget');
-        form.getTextField('SupplyPercentBudget').setText('SupplyPercentBudget');
-        form.getTextField('SupplyPressure').setText('SupplyPressure');
-        form.getTextField('TestingOrganization').setText('TestingOrganization');
-        form.getTextField('AFUERating').setText('AFUERating');
-        form.getTextField('FuelType').setText('FuelType');
-        form.getTextField('FurnaceType').setText('FurnaceType');
-        form.getTextField('FurnaceManufacturer').setText('FurnaceManufacturer');
-        form.getTextField('FurnaceModel').setText('FurnaceModel');
-        form.getTextField('RatedBTUInput').setText('RatedBTUInput');
-        form.getTextField('RatedBTUOutput').setText('RatedBTUOutput');
-        form.getTextField('FurnaceSerial').setText('FurnaceSerial');
-        form.getTextField('FurnaceYear').setText('FurnaceYear');
-        form.getTextField('AirFilterLocation').setText('AirFilterLocation');
-        form.getTextField('NominalCapacity').setText('NominalCapacity');
-        form.getTextField('EER').setText('EER');
-        form.getTextField('CondenserManufacturer').setText('CondenserManufacturer');
-        form.getTextField('CondenserModel').setText('CondenserModel');
-        form.getTextField('SEER').setText('SEER');
-        form.getTextField('CondenserSerial').setText('CondenserSerial');
-        form.getTextField('CondenserYear').setText('CondenserYear');
-        form.getTextField('FanCondition').setText('FanCondition');
-        form.getTextField('FanRatedStaticPressure').setText('FanRatedStaticPressure');
-        form.getTextField('FanCapacity').setText('FanCapacity');
-        form.getTextField('FanSpeedSetting').setText('FanSpeedSetting');
-        form.getTextField('FanType').setText('FanType');
-        form.getTextField('CoilManufacturer').setText('CoilManufacturer');
-        form.getTextField('CoilModel').setText('CoilModel');
-        form.getTextField('CoilSerial').setText('CoilSerial');
-        form.getTextField('CoilYear').setText('CoilYear');
-        form.getTextField('Title').setText('Title');
-        form.getTextField('Customer').setText('Customer');
-        form.getTextField('Location').setText('Location');
-        form.getTextField('FanAirflowRequired').setText('FanAirflowRequired');
-        form.getTextField('FanAirflowMeasured').setText('FanAirflowMeasured');
-        form.getTextField('FanAirflowPercentRequired').setText('FanAirflowPercentRequired');
-        form.getTextField('ReturnAirflowTotal').setText('ReturnAirflowTotal');
-        form.getTextField('ReturnAirflowMeasured').setText('ReturnAirflowMeasured');
-        form.getTextField('ReturnDuctLeakage').setText('ReturnDuctLeakage');
-        form.getTextField('ReturnPercentLeakage').setText('ReturnPercentLeakage');
-        form.getTextField('SupplyAirflowMeasured').setText('SupplyAirflowMeasured');
-        form.getTextField('SupplyDuctLeakage').setText('SupplyDuctLeakage');
-        form.getTextField('SupplyPercentLeakage').setText('SupplyPercentLeakage');
-        form.getTextField('EquipmentRatedBTU').setText('EquipmentRatedBTU');
-        form.getTextField('EquipmentDeliveredBTU').setText('EquipmentDeliveredBTU');
-        form.getTextField('EquipmentMeasuredEfficiency').setText('EquipmentMeasuredEfficiency');
-        form.getTextField('ReturnDuctLoss').setText('ReturnDuctLoss');
-        form.getTextField('ReturnPercentBTULoss').setText('ReturnPercentBTULoss');
-        form.getTextField('SupplyDuctLoss').setText('SupplyDuctLoss');
-        form.getTextField('SupplyPercentBTULoss').setText('SupplyPercentBTULoss');
-        form.getTextField('SystemDeliveredBTU').setText('SystemDeliveredBTU');
-        form.getTextField('SystemMeasuredEfficiency').setText('SystemMeasuredEfficiency');
-        form.getTextField('ReturnAirflow1Location').setText('ReturnAirflow1Location');
-        form.getTextField('ReturnAirflow2Location').setText('ReturnAirflow2Location');
-        form.getTextField('ReturnAirflow3Location').setText('ReturnAirflow3Location');
-        form.getTextField('ReturnAirflow4Location').setText('ReturnAirflow4Location');
-        form.getTextField('ReturnAirflow5Location').setText('ReturnAirflow5Location');
-        form.getTextField('ReturnAirflow6Location').setText('ReturnAirflow6Location');
-        form.getTextField('ReturnAirflow7Location').setText('ReturnAirflow7Location');
-        form.getTextField('ReturnAirflow8Location').setText('ReturnAirflow8Location');
-        form.getTextField('ReturnAirflow9Location').setText('ReturnAirflow9Location');
-        form.getTextField('ReturnAirflow10Location').setText('ReturnAirflow10Location');
-        form.getTextField('ReturnAirflow11Location').setText('ReturnAirflow11Location');
-        form.getTextField('ReturnAirflow12Location').setText('ReturnAirflow12Location');
-        form.getTextField('ReturnAirflow13Location').setText('ReturnAirflow13Location');
-        form.getTextField('ReturnAirflow14Location').setText('ReturnAirflow14Location');
-        form.getTextField('ReturnAirflow15Location').setText('ReturnAirflow15Location');
-        form.getTextField('ReturnAirflow16Location').setText('ReturnAirflow16Location');
-        form.getTextField('ReturnAirflow17Location').setText('ReturnAirflow17Location');
-        form.getTextField('ReturnAirflow18Location').setText('ReturnAirflow18Location');
-        form.getTextField('ReturnAirflow19Location').setText('ReturnAirflow19Location');
-        form.getTextField('ReturnAirflow20Location').setText('ReturnAirflow20Location');
-        form.getTextField('ReturnAirflow1').setText('ReturnAirflow1');
-        form.getTextField('ReturnAirflow2').setText('ReturnAirflow2');
-        form.getTextField('ReturnAirflow3').setText('ReturnAirflow3');
-        form.getTextField('ReturnAirflow4').setText('ReturnAirflow4');
-        form.getTextField('ReturnAirflow5').setText('ReturnAirflow5');
-        form.getTextField('ReturnAirflow6').setText('ReturnAirflow6');
-        form.getTextField('ReturnAirflow7').setText('ReturnAirflow7');
-        form.getTextField('ReturnAirflow8').setText('ReturnAirflow8');
-        form.getTextField('ReturnAirflow9').setText('ReturnAirflow9');
-        form.getTextField('ReturnAirflow10').setText('ReturnAirflow10');
-        form.getTextField('ReturnAirflow11').setText('ReturnAirflow11');
-        form.getTextField('ReturnAirflow12').setText('ReturnAirflow12');
-        form.getTextField('ReturnAirflow13').setText('ReturnAirflow13');
-        form.getTextField('ReturnAirflow14').setText('ReturnAirflow14');
-        form.getTextField('ReturnAirflow15').setText('ReturnAirflow15');
-        form.getTextField('ReturnAirflow16').setText('ReturnAirflow16');
-        form.getTextField('ReturnAirflow17').setText('ReturnAirflow17');
-        form.getTextField('ReturnAirflow18').setText('ReturnAirflow18');
-        form.getTextField('ReturnAirflow19').setText('ReturnAirflow19');
-        form.getTextField('ReturnAirflow20').setText('ReturnAirflow20');
-        /*
+    /*
         //Setup fields
         let filter_pressure_drop = 1,
             return_pressure_drop = 2,
@@ -645,20 +1074,31 @@ export async function getReport(payload, _test) {
         }
         /******** PHOTOS (X PAGES) *********/
-        try {
-            let selectedPhotosReport = payload.meta.origin === 'virtuoso' ? photosReportS3 : photosReport;
-            let photosReportBase64 = (payload.meta.pdf_settings.includePhotos && payload.meta.photo_count > 0) ? await selectedPhotosReport.getReport(payload) : false;
-            const photosReportDoc = photosReportBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(photosReportBase64.data)) : false;
-            for (let i = 0; (photosReportDoc && i < photosReportDoc.getPages().length); i++) {
-            const [_photosReport] = await pdfDoc.copyPages(photosReportDoc, [i]);
-            pdfDoc.insertPage(pdfDoc.getPages().length, _photosReport);
-            }
-        } catch (error) {
-            errors.push(`Photos: ${error}`);
-        }
+    try {
+      let selectedPhotosReport =
+        payload.meta.origin === "virtuoso" ? photosReportS3 : photosReport;
+      let photosReportBase64 =
+        payload.meta.pdf_settings.includePhotos && payload.meta.photo_count > 0
+          ? await selectedPhotosReport.getReport(payload)
+          : false;
+      const photosReportDoc = photosReportBase64
+        ? await PDFDocument.load(
+            util._base64ToArrayBuffer(photosReportBase64.data)
+          )
+        : false;
+      for (
+        let i = 0;
+        photosReportDoc && i < photosReportDoc.getPages().length;
+        i++
+      ) {
+        const [_photosReport] = await pdfDoc.copyPages(photosReportDoc, [i]);
+        pdfDoc.insertPage(pdfDoc.getPages().length, _photosReport);
+      }
+    } catch (error) {
+      errors.push(`Photos: ${error}`);
+    }
-        /*
+    /*
         form.getTextField('Name').setText(`${payload.cName}`);
         form.getTextField('Address 1').setText(`${payload.address}`);
         form.getTextField('Address 2').setText(`${payload.address2}`);
@@ -702,28 +1142,65 @@ export async function getReport(payload, _test) {
             }
         }
         */
-        // flatten and return as base64
-        form.flatten();
-        return { status: 200, data: await pdfDoc.saveAsBase64({ dataUri: true }) };
-    } catch (error) {
-        console.log('error message',error.message);
-        console.log('error stack',error.stack);
-        return { status: 400, data: error };
-    }
+    // flatten and return as base64
+    form.flatten();
+    return { status: 200, data: await pdfDoc.saveAsBase64({ dataUri: true }) };
+  } catch (error) {
+    console.log("error message", error.message);
+    console.log("error stack", error.stack);
+    return { status: 400, data: error };
+  }
+}
+function getTESPPointsUsed(type) {
+  if (type === "Package Draw Through") {
+    return { entering: "2", exiting: "4" }; // testPoint2 + testPoint4
+  } else if (type === "Package Blow Through") {
+    return { entering: "2", exiting: "4" }; // testPoint2 + testPoint4
+  } else if (type === "AHU Draw Through") {
+    return { entering: "2", exiting: "4" }; // testPoint2 + testPoint4
+  } else if (type === "AHU Blow Through") {
+    return { entering: "2", exiting: "4" }; // testPoint4 + testPoint2
+  } else if (type === "Split/Furnace") {
+    return { entering: "2", exiting: "3" }; // testPoint2 + testPoint3
+  }
+  return { entering: "", exiting: "" }; // fallback
 }
 function getTextFields(payload) {
-    return {
-        "cName": payload.site.customer.first_name && payload.site.customer.last_name ? `${payload.site.customer.first_name} ${payload.site.customer.last_name}` : "",
-        "address": payload.site.location.address ? payload.site.location.address : "",
-        "address2": payload.site.location.address2 ? payload.site.location.address2 : "",
-        "city": payload.site.location.city ? payload.site.location.city : "",
-        "state": payload.site.location.state ? `, ${payload.site.location.state}` : "",
-        "zip": payload.site.location.zip ? ` ${payload.site.location.zip}` : "",
-    }
+  return {
+    cName:
+      payload.site.customer.first_name && payload.site.customer.last_name
+        ? `${payload.site.customer.first_name} ${payload.site.customer.last_name}`
+        : "",
+    address: payload.site.location.address || "",
+    address2: payload.site.location.address2 || "",
+    city: payload.site.location.city || "",
+    state: payload.site.location.state || "",
+    zip: payload.site.location.zip || "",
+  };
+}
+function getFanType(type) {
+  switch (type) {
+    case "PSC":
+      return "PSC";
+    case "ECM":
+      return "Variable Speed ECM";
+    case "X13":
+      return "Constant Torque ECM";
+    case "Three Phase":
+      return "Three Phase";
+  }
+  return "N/A";
 }
-function getPassFailText(type){
-    return type === -1 ? 'LOW' : type === 0 ? 'PASS' : type === 1 ? 'HIGH' : '';
-}
+function capitalizeFirstLetter(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}
+function getPassFailText(type) {
+  return type === -1 ? "LOW" : type === 0 ? "PASS" : type === 1 ? "HIGH" : "";
+}

package/report-gen-scripts/nci-report-customer.js CHANGED Viewed

@@ -273,15 +273,15 @@ export async function getReport(payload, _test) {
     let gauge = gauge10;
     if (tesp_pct <= 100) gauge = gauge100;
-    else if (tesp_pct <= 150) gauge = gauge90;
-    else if (tesp_pct <= 200) gauge = gauge80;
-    else if (tesp_pct <= 250) gauge = gauge70;
-    else if (tesp_pct <= 300) gauge = gauge60;
-    else if (tesp_pct <= 350) gauge = gauge50;
-    else if (tesp_pct <= 400) gauge = gauge40;
-    else if (tesp_pct <= 450) gauge = gauge30;
-    else if (tesp_pct <= 500) gauge = gauge20;
-    else if (tesp_pct > 500) gauge = gauge10;
+    else if (tesp_pct <= 108) gauge = gauge90;
+    else if (tesp_pct <= 116) gauge = gauge80;
+    else if (tesp_pct <= 124) gauge = gauge70;
+    else if (tesp_pct <= 132) gauge = gauge60;
+    else if (tesp_pct <= 140) gauge = gauge50;
+    else if (tesp_pct <= 200) gauge = gauge40;
+    else if (tesp_pct <= 250) gauge = gauge30;
+    else if (tesp_pct <= 300) gauge = gauge20;
+    else if (tesp_pct > 300) gauge = gauge10;
     form.getButton("TESPGauge").setImage(gauge);
     form
@@ -453,15 +453,15 @@ export async function getReport(payload, _test) {
     let gauge2 = gauge10;
     if (filter_pct <= 100) gauge2 = gauge100;
-    else if (filter_pct <= 150) gauge2 = gauge90;
-    else if (filter_pct <= 200) gauge2 = gauge80;
-    else if (filter_pct <= 250) gauge2 = gauge70;
-    else if (filter_pct <= 300) gauge2 = gauge60;
-    else if (filter_pct <= 350) gauge2 = gauge50;
-    else if (filter_pct <= 400) gauge2 = gauge40;
-    else if (filter_pct <= 450) gauge2 = gauge30;
-    else if (filter_pct <= 500) gauge2 = gauge20;
-    else if (filter_pct > 500) gauge2 = gauge10;
+    else if (filter_pct <= 108) gauge2 = gauge90;
+    else if (filter_pct <= 116) gauge2 = gauge80;
+    else if (filter_pct <= 124) gauge2 = gauge70;
+    else if (filter_pct <= 132) gauge2 = gauge60;
+    else if (filter_pct <= 140) gauge2 = gauge50;
+    else if (filter_pct <= 200) gauge2 = gauge40;
+    else if (filter_pct <= 250) gauge2 = gauge30;
+    else if (filter_pct <= 300) gauge2 = gauge20;
+    else if (filter_pct > 300) gauge2 = gauge10;
     form.getButton("AirFilterGauge").setImage(gauge2);
     form
@@ -506,15 +506,15 @@ export async function getReport(payload, _test) {
     let gauge3 = gauge10;
     if (supply_pct <= 100) gauge3 = gauge100;
-    else if (supply_pct <= 150) gauge3 = gauge90;
-    else if (supply_pct <= 200) gauge3 = gauge80;
-    else if (supply_pct <= 250) gauge3 = gauge70;
-    else if (supply_pct <= 300) gauge3 = gauge60;
-    else if (supply_pct <= 350) gauge3 = gauge50;
-    else if (supply_pct <= 400) gauge3 = gauge40;
-    else if (supply_pct <= 450) gauge3 = gauge30;
-    else if (supply_pct <= 500) gauge3 = gauge20;
-    else if (supply_pct > 500) gauge3 = gauge10;
+    else if (supply_pct <= 108) gauge3 = gauge90;
+    else if (supply_pct <= 116) gauge3 = gauge80;
+    else if (supply_pct <= 124) gauge3 = gauge70;
+    else if (supply_pct <= 132) gauge3 = gauge60;
+    else if (supply_pct <= 140) gauge3 = gauge50;
+    else if (supply_pct <= 200) gauge3 = gauge40;
+    else if (supply_pct <= 250) gauge3 = gauge30;
+    else if (supply_pct <= 300) gauge3 = gauge20;
+    else if (supply_pct > 300) gauge3 = gauge10;
     form.getButton("SupplyGauge").setImage(gauge3);
     form
@@ -558,15 +558,15 @@ export async function getReport(payload, _test) {
     let gauge4 = gauge10;
     if (return_pct <= 100) gauge4 = gauge100;
-    else if (return_pct <= 150) gauge4 = gauge90;
-    else if (return_pct <= 200) gauge4 = gauge80;
-    else if (return_pct <= 250) gauge4 = gauge70;
-    else if (return_pct <= 300) gauge4 = gauge60;
-    else if (return_pct <= 350) gauge4 = gauge50;
-    else if (return_pct <= 400) gauge4 = gauge40;
-    else if (return_pct <= 450) gauge4 = gauge30;
-    else if (return_pct <= 500) gauge4 = gauge20;
-    else if (return_pct > 500) gauge4 = gauge10;
+    else if (return_pct <= 108) gauge4 = gauge90;
+    else if (return_pct <= 116) gauge4 = gauge80;
+    else if (return_pct <= 124) gauge4 = gauge70;
+    else if (return_pct <= 132) gauge4 = gauge60;
+    else if (return_pct <= 140) gauge4 = gauge50;
+    else if (return_pct <= 200) gauge4 = gauge40;
+    else if (return_pct <= 250) gauge4 = gauge30;
+    else if (return_pct <= 300) gauge4 = gauge20;
+    else if (return_pct > 300) gauge4 = gauge10;
     form.getButton("ReturnGauge").setImage(gauge4);
     form
@@ -1077,18 +1077,18 @@ export async function getReport(payload, _test) {
 function getTESPPointsUsed(type) {
   if (type === "Package Draw Through") {
-    return { entering: "2", exiting: "4" };
+    return { entering: "2", exiting: "4" }; // testPoint2 + testPoint4
   } else if (type === "Package Blow Through") {
-    return { entering: "2", exiting: "4" };
+    return { entering: "2", exiting: "4" }; // testPoint2 + testPoint4
   } else if (type === "AHU Draw Through") {
-    return { entering: "1", exiting: "4" };
+    return { entering: "2", exiting: "4" }; // testPoint2 + testPoint4
   } else if (type === "AHU Blow Through") {
-    return { entering: "1", exiting: "4" };
+    return { entering: "2", exiting: "4" }; // testPoint4 + testPoint2
   } else if (type === "Split/Furnace") {
-    return { entering: "2", exiting: "3" };
+    return { entering: "2", exiting: "3" }; // testPoint2 + testPoint3
   }
-  return { entering: "", exiting: "" }; // fallback if system type is unrecognized
+  return { entering: "", exiting: "" }; // fallback
 }
 function getTextFields(payload) {