@measurequick/measurequick-report-generator 1.1.93 → 1.1.95

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 +4 -2
  4. package/report-gen-scripts/photos-report.js +5 -4
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@measurequick/measurequick-report-generator",
3
- "version": "1.1.93",
3
+ "version": "1.1.95",
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
@@ -17,7 +17,7 @@ let forms = [];
17
17
 
18
18
  export async function getReport(payload) { console.log("Full Report");
19
19
 
20
- let coverPageBase64 = payload.meta.include_cover_sheet ? await coverPage.getReport(payload) : false;
20
+ let coverPageBase64 = payload.meta.pdf_settings.includeCoverPage ? await coverPage.getReport(payload) : false;
21
21
  const coverPageDoc = coverPageBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(coverPageBase64)) : false;
22
22
 
23
23
  // let equipmentInfoReportBase64 = payload.meta.include_equipment_info ? await equipmentInfoReport.getReport(payload) : false;
@@ -26,7 +26,7 @@ export async function getReport(payload) { console.log("Full Report");
26
26
  // let systemReviewReportBase64 = payload.meta.include_system_review ? await systemReviewReport.getReport(payload) : false;
27
27
  // const systemReviewReportDoc = systemReviewReportBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(systemReviewReportBase64)) : false;
28
28
 
29
- let photosReportBase64 = payload.meta.include_photos ? await photosReport.getReport(payload) : false;
29
+ let photosReportBase64 = payload.meta.pdf_settings.includePhotos ? await photosReport.getReport(payload) : false;
30
30
  const photosReportDoc = photosReportBase64 ? await PDFDocument.load(util._base64ToArrayBuffer(photosReportBase64)) : false;
31
31
 
32
32
  let vitalsReportBase64 = payload.meta.report_mode == "cooling" ? await vitalsCoolingReport.getReport(payload) : await vitalsHeatingReport.getReport(payload);
package/report-gen-scripts/measurement-details.js CHANGED
@@ -71,8 +71,10 @@ export async function getReport(payload) { console.log(payload);
71
71
  formPg1.getButton("HalfWidthLogo").setImage(companyImagePg1);
72
72
  formPg2.getButton("ProfilePicture").setImage(profileImagePg2);
73
73
  formPg2.getButton("HalfWidthLogo").setImage(companyImagePg2);
74
- if (payload.meta.profile_settings.techFirstName || payload.meta.profile_settings.techLastName)
75
- form.getTextField('TechName').setText(`${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`);
74
+ if (payload.meta.profile_settings.techFirstName || payload.meta.profile_settings.techLastName) {
75
+ formPg1.getTextField('TechName').setText(`${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`);
76
+ formPg2.getTextField('TechName').setText(`${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`);
77
+ }
76
78
  } else if (profileImagePg1) {
77
79
  formPg1.getButton("ProfilePicture").setImage(profileImagePg1);
78
80
  formPg1.getButton("HalfWidthLogo").setImage(mqLogoPg1);
package/report-gen-scripts/photos-report.js CHANGED
@@ -2,14 +2,15 @@ import { PDFDocument } from 'pdf-lib';
2
2
  import * as photos2 from '../base-64/photos2.js';
3
3
  import * as photos4 from '../base-64/photos4.js';
4
4
  import * as photos6 from '../base-64/photos6.js';
5
+ import * as base64 from '../base-64/icons.js';
5
6
  import * as util from '../util.js';
6
7
 
7
8
  export async function getReport(payload) { console.log("Photos Report"); console.log(payload);
8
9
  let docs = [], forms = [], page = photos2, size = "Large";
9
- if (payload.meta.max_photos_per_page === 4) {
10
+ if (payload.meta.pdf_settings.maxPhotosPerPage === 4) {
10
11
  page = photos4;
11
12
  size = "Mid";
12
- } else if (payload.meta.max_photos_per_page === 6) {
13
+ } else if (payload.meta.pdf_settings.maxPhotosPerPage === 6) {
13
14
  page = photos6;
14
15
  size = "Small";
15
16
  }
@@ -19,7 +20,7 @@ export async function getReport(payload) { console.log("Photos Report"); console
19
20
  if (payload.photos[keys[k]]) {
20
21
  let sections = Object.keys(payload.photos[keys[k]]);
21
22
  for (const [section, data] of Object.entries(payload.photos[keys[k]])) photoCount += data.photos.length;
22
- pageCount = Math.ceil(photoCount / payload.meta.max_photos_per_page);
23
+ pageCount = Math.ceil(photoCount / payload.meta.pdf_settings.maxPhotosPerPage);
23
24
  for (let i = 0; i < pageCount; i++) {
24
25
  const doc = await PDFDocument.load(util._base64ToArrayBuffer(page.base64));
25
26
  const form = doc.getForm();
@@ -28,7 +29,7 @@ export async function getReport(payload) { console.log("Photos Report"); console
28
29
  form.getButton("FullWidthLogo").setImage(mqLogo);
29
30
  docs.push(doc);
30
31
  forms.push(form);
31
- for (let j = 1; j <= payload.meta.max_photos_per_page; j++) {
32
+ for (let j = 1; j <= payload.meta.pdf_settings.maxPhotosPerPage; j++) {
32
33
  let image;
33
34
  if (!payload.photos[keys[k]][sections[sectionNum]].photos[count]) {
34
35
  count = 0;