@measurequick/measurequick-report-generator 1.4.71 → 1.4.73

package/package.json

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

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

@@ -147,6 +147,8 @@ export async function getReport(payload) {
             else if (!isGoettlInstall && measurement.label == "Cond. Amps" && condDisplay.amperageIcon) form.getButton(`Block${blockNum}-Row${rowNum}-Col4`).setImage(condDisplay.amperageIcon);
             else if (!isGoettlInstall && measurement.label == "AHU Volts" && ahuDisplay.voltageIcon) form.getButton(`Block${blockNum}-Row${rowNum}-Col4`).setImage(ahuDisplay.voltageIcon);
             else if (!isGoettlInstall && measurement.label == "AHU Amps" && ahuDisplay.amperageIcon) form.getButton(`Block${blockNum}-Row${rowNum}-Col4`).setImage(ahuDisplay.amperageIcon);
+          
+
             let units = measurement.units ? `(${measurement.units})` : "";
             let altLabel = "";
             if (payload.meta.report_mode != 'heating' && blockNum == 1 && (rowNum == 4 || rowNum == 5 || rowNum == 6 || rowNum == 9)) altLabel = "c";
@@ -160,6 +162,15 @@ export async function getReport(payload) {
             if (measurement.ref == 'co' || measurement.ref == 'o2' || measurement.ref == 'temperature_air' || measurement.ref == 'temperature_stack' || measurement.ref == 'coaf' || measurement.ref == 'excess_air' || measurement.ref == 'efficiency_gcv' || measurement.ref == 'efficiency_ncv' || measurement.ref == 'dew_point') val = measurement.value;
             else if (measurement.ref == 'pressure_fuel' || measurement.ref == 'pressure_manifold' || measurement.ref == 'pressure_static_total_external' || measurement.ref == 'temperature_rise' || measurement.ref == 'temperature_rise_target' || measurement.ref == 'temperature_return' || measurement.ref == 'temperature_supply' || measurement.ref == 'airflow' || measurement.ref == 'gas_input_rated' || measurement.ref == 'gas_input_after' || measurement.ref == 'gas_output') val = measurement.value;
             if (val == null || val == "null") val = "--";
+
+            if (measurement.value2 && measurement.units2 && measurement.ref2 && measurement.fixTo2){
+              //second measurement to show on same line
+              let val2 = measurement.value2 ? measurement.value2 : (+test.data[measurement.ref2]);
+              if (!val2) val2 = "--";
+              else if (measurement.fixTo2 && typeof val2 == 'number') val2 = val2.toFixed(measurement.fixTo2);
+              val += " / " + val2;
+            }
+
             form.getTextField(`Block${blockNum}-Row${rowNum}-Col2${altLabel}`).setText(`${val}`);
             if (blockNum != 4) {
               let rangeIcon;

package/util.js

@@ -1,6 +1,7 @@
 
 
 export function _base64ToArrayBuffer(base64) {
+  if (base64){
     base64 = base64.replace(/^[^,]+,/, '').replace(/\s/g, '');
     var binary_string = window.atob(base64);
     var len = binary_string.length;
@@ -9,6 +10,10 @@ export function _base64ToArrayBuffer(base64) {
         bytes[i] = binary_string.charCodeAt(i);
     }
     return bytes.buffer;
+  }
+  else {
+    return;
+  }
 }
 
 export function checkCompanyLogo(meta) {