@measurequick/measurequick-report-generator 1.5.198 → 1.5.200

package/package.json

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

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

@@ -245,21 +245,6 @@ export async function getReport(payload) {
         formPg1.getButton("HalfWidthLogo").setImage(mqLogoPg1);
         formPg2.getButton("HalfWidthLogo").setImage(mqLogoPg2);
       }
-      if (
-        payload.meta.profile_settings.techFirstName ||
-        payload.meta.profile_settings.techLastName
-      ) {
-        formPg1
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
-        formPg2
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
-      }
     }
 
     // print company logo and profile picture
@@ -268,41 +253,11 @@ export async function getReport(payload) {
       formPg1.getButton("HalfWidthLogo").setImage(companyImagePg1);
       formPg2.getButton("ProfilePicture").setImage(profileImagePg2);
       formPg2.getButton("HalfWidthLogo").setImage(companyImagePg2);
-      if (
-        payload.meta.profile_settings.techFirstName ||
-        payload.meta.profile_settings.techLastName
-      ) {
-        formPg1
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
-        formPg2
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
-      }
     } else if (!isNCI && profileImagePg1) {
       formPg1.getButton("ProfilePicture").setImage(profileImagePg1);
       formPg1.getButton("HalfWidthLogo").setImage(mqLogoPg1);
       formPg2.getButton("ProfilePicture").setImage(profileImagePg2);
       formPg2.getButton("HalfWidthLogo").setImage(mqLogoPg2);
-      if (
-        payload.meta.profile_settings.techFirstName ||
-        payload.meta.profile_settings.techLastName
-      ) {
-        formPg1
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
-        formPg2
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
-      }
     } else if (!isNCI) {
       if (companyImagePg1) {
         formPg1.getButton("FullWidthLogo").setImage(companyImagePg1);
@@ -313,6 +268,13 @@ export async function getReport(payload) {
       }
     }
 
+    // Set tech name using helper function
+    const techName = util.getTechName(payload);
+    if (techName) {
+      formPg1.getTextField("TechName").setText(techName);
+      formPg2.getTextField("TechName").setText(techName);
+    }
+
     for (let t = 0; t < payload.tests.length; t++) {
       let section = t == 0 ? "test_in" : "test_out";
       let sectionLabel = t == 0 ? "Test In " : "Test Out ";

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

@@ -159,15 +159,6 @@ export async function getReport(payload, _test) {
       } else {
         form.getButton("HalfWidthLogo").setImage(mqLogo);
       }
-      if (
-        payload.meta.profile_settings.techFirstName ||
-        payload.meta.profile_settings.techLastName
-      )
-        form
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
     }
 
     // print company logo and profile picture
@@ -175,34 +166,22 @@ export async function getReport(payload, _test) {
       // both images are embedded in the document
       form.getButton("ProfilePicture").setImage(profileImage);
       form.getButton("HalfWidthLogo").setImage(companyImage);
-      if (
-        payload.meta.profile_settings.techFirstName ||
-        payload.meta.profile_settings.techLastName
-      )
-        form
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
     } else if (!isNCI && profileImage) {
       // no company logo is embedded in the document
       form.getButton("ProfilePicture").setImage(profileImage);
       form.getButton("HalfWidthLogo").setImage(mqLogo);
-      if (
-        payload.meta.profile_settings.techFirstName ||
-        payload.meta.profile_settings.techLastName
-      )
-        form
-          .getTextField("TechName")
-          .setText(
-            `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-          );
     } else if (!isNCI) {
       // no profile picture is embedded in the document
       if (companyImage) form.getButton("FullWidthLogo").setImage(companyImage);
       else form.getButton("FullWidthLogo").setImage(mqLogo);
     }
 
+    // Set tech name using helper function
+    const techName = util.getTechName(payload);
+    if (techName) {
+      form.getTextField("TechName").setText(techName);
+    }
+
     // print customer data
     let dateTimePlacement = "Upper";
     let e = "";

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

@@ -125,32 +125,26 @@ export async function getReport(payload, _test) {
       } else {
         form.getButton("HalfWidthLogo").setImage(mqLogo);
       }
-      if (payload.meta.profile_settings.techFirstName || payload.meta.profile_settings.techLastName)
-        form.getTextField("TechName").setText(
-          `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-        );
     }
 
     // print company logo and profile picture
     if (!isNCI && profileImage && companyImage) {
       form.getButton("ProfilePicture").setImage(profileImage);
       form.getButton("HalfWidthLogo").setImage(companyImage);
-      if (payload.meta.profile_settings.techFirstName || payload.meta.profile_settings.techLastName)
-        form.getTextField("TechName").setText(
-          `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-        );
     } else if (!isNCI && profileImage) {
       form.getButton("ProfilePicture").setImage(profileImage);
       form.getButton("HalfWidthLogo").setImage(mqLogo);
-      if (payload.meta.profile_settings.techFirstName || payload.meta.profile_settings.techLastName)
-        form.getTextField("TechName").setText(
-          `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
-        );
     } else if (!isNCI) {
       if (companyImage) form.getButton("FullWidthLogo").setImage(companyImage);
       else form.getButton("FullWidthLogo").setImage(mqLogo);
     }
 
+    // Set tech name using helper function
+    const techName = util.getTechName(payload);
+    if (techName) {
+      form.getTextField("TechName").setText(techName);
+    }
+
     // print customer data
     let date = new Date();
     if (textFields.cName && textFields.address && textFields.city && textFields.state && textFields.zip) {
@@ -229,55 +223,103 @@ export async function getReport(payload, _test) {
 
     form.getTextField("YourSystemScorePage2").setText(`${systemScorePercentage} ${systemScoreGrade}`);
 
-    // Print targets and range icons (using appropriate values for heat pump heating)
-    // Only show range icons for measurements that exist
-    // Map field names to textFields values and check if they exist
-    const measureChecks = [
-      { label: "Superheat", value: textFields.tempRise },      // Temperature Rise
-      { label: "Subcooling", value: textFields.approach, ref: "temperature_difference_condenser" },  // Approach
-      { label: "Condenser", value: textFields.cop },           // COP/Efficiency
-      { label: "TempSplit", value: textFields.oat },           // Outdoor Air Temp
-      { label: "Tesp", value: textFields.tesp },               // Total External Static Pressure
-      { label: "FilterFace", value: textFields.airflow }       // Airflow
-    ];
-
-    for (let i = 0; i < measureChecks.length; i++) {
-      const { label, value, ref } = measureChecks[i];
-      // Only show range indicator if value exists (is not "--")
-      if (value && value !== "--") {
-        let icon = iconRangeGreen;
-        let iconPlacement = "Mid";
-
-        // Check if we have target zone data for this measurement
-        if (ref && t.targets && t.targets[ref] !== undefined) {
-          const target = parseFloat(t.targets[ref]);
-          const idealLow = t.targets[`${ref}_ideal_low`] ? parseFloat(t.targets[`${ref}_ideal_low`]) : 0;
-          const idealHigh = t.targets[`${ref}_ideal_high`] ? parseFloat(t.targets[`${ref}_ideal_high`]) : 0;
-          const actual = parseFloat(value);
-          const low = target - idealLow;
-          const high = target + idealHigh;
-
-          if (actual < low) {
-            icon = iconRangeRed;
-            iconPlacement = "Low";
-          } else if (actual > high) {
-            icon = iconRangeRed;
-            iconPlacement = "High";
+    // Print targets and range icons for heat pump heating
+    // Heat pump heating target zones - some are in data, some in targets
+    const measureLabels = ["Superheat", "Subcooling", "Condenser", "TempSplit", "Tesp", "FilterFace"];
+
+    for (let i = 0; i < measureLabels.length; i++) {
+      const label = measureLabels[i];
+      let targetZone = "";
+      let icon = iconRangeGreen;
+      let iconPlacement = "Mid";
+      let value = "";
+      let mid, low, high;
+
+      if (label === "Superheat") {
+        // Temperature Rise - no specific target zone for HP heating, show measured value
+        value = textFields.tempRise;
+        // HP heating doesn't have fixed temp rise targets like gas heating
+      } else if (label === "Subcooling") {
+        // Approach - LLT minus entering dry bulb
+        value = textFields.approach;
+        // Check for approach targets in targets object
+        if (t.targets && t.targets.approach !== undefined) {
+          mid = parseFloat(t.targets.approach);
+          const idealLow = t.targets.approach_ideal_low !== undefined ? parseFloat(t.targets.approach_ideal_low) : 3;
+          const idealHigh = t.targets.approach_ideal_high !== undefined ? parseFloat(t.targets.approach_ideal_high) : 3;
+          low = mid - idealLow;
+          high = mid + idealHigh;
+          if (!isNaN(low) && !isNaN(high)) {
+            targetZone = `(${low.toFixed(1)} - ${high.toFixed(1)})`;
           }
         }
+      } else if (label === "Condenser") {
+        // COP - target is in data.hp_heating_cop_target
+        value = textFields.cop;
+        if (t.data && t.data.hp_heating_cop_target !== undefined) {
+          mid = parseFloat(t.data.hp_heating_cop_target);
+          // COP ideal range is typically ±0.3
+          low = mid - 0.3;
+          high = mid + 0.3;
+          if (!isNaN(low) && !isNaN(high)) {
+            targetZone = `(${low.toFixed(2)} - ${high.toFixed(2)})`;
+          }
+        }
+      } else if (label === "TempSplit") {
+        // Outdoor Air Temp - no target zone, just informational
+        value = textFields.oat;
+      } else if (label === "Tesp") {
+        // Total External Static Pressure
+        value = textFields.tesp;
+        if (t.targets && t.targets.pressure_static_total_external !== undefined) {
+          mid = parseFloat(t.targets.pressure_static_total_external);
+          high = mid * 1.4;
+          if (!isNaN(high)) {
+            targetZone = `(< ${high.toFixed(2)})`;
+          }
+        }
+      } else if (label === "FilterFace") {
+        // Airflow - no specific target zone
+        value = textFields.airflow;
+      }
 
-        try {
-          form.getButton(`Image${label}${iconPlacement}_af_image`).setImage(icon);
-        } catch (e) {
-          // Field may not exist
+      // Determine range indicator position if we have target values
+      if (value && value !== "--" && mid !== undefined) {
+        const actual = parseFloat(value);
+        if (!isNaN(actual)) {
+          if (label === "Tesp") {
+            // TESP: only check if above threshold
+            if (actual > high) {
+              icon = iconRangeRed;
+              iconPlacement = "High";
+            }
+          } else if (low !== undefined && high !== undefined) {
+            if (actual < low) {
+              icon = iconRangeRed;
+              iconPlacement = "Low";
+            } else if (actual > high) {
+              icon = iconRangeRed;
+              iconPlacement = "High";
+            }
+          }
         }
       }
-      // Clear target zone text for heat pump heating (different targets apply)
+
+      // Set target zone text
       try {
-        form.getTextField(`${label}Target`).setText("");
+        form.getTextField(`${label}Target`).setText(targetZone);
       } catch (e) {
         // Field may not exist
       }
+
+      // Set range indicator icon if value exists
+      if (value && value !== "--") {
+        try {
+          form.getButton(`Image${label}${iconPlacement}_af_image`).setImage(icon);
+        } catch (e) {
+          // Field may not exist
+        }
+      }
     }
 
     // Skip pass/fail subsystem review for heat pump heating
@@ -327,11 +369,13 @@ function getTextFields(payload, test) {
     zip: payload.site.location.zip ? ` ${payload.site.location.zip}` : "",
     // Heat pump heating specific fields
     tempRise: tempRise,
-    approach: test.data.temperature_difference_condenser !== undefined ? (+test.data.temperature_difference_condenser).toFixed(1) : "--",
+    approach: (test.data.temperature_liquid_line !== undefined && test.data.temperature_entering_dry_bulb !== undefined)
+              ? (test.data.temperature_liquid_line - test.data.temperature_entering_dry_bulb).toFixed(1)
+              : (test.data.temperature_difference_condenser !== undefined ? (+test.data.temperature_difference_condenser).toFixed(1) : "--"),
     cop: test.data.cop !== undefined ? (+test.data.cop).toFixed(2) : "--",
     oat: test.data.temperature_outdoor_dry_bulb !== undefined ? (+test.data.temperature_outdoor_dry_bulb).toFixed(1) : "--",
     tesp: test.data.pressure_static_total_external !== undefined ? (+test.data.pressure_static_total_external).toFixed(2) : "--",
-    airflow: test.data.airflow !== undefined ? (+test.data.airflow).toFixed(0) :
+    airflow: (test.data.airflow !== undefined && test.data.airflow !== null && +test.data.airflow > 0) ? (+test.data.airflow).toFixed(0) :
              (test.data.airflow_estimated !== undefined ? (+test.data.airflow_estimated).toFixed(0) : "--"),
     // Heat pump heating scoring factors (points earned, not losses)
     ptsFilter: test.data.hp_heating_pts_filter !== undefined ? (+test.data.hp_heating_pts_filter).toFixed(0) : "--",

package/util.js

@@ -1110,3 +1110,18 @@ export function getAiNotes(payload) {
   }
   return null;
 }
+
+export function getTechName(payload) {
+  // Check technician_name first (used by cover page)
+  if (payload.meta && payload.meta.technician_name) {
+    return payload.meta.technician_name;
+  }
+  // Fall back to profile_settings techFirstName/techLastName
+  if (payload.meta && payload.meta.profile_settings) {
+    const firstName = payload.meta.profile_settings.techFirstName || "";
+    const lastName = payload.meta.profile_settings.techLastName || "";
+    const fullName = `${firstName} ${lastName}`.trim();
+    if (fullName) return fullName;
+  }
+  return null;
+}