@measurequick/measurequick-report-generator 1.2.157 → 1.2.159

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/package.json +1 -1
  2. package/report-gen-scripts/full-report.js +2 -2
  3. package/report-gen-scripts/measurement-details.js +5 -0
  4. package/report-gen-scripts/photos-report.js +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@measurequick/measurequick-report-generator",
3
- "version": "1.2.157",
3
+ "version": "1.2.159",
4
4
  "description": "Generates PDF documents for various MeasureQuick applications.",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/report-gen-scripts/full-report.js CHANGED
@@ -106,12 +106,12 @@ export async function getReport(payload) {
106
106
  if (_correctiveMeasuresDoc) coreDoc.insertPage(coreDoc.getPages().length, _correctiveMeasuresDoc);
107
107
  if (_correctiveMeasuresDocPage2) coreDoc.insertPage(coreDoc.getPages().length, _correctiveMeasuresDocPage2);
108
108
  } else if (_correctiveMeasuresDoc) coreDoc.insertPage(coreDoc.getPages().length, _correctiveMeasuresDoc);
109
- } catch (e) { console.log(e) }
109
+ } catch (e) {}
110
110
 
111
111
  /******** PHOTOS (X PAGES) *********/
112
112
  try {
113
113
  let selectedPhotosReport = payload.meta.origin == 'virtuoso' ? photosReportS3 : photosReport;
114
- let photosReportBase64 = (payload.meta.pdf_settings.includePhotos && payload.meta.photo_count > 0) ? await selectedPhotosReport.getReport(payload.photos) : false;
114
+ let photosReportBase64 = (payload.meta.pdf_settings.includePhotos && payload.meta.photo_count > 0) ? await selectedPhotosReport.getReport(payload) : false;
115
115
  const photosReportDoc = photosReportBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(photosReportBase64)) : false;
116
116
  for (let i = 0; (photosReportDoc && i < photosReportDoc.getPages().length); i++) {
117
117
  const [_photosReport] = await coreDoc.copyPages(photosReportDoc, [i]);
package/report-gen-scripts/measurement-details.js CHANGED
@@ -141,6 +141,7 @@ export async function getReport(payload) {
141
141
  let condDisplay = util.getElectricalData(test, "", embeddedIcons);
142
142
  let ahuDisplay = util.getElectricalData(test, "_ahu", embeddedIcons);
143
143
  if (measurement) {
144
+ if (measurement.ref == 'c1') console.log('1: ' + val);
144
145
  if (measurement.label == "Cond. Volts" && condDisplay.voltageIcon) form.getButton(`Block${blockNum}-Row${rowNum}-Col4`).setImage(condDisplay.voltageIcon);
145
146
  else if (measurement.label == "Cond. Amps" && condDisplay.amperageIcon) form.getButton(`Block${blockNum}-Row${rowNum}-Col4`).setImage(condDisplay.amperageIcon);
146
147
  else if (measurement.label == "AHU Volts" && ahuDisplay.voltageIcon) form.getButton(`Block${blockNum}-Row${rowNum}-Col4`).setImage(ahuDisplay.voltageIcon);
@@ -148,18 +149,22 @@ export async function getReport(payload) {
148
149
  let units = measurement.units ? `(${measurement.units})` : "";
149
150
  let altLabel = "";
150
151
  if (payload.meta.report_mode != 'heating' && blockNum == 1 && (rowNum == 4 || rowNum == 5 || rowNum == 6 || rowNum == 9)) altLabel = "c";
152
+ if (measurement.ref == 'c1') console.log('2: ' + val);
151
153
  form.getTextField(`Block${blockNum}-Row${rowNum}-Col1${altLabel}`).setText(`${measurement.label} ${units}`);
152
154
  let val = measurement.value ? measurement.value : (+test.data[measurement.ref]);
153
155
  if (!val) val = "--";
154
156
  else if (measurement.fixTo && typeof val == 'number') val = val.toFixed(measurement.fixTo);
155
157
  if ((measurement.label == 'Ambient CO' || measurement.label == 'Return CO' || measurement.label == 'Supply CO') && !measurement.value) val = '0.0';
156
158
  //if (measurement.fixTo && typeof val == 'number') val = val.toFixed(measurement.fixTo);
159
+ if (measurement.ref == 'c1') console.log('3: ' + val);
157
160
  if (typeof val == 'number' || !isNaN(val)) val = val.toLocaleString("en-US");
158
161
  else if (!isNaN(parseFloat(val))) val = parseFloat(val).toLocaleString("en-US");
159
162
  if (measurement.fixTo && typeof val == 'number') val = val.toFixed(measurement.fixTo);
160
163
  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;
161
164
  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;
162
165
  if (val == null || val == "null") val = "--";
166
+ if (measurement.ref == 'c1') {console.log('4: ' + val);
167
+ console.log("==================================");}
163
168
  form.getTextField(`Block${blockNum}-Row${rowNum}-Col2${altLabel}`).setText(`${val}`);
164
169
  if (blockNum != 4) {
165
170
  let rangeIcon = util.getRangeIcon(test, measurement.ref, embeddedIcons);
package/report-gen-scripts/photos-report.js CHANGED
@@ -110,5 +110,5 @@ export async function getReport(payload) {
110
110
  pdfDoc.insertPage(i, nextPage);
111
111
  }
112
112
  return await pdfDoc.saveAsBase64({ dataUri: true });
113
- } catch (error) { }
113
+ } catch (error) {}
114
114
  }