@measurequick/measurequick-report-generator 1.5.198 → 1.5.199

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@measurequick/measurequick-report-generator",
-  "version": "1.5.198",
+  "version": "1.5.199",
   "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) {
@@ -327,11 +321,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;
+}