@measurequick/measurequick-report-generator 1.2.162 → 1.2.164

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 (5) hide show
  1. package/package.json +1 -1
  2. package/report-gen-scripts/measurement-details.js +5 -5
  3. package/report-gen-scripts/photos-report-s3.js +4 -2
  4. package/report-gen-scripts/photos-report.js +8 -4
  5. package/util.js +7 -3
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@measurequick/measurequick-report-generator",
3
- "version": "1.2.162",
3
+ "version": "1.2.164",
4
4
  "description": "Generates PDF documents for various MeasureQuick applications.",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/report-gen-scripts/measurement-details.js CHANGED
@@ -17,7 +17,7 @@ export async function getReport(payload) {
17
17
  const formPg2 = pdfDocPg2.getForm();
18
18
 
19
19
  let mapImagePg1, mapImagePg2;
20
- if (payload.map) {
20
+ if (payload.map && typeof payload.map == 'string') {
21
21
  if (payload.map.includes("image/jpeg")) {
22
22
  mapImagePg1 = await pdfDocPg1.embedJpg(util._base64ToArrayBuffer(payload.map));
23
23
  mapImagePg2 = await pdfDocPg2.embedJpg(util._base64ToArrayBuffer(payload.map));
@@ -41,7 +41,7 @@ export async function getReport(payload) {
41
41
  // embed company logo and profile picture
42
42
  let profileImagePg1, companyImagePg1, profileImagePg2, companyImagePg2;
43
43
  if (payload.meta.pdf_settings.includeProfilePic) {
44
- if (payload.meta.pdf_settings.shapeProfilePic && payload.meta.profile_settings.profilePicCircleBase64) {
44
+ if (payload.meta.pdf_settings.shapeProfilePic && payload.meta.profile_settings.profilePicCircleBase64 && typeof payload.meta.profile_settings.profilePicCircleBase64 == 'string') {
45
45
  if (payload.meta.profile_settings.profilePicCircleBase64.includes("image/jpeg")) {
46
46
  profileImagePg1 = await pdfDocPg1.embedJpg(util._base64ToArrayBuffer(payload.meta.profile_settings.profilePicCircleBase64));
47
47
  profileImagePg2 = await pdfDocPg2.embedJpg(util._base64ToArrayBuffer(payload.meta.profile_settings.profilePicCircleBase64));
@@ -49,7 +49,7 @@ export async function getReport(payload) {
49
49
  profileImagePg1 = await pdfDocPg1.embedPng(util._base64ToArrayBuffer(payload.meta.profile_settings.profilePicCircleBase64));
50
50
  profileImagePg2 = await pdfDocPg2.embedPng(util._base64ToArrayBuffer(payload.meta.profile_settings.profilePicCircleBase64));
51
51
  }
52
- } else if (payload.meta.profile_settings.profilePicSquareBase64) {
52
+ } else if (payload.meta.profile_settings.profilePicSquareBase64 && typeof payload.meta.profile_settings.profilePicSquareBase64 == 'string') {
53
53
  if (payload.meta.profile_settings.profilePicSquareBase64.includes("image/jpeg")) {
54
54
  profileImagePg1 = await pdfDocPg1.embedJpg(util._base64ToArrayBuffer(payload.meta.profile_settings.profilePicSquareBase64));
55
55
  profileImagePg2 = await pdfDocPg2.embedJpg(util._base64ToArrayBuffer(payload.meta.profile_settings.profilePicSquareBase64));
@@ -59,7 +59,7 @@ export async function getReport(payload) {
59
59
  }
60
60
  }
61
61
  }
62
- if (payload.meta.pdf_settings.includeCompanyLogo && payload.meta.profile_settings.companyLogoBase64) {
62
+ if (payload.meta.pdf_settings.includeCompanyLogo && payload.meta.profile_settings.companyLogoBase64 && typeof payload.meta.profile_settings.companyLogoBase64 == 'string') {
63
63
  if (payload.meta.profile_settings.companyLogoBase64.includes("image/jpeg")) {
64
64
  companyImagePg1 = await pdfDocPg1.embedJpg(util._base64ToArrayBuffer(payload.meta.profile_settings.companyLogoBase64));
65
65
  companyImagePg2 = await pdfDocPg2.embedJpg(util._base64ToArrayBuffer(payload.meta.profile_settings.companyLogoBase64));
@@ -116,7 +116,7 @@ export async function getReport(payload) {
116
116
  let systemScorePercentage = payload.tests[t].testInfo.data.vitals_score ? +payload.tests[t].testInfo.data.vitals_score.toFixed(0) : 0;
117
117
  let systemScoreGrade = util.getGradeFromScore(systemScorePercentage);
118
118
  let systemScoreColor = util.getColorFromGrade(systemScoreGrade);
119
- if (!payload.tests[0].testInfo.data.vitals_score) {
119
+ if (!payload.tests[t].testInfo.data.vitals_score) {
120
120
  systemScorePercentage = "--";
121
121
  systemScoreGrade = "";
122
122
  } else systemScorePercentage += "%";
package/report-gen-scripts/photos-report-s3.js CHANGED
@@ -48,8 +48,10 @@ export async function getReport(payload) {
48
48
  forms[docIndex].getTextField("Header").setText(`Project Photos`);
49
49
  }
50
50
  let imageToSet;
51
- if (photo.base64 && photo.base64.includes("image/jpeg")) imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
52
- else if (photo.base64 && photo.base64.includes("image/png")) imageToSet = await docs[docIndex].embedPng(util._base64ToArrayBuffer(photo.base64));
51
+ if (photo && photo.base64 && typeof photo.base64 == 'string') {
52
+ if (photo.base64 && photo.base64.includes("image/jpeg")) imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
53
+ else if (photo.base64 && photo.base64.includes("image/png")) imageToSet = await docs[docIndex].embedPng(util._base64ToArrayBuffer(photo.base64));
54
+ }
53
55
  if (imageToSet) forms[docIndex].getButton(`photo${pSize}${photoPosition}`).setImage(imageToSet);
54
56
  let caption = photo.section;
55
57
  if (prevSection == currSection) caption += photo.notes;
package/report-gen-scripts/photos-report.js CHANGED
@@ -47,8 +47,10 @@ export async function getReport(payload) {
47
47
  forms[docIndex].getTextField("Header").setText(`Project Photos`);
48
48
  }
49
49
  let imageToSet;
50
- if (photo.base64.includes("image/jpeg")) imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
51
- else if (photo.base64.includes("image/png")) imageToSet = await docs[docIndex].embedPng(util._base64ToArrayBuffer(photo.base64));
50
+ if (photo && photo.base64 && typeof photo.base64 == 'string') {
51
+ if (photo.base64.includes("image/jpeg")) imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
52
+ else if (photo.base64.includes("image/png")) imageToSet = await docs[docIndex].embedPng(util._base64ToArrayBuffer(photo.base64));
53
+ }
52
54
  if (imageToSet) forms[docIndex].getButton(`photo${pSize}${photoPosition}`).setImage(imageToSet);
53
55
  let photoSubText = photoSection.name;
54
56
  let isFirstPhotoOfSection = previousPhotoSectionName !== photoSectionName;
@@ -87,8 +89,10 @@ export async function getReport(payload) {
87
89
  forms[docIndex].getTextField("Header").setText(`Equipment Photos`);
88
90
  }
89
91
  let imageToSet;
90
- if (photo.base64.includes("image/jpeg")) imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
91
- else if (photo.base64.includes("image/png")) imageToSet = await docs[docIndex].embedPng(util._base64ToArrayBuffer(photo.base64));
92
+ if (photo && photo.base64 && typeof photo.base64 == 'string') {
93
+ if (photo.base64.includes("image/jpeg")) imageToSet = await docs[docIndex].embedJpg(util._base64ToArrayBuffer(photo.base64));
94
+ else if (photo.base64.includes("image/png")) imageToSet = await docs[docIndex].embedPng(util._base64ToArrayBuffer(photo.base64));
95
+ }
92
96
  if (imageToSet) forms[docIndex].getButton(`photo${pSize}${photoPosition}`).setImage(imageToSet);
93
97
  let photoSubText = photoSection.name;
94
98
  let isFirstPhotoOfSection = previousPhotoSectionName !== photoSectionName;
package/util.js CHANGED
@@ -12,7 +12,7 @@ export function _base64ToArrayBuffer(base64) {
12
12
  }
13
13
 
14
14
  export function checkCompanyLogo(meta) {
15
- if (meta.pdf_settings.includeCompanyLogo && meta.profile_settings.companyLogoBase64) {
15
+ if (meta.pdf_settings.includeCompanyLogo && meta.profile_settings.companyLogoBase64 && typeof meta.profile_settings.companyLogoBase64 == 'string') {
16
16
  if (meta.profile_settings.companyLogoBase64.includes("image/jpeg")) return "jpg";
17
17
  else if (meta.profile_settings.companyLogoBase64.includes("image/png")) return "png";
18
18
  return false;
@@ -21,10 +21,14 @@ export function checkCompanyLogo(meta) {
21
21
 
22
22
  export function checkProfilePicture(meta) {
23
23
  if (meta.pdf_settings.includeProfilePic) {
24
- if (meta.pdf_settings.shapeProfilePic && meta.profile_settings.profilePicCircleBase64) {
24
+
25
+ if (meta.pdf_settings.shapeProfilePic && meta.profile_settings.profilePicCircleBase64 && typeof meta.profile_settings.profilePicCircleBase64 == 'string') {
26
+
25
27
  if (meta.profile_settings.profilePicCircleBase64.includes("image/jpeg")) return { type: "jpg", shape: "circle" };
26
28
  else if (meta.profile_settings.profilePicCircleBase64.includes("image/png")) return { type: "png", shape: "circle" };
27
- } else if (meta.profile_settings.profilePicSquareBase64) {
29
+
30
+ } else if (meta.profile_settings.profilePicSquareBase64 && typeof meta.profile_settings.profilePicSquareBase64 == 'string') {
31
+
28
32
  if (meta.profile_settings.profilePicSquareBase64.includes("image/jpeg")) return { type: "jpg", shape: "square" };
29
33
  else if (meta.profile_settings.profilePicSquareBase64.includes("image/png")) return { type: "png", shape: "square" };
30
34
  }