@measurequick/measurequick-report-generator 1.5.2 → 1.5.4

package/package.json

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

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

@@ -115,15 +115,16 @@ export async function getReport(payload, _test) {
             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}`);
         }
+        
+
+        let textFields = getTextFields(payload);
 
         let date = test.datetime ? test.datetime : new Date();
-        if (payload.cName&&payload.address&&payload.city&&payload.state&&payload.zip){
-            form.getTextField('Name').setText(`${payload.cName}`);
-            form.getTextField('Address 1').setText(`${payload.address}`);
-            form.getTextField('Address 2').setText(`${payload.address2}`);
-            form.getTextField('City State Zip').setText(`${payload.city}, ${payload.state} ${payload.zip}`);
-            form.getTextField('Date of Service').setText(`${payload.address}`);
-            form.getTextField('Time of Service').setText(`${payload.address}`);
+        if (textFields.cName && textFields.address && textFields.city && textFields.state && textFields.zip) {
+            form.getTextField('Name').setText(`${textFields.cName}`);
+            form.getTextField('Address 1').setText(`${textFields.address}`);
+            form.getTextField('Address 2').setText(`${textFields.address2}`);
+            form.getTextField('City State Zip').setText(`${textFields.city}, ${textFields.state} ${textFields.zip}`);
             form.getTextField('DateOfServiceLabelUpper').setText("");
             form.getTextField('TimeOfServiceLabelUpper').setText("");
             form.getTextField('DateOfServiceLabelLower').setText("Date of Service:");
@@ -362,4 +363,15 @@ export async function getReport(payload, _test) {
     } catch (error) {
         return { status: 400, data: error };
     }
+}
+
+function getTextFields(payload, test?) {
+    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}` : "",
+    }
 }