@measurequick/measurequick-report-generator 1.5.43 → 1.5.45

package/package.json

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

package/report-gen-scripts/franklin-cover-page.js

@@ -20,13 +20,11 @@ export async function getReport(payload) {
     //const isGoettlInstall = util.projectIsGoettl(payload.project);
 
     let utility_logo;
-
     if (payload.project.franklin_utility === 'Unisource'){
         utility_logo = await pdfDocPg1.embedPng(assets.unisourceLogo);
+        formPg1.getButton("ImageUtility").setImage(utility_logo);
     }
-
-    formPg1.getButton("ImageUtility").setImage(utility_logo);
-
+  
     //Block4-Title2a: Existing System
     formPg1.getTextField('Block4-Title2a').setText('Existing System');
     let row = 1;
@@ -63,21 +61,21 @@ export async function getReport(payload) {
       //Block4-Row5-Col1: Nominal Capacity (Btu/h):
       formPg1.getTextField('Block4-Row'+ row +'-Col1').setText('Nominal Capacity (Btu/h):');
       //Block4-Row5-Col2: value
-      formPg1.getTextField('Block4-Row'+ row +'-Col2').setText(capacity);
+      formPg1.getTextField('Block4-Row'+ row +'-Col2').setText(numberWithCommas(capacity));
       row++;
     }
-    if (payload.tests[payload.tests[0]].testInfo.data.efficiency){
+    if (payload.tests[0].testInfo.data.efficiency){
       //Block4-Row6-Col1: Measured EER:
       formPg1.getTextField('Block4-Row'+ row +'-Col1').setText('Measured EER:');
       //Block4-Row6-Col2: value
-      formPg1.getTextField('Block4-Row'+ row +'-Col2').setText(payload.tests[payload.tests[0]].testInfo.data.efficiency);
+      formPg1.getTextField('Block4-Row'+ row +'-Col2').setText(payload.tests[payload.tests[0]].testInfo.data.efficiency.toString());
       row++;
     }
     if (payload.equipment.equipment_age){
       //Block4-Row7-Col1: Age of System:
       formPg1.getTextField('Block4-Row'+ row +'-Col1').setText('Age of System:');
       //Block4-Row7-Col2: value
-      formPg1.getTextField('Block4-Row'+ row +'-Col2').setText(payload.equipment.equipment_age);
+      formPg1.getTextField('Block4-Row'+ row +'-Col2').setText(payload.equipment.equipment_age.toSting());
       row++;
     }
     if (payload.tests[payload.tests[0]].testInfo.diagnostics.system_wide.stability===0){
@@ -93,7 +91,7 @@ export async function getReport(payload) {
       formPg1.getTextField('Block4-Row'+ row +'-Col2').setText('No');
       row++;
     }
-    /*
+    
     //Block5-Title2a: New System
     formPg1.getTextField('Block5-Title2a').setText('New System');
     row = 1;
@@ -130,7 +128,7 @@ export async function getReport(payload) {
       //Block5-Row5-Col1: Nominal Capacity (Btu/h):
       formPg1.getTextField('Block5-Row'+ row +'-Col1').setText('Nominal Capacity (Btu/h):');
       //Block5-Row5-Col2: value
-      formPg1.getTextField('Block5-Row'+ row +'-Col2').setText(payload.project.franklin_new_system_capacity);
+      formPg1.getTextField('Block5-Row'+ row +'-Col2').setText(numberWithCommas(payload.project.franklin_new_system_capacity));
       row++;
     }
     if (payload.project.franklin_new_system_type){
@@ -167,10 +165,6 @@ export async function getReport(payload) {
       formPg1.getTextField('RebateTable2').setText('Unisource Multi-family Rebates');
     } 
 
-    */
-
-    
-
     let labels = ["iconRangeHigh", "iconRangeLow", "iconRangeNormal", "iconTesto", "iconCalculator", "iconFieldpiece",
       "iconUei", "iconSporlanPro", "iconSporlanLegacy", "iconIconnect", "iconImanifold", "iconSensi", "iconDg8", "iconJb",
       "iconBluflame", "iconSauermann", "iconRedfish510", "iconRedfish510333", "iconRedfish550", "iconDg1000", "iconTrueflow", "iconThumbprintRed", "iconThumbprintGreen", "iconThumbprintYellow"
@@ -369,3 +363,7 @@ export async function getReport(payload) {
     return { status: 400, data: error };
   }
 }
+
+function numberWithCommas(number) {
+  return number.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+}