@measurequick/measurequick-report-generator 1.5.183 → 1.5.184

package/package.json

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

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

@@ -11,6 +11,7 @@ import * as systemInfoPage from "./system-info-page.js";
 import * as vitalsCoolingReport from "./vitals-cooling-report.js";
 import * as vitalsHeatingReport from "./vitals-heating-report.js";
 import * as vitalsHeatingReportNoCombustion from "./vitals-heating-report-no-combustion.js";
+import * as vitalsHeatpumpHeatingReport from "./vitals-heatpump-heating-report.js";
 import * as nciReport from "./nci-report.js";
 import * as energyStarCertificate from "./energy-star-certificate.js";
 import * as accaCertificate from "./acca-certificate.js";
@@ -19,6 +20,31 @@ import * as util from "../util.js";
 let docs = [];
 let forms = [];
 
+// Helper to check if a test is heat pump heating mode
+function isHeatPumpHeating(test) {
+  if (!test || !test.testInfo) return false;
+  const mode = test.testInfo.mode;
+  const hasHpScore = test.testInfo.data && test.testInfo.data.hp_heating_vitals_score != null;
+  return mode === "Heat Pump" || mode === "nist-efficiency-hp" || hasHpScore;
+}
+
+// Helper to get the appropriate vitals report for a test
+async function getVitalsReport(payload, test, reportMode) {
+  // Check for heat pump heating first
+  if (isHeatPumpHeating(test)) {
+    return await vitalsHeatpumpHeatingReport.getReport(payload, test);
+  }
+  // Cooling mode
+  if (reportMode === "cooling") {
+    return await vitalsCoolingReport.getReport(payload, test);
+  }
+  // Heating mode (gas furnace)
+  if (test && test.gasHeatingHasCombustionAnalyzer === false) {
+    return await vitalsHeatingReportNoCombustion.getReport(payload, test);
+  }
+  return await vitalsHeatingReport.getReport(payload, test);
+}
+
 export async function getReport(payload) {
   const coreDoc = await PDFDocument.create();
 
@@ -146,13 +172,8 @@ export async function getReport(payload) {
         payload.tests[0].testInfo &&
         payload.tests[0].testInfo.mode !== "efficiency-nist"
       ) {
-        payload.meta.header = "Test In A/C Vitals";
-        let vitalsReportBase64 =
-          payload.meta.report_mode == "cooling"
-            ? await vitalsCoolingReport.getReport(payload)
-            : payload.tests[0].gasHeatingHasCombustionAnalyzer === false
-              ? await vitalsHeatingReportNoCombustion.getReport(payload)
-              : await vitalsHeatingReport.getReport(payload);
+        payload.meta.header = isHeatPumpHeating(payload.tests[0]) ? "Heat Pump Heating Vitals" : "Test In A/C Vitals";
+        let vitalsReportBase64 = await getVitalsReport(payload, payload.tests[0], payload.meta.report_mode);
         const vitalsReportDoc = await PDFDocument.load(
           util._base64ToArrayBuffer(vitalsReportBase64.data)
         );
@@ -225,16 +246,8 @@ export async function getReport(payload) {
         payload.tests[1].testInfo &&
         payload.tests[1].testInfo.mode !== "efficiency-nist"
       ) {
-        payload.meta.header = "Test Out A/C Vitals";
-        let vitalsReportBase64 =
-          payload.meta.report_mode == "cooling"
-            ? await vitalsCoolingReport.getReport(payload, payload.tests[1])
-            : payload.tests[1].gasHeatingHasCombustionAnalyzer === false
-              ? await vitalsHeatingReportNoCombustion.getReport(
-                  payload,
-                  payload.tests[1]
-                )
-              : await vitalsHeatingReport.getReport(payload, payload.tests[1]);
+        payload.meta.header = isHeatPumpHeating(payload.tests[1]) ? "Heat Pump Heating Vitals" : "Test Out A/C Vitals";
+        let vitalsReportBase64 = await getVitalsReport(payload, payload.tests[1], payload.meta.report_mode);
         const vitalsReportDoc = await PDFDocument.load(
           util._base64ToArrayBuffer(vitalsReportBase64.data)
         );