@measurequick/measurequick-report-generator 1.5.176 → 1.5.177

package/package.json

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

package/report-gen-scripts/corrective-measures.js

@@ -51,16 +51,25 @@ export async function getReport(payload) {
     let pageHeader = payload.meta.report_mode == "heating" ? "Visual Inspection" : payload.project.unit_not_operational ? "Inoperational System Faults" : "Corrective Measures";
     form.getTextField('Header').setText(pageTitle);
 
-    // For NCI projects (CoolMaxx/HeatMaxx), use NCI logo instead of profile picture (50% of cover size)
-    let nciLogoImage = null;
-    if (isNCIProject(payload) && base64.nciLogo) {
-      nciLogoImage = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
-    }
-
-    // print company logo and profile picture
-    if (nciLogoImage) {
-      // NCI project - use NCI logo instead of profile picture
-      form.getButton("ProfilePicture").setImage(nciLogoImage);
+    // For NCI projects (CoolMaxx/HeatMaxx), draw NCI logo in place of profile picture (15% larger)
+    let isNCI = isNCIProject(payload) && base64.nciLogo;
+    if (isNCI) {
+      const nciLogoImage = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
+      const pages = pdfDoc.getPages();
+      const firstPage = pages[0];
+      const { width, height } = firstPage.getSize();
+      // Draw NCI logo in profile picture area (upper right), 15% larger than normal
+      const logoWidth = 75;
+      const logoHeight = logoWidth * (nciLogoImage.height / nciLogoImage.width);
+      const x = width - logoWidth - 15;
+      const y = height - logoHeight - 42;
+      firstPage.drawImage(nciLogoImage, {
+        x: x,
+        y: y,
+        width: logoWidth,
+        height: logoHeight,
+      });
+      // Still set company logo
       if (companyImage) {
         form.getButton("HalfWidthLogo").setImage(companyImage);
       } else {
@@ -68,17 +77,20 @@ export async function getReport(payload) {
       }
       if (payload.meta.profile_settings.techFirstName || payload.meta.profile_settings.techLastName)
         form.getTextField('TechName').setText(`${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`);
-    } else if (profileImage && companyImage) {
+    }
+
+    // print company logo and profile picture
+    if (!isNCI && profileImage && companyImage) {
       form.getButton("ProfilePicture").setImage(profileImage);
       form.getButton("HalfWidthLogo").setImage(companyImage);
       if (payload.meta.profile_settings.techFirstName || payload.meta.profile_settings.techLastName)
         form.getTextField('TechName').setText(`${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`);
-    } else if (profileImage) {
+    } else if (!isNCI && profileImage) {
       form.getButton("ProfilePicture").setImage(profileImage);
       form.getButton("HalfWidthLogo").setImage(mqLogo);
       if (payload.meta.profile_settings.techFirstName || payload.meta.profile_settings.techLastName)
         form.getTextField('TechName').setText(`${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`);
-    } else {
+    } else if (!isNCI) {
       if (companyImage) form.getButton("FullWidthLogo").setImage(companyImage);
       else form.getButton("FullWidthLogo").setImage(mqLogo);
     }

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

@@ -52,7 +52,7 @@ export async function getReport(payload) {
       const logoWidth = 180;
       const logoHeight = logoWidth * (nciLogo.height / nciLogo.width);
       const x = (width - logoWidth) / 2;
-      const y = height - logoHeight - 240; // 240 points from top (~3.3 inches)
+      const y = height - logoHeight - 204; // 204 points from top (~2.8 inches)
       firstPage.drawImage(nciLogo, {
         x: x,
         y: y,

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

@@ -200,19 +200,38 @@ export async function getReport(payload) {
       }
     }
 
-    // For NCI projects (CoolMaxx/HeatMaxx), use NCI logo instead of profile picture (50% of cover size)
-    let nciLogoImagePg1 = null;
-    let nciLogoImagePg2 = null;
-    if (isNCIProject(payload) && base64.nciLogo) {
-      nciLogoImagePg1 = await pdfDocPg1.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
-      nciLogoImagePg2 = await pdfDocPg2.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
-    }
-
-    // print company logo and profile picture
-    if (nciLogoImagePg1) {
-      // NCI project - use NCI logo instead of profile picture
-      formPg1.getButton("ProfilePicture").setImage(nciLogoImagePg1);
-      formPg2.getButton("ProfilePicture").setImage(nciLogoImagePg2);
+    // For NCI projects (CoolMaxx/HeatMaxx), draw NCI logo in place of profile picture (15% larger)
+    let isNCI = isNCIProject(payload) && base64.nciLogo;
+    if (isNCI) {
+      const nciLogoImagePg1 = await pdfDocPg1.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
+      const nciLogoImagePg2 = await pdfDocPg2.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
+      const pagesPg1 = pdfDocPg1.getPages();
+      const pagesPg2 = pdfDocPg2.getPages();
+      const firstPagePg1 = pagesPg1[0];
+      const firstPagePg2 = pagesPg2[0];
+      const { width: width1, height: height1 } = firstPagePg1.getSize();
+      const { width: width2, height: height2 } = firstPagePg2.getSize();
+      // Draw NCI logo in profile picture area (upper right), 15% larger than normal
+      const logoWidth = 75;
+      const logoHeight1 = logoWidth * (nciLogoImagePg1.height / nciLogoImagePg1.width);
+      const logoHeight2 = logoWidth * (nciLogoImagePg2.height / nciLogoImagePg2.width);
+      const x1 = width1 - logoWidth - 15;
+      const y1 = height1 - logoHeight1 - 42;
+      const x2 = width2 - logoWidth - 15;
+      const y2 = height2 - logoHeight2 - 42;
+      firstPagePg1.drawImage(nciLogoImagePg1, {
+        x: x1,
+        y: y1,
+        width: logoWidth,
+        height: logoHeight1,
+      });
+      firstPagePg2.drawImage(nciLogoImagePg2, {
+        x: x2,
+        y: y2,
+        width: logoWidth,
+        height: logoHeight2,
+      });
+      // Still set company logo
       if (companyImagePg1) {
         formPg1.getButton("HalfWidthLogo").setImage(companyImagePg1);
         formPg2.getButton("HalfWidthLogo").setImage(companyImagePg2);
@@ -235,7 +254,10 @@ export async function getReport(payload) {
             `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
           );
       }
-    } else if (profileImagePg1 && companyImagePg1) {
+    }
+
+    // print company logo and profile picture
+    if (!isNCI && profileImagePg1 && companyImagePg1) {
       formPg1.getButton("ProfilePicture").setImage(profileImagePg1);
       formPg1.getButton("HalfWidthLogo").setImage(companyImagePg1);
       formPg2.getButton("ProfilePicture").setImage(profileImagePg2);
@@ -255,7 +277,7 @@ export async function getReport(payload) {
             `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
           );
       }
-    } else if (profileImagePg1) {
+    } else if (!isNCI && profileImagePg1) {
       formPg1.getButton("ProfilePicture").setImage(profileImagePg1);
       formPg1.getButton("HalfWidthLogo").setImage(mqLogoPg1);
       formPg2.getButton("ProfilePicture").setImage(profileImagePg2);
@@ -275,7 +297,7 @@ export async function getReport(payload) {
             `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
           );
       }
-    } else {
+    } else if (!isNCI) {
       if (companyImagePg1) {
         formPg1.getButton("FullWidthLogo").setImage(companyImagePg1);
         formPg2.getButton("FullWidthLogo").setImage(companyImagePg2);

package/report-gen-scripts/vitals-cooling-report.js

@@ -127,16 +127,25 @@ export async function getReport(payload, _test) {
     // get text fields
     let textFields = getTextFields(payload, t);
 
-    // For NCI projects (CoolMaxx/HeatMaxx), use NCI logo instead of profile picture (50% of cover size)
-    let nciLogoImage = null;
-    if (isNCIProject(payload) && base64.nciLogo) {
-      nciLogoImage = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
-    }
-
-    // print company logo and profile picture
-    if (nciLogoImage) {
-      // NCI project - use NCI logo instead of profile picture
-      form.getButton("ProfilePicture").setImage(nciLogoImage);
+    // For NCI projects (CoolMaxx/HeatMaxx), draw NCI logo in place of profile picture (15% larger)
+    let isNCI = isNCIProject(payload) && base64.nciLogo;
+    if (isNCI) {
+      const nciLogoImage = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
+      const pages = pdfDoc.getPages();
+      const firstPage = pages[0];
+      const { width, height } = firstPage.getSize();
+      // Draw NCI logo in profile picture area (upper right), 15% larger than normal
+      const logoWidth = 75;
+      const logoHeight = logoWidth * (nciLogoImage.height / nciLogoImage.width);
+      const x = width - logoWidth - 15;
+      const y = height - logoHeight - 42;
+      firstPage.drawImage(nciLogoImage, {
+        x: x,
+        y: y,
+        width: logoWidth,
+        height: logoHeight,
+      });
+      // Still set company logo
       if (companyImage) {
         form.getButton("HalfWidthLogo").setImage(companyImage);
       } else {
@@ -151,7 +160,10 @@ export async function getReport(payload, _test) {
           .setText(
             `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
           );
-    } else if (profileImage && companyImage) {
+    }
+
+    // print company logo and profile picture
+    if (!isNCI && profileImage && companyImage) {
       // both images are embedded in the document
       form.getButton("ProfilePicture").setImage(profileImage);
       form.getButton("HalfWidthLogo").setImage(companyImage);
@@ -164,7 +176,7 @@ export async function getReport(payload, _test) {
           .setText(
             `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
           );
-    } else if (profileImage) {
+    } else if (!isNCI && profileImage) {
       // no company logo is embedded in the document
       form.getButton("ProfilePicture").setImage(profileImage);
       form.getButton("HalfWidthLogo").setImage(mqLogo);
@@ -177,7 +189,7 @@ export async function getReport(payload, _test) {
           .setText(
             `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
           );
-    } else {
+    } else if (!isNCI) {
       // no profile picture is embedded in the document
       if (companyImage) form.getButton("FullWidthLogo").setImage(companyImage);
       else form.getButton("FullWidthLogo").setImage(mqLogo);

package/report-gen-scripts/vitals-heating-report-no-combustion.js

@@ -115,16 +115,25 @@ export async function getReport(payload, _test) {
     t.manifoldKey = manifoldKey;
     let textFields = getTextFields(payload, t);
 
-    // For NCI projects (CoolMaxx/HeatMaxx), use NCI logo instead of profile picture (50% of cover size)
-    let nciLogoImage = null;
-    if (isNCIProject(payload) && base64.nciLogo) {
-      nciLogoImage = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
-    }
-
-    // print company logo and profile picture
-    if (nciLogoImage) {
-      // NCI project - use NCI logo instead of profile picture
-      safeSetImage(form, "ProfilePicture", nciLogoImage);
+    // For NCI projects (CoolMaxx/HeatMaxx), draw NCI logo in place of profile picture (15% larger)
+    let isNCI = isNCIProject(payload) && base64.nciLogo;
+    if (isNCI) {
+      const nciLogoImage = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
+      const pages = pdfDoc.getPages();
+      const firstPage = pages[0];
+      const { width, height } = firstPage.getSize();
+      // Draw NCI logo in profile picture area (upper right), 15% larger than normal
+      const logoWidth = 75;
+      const logoHeight = logoWidth * (nciLogoImage.height / nciLogoImage.width);
+      const x = width - logoWidth - 15;
+      const y = height - logoHeight - 42;
+      firstPage.drawImage(nciLogoImage, {
+        x: x,
+        y: y,
+        width: logoWidth,
+        height: logoHeight,
+      });
+      // Still set company logo
       if (companyImage) {
         safeSetImage(form, "HalfWidthLogo", companyImage);
       } else {
@@ -139,7 +148,10 @@ export async function getReport(payload, _test) {
           "TechName",
           `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
         );
-    } else if (profileImage && companyImage) {
+    }
+
+    // print company logo and profile picture
+    if (!isNCI && profileImage && companyImage) {
       safeSetImage(form, "ProfilePicture", profileImage);
       safeSetImage(form, "HalfWidthLogo", companyImage);
       if (
@@ -151,7 +163,7 @@ export async function getReport(payload, _test) {
           "TechName",
           `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
         );
-    } else if (profileImage) {
+    } else if (!isNCI && profileImage) {
       safeSetImage(form, "ProfilePicture", profileImage);
       safeSetImage(form, "HalfWidthLogo", mqLogo);
       if (
@@ -163,7 +175,7 @@ export async function getReport(payload, _test) {
           "TechName",
           `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
         );
-    } else {
+    } else if (!isNCI) {
       if (companyImage) safeSetImage(form, "FullWidthLogo", companyImage);
       else safeSetImage(form, "FullWidthLogo", mqLogo);
     }

package/report-gen-scripts/vitals-heating-report.js

@@ -128,16 +128,25 @@ export async function getReport(payload, _test) {
     t.manifoldKey = manifoldKey;
     let textFields = getTextFields(payload, t);
 
-    // For NCI projects (CoolMaxx/HeatMaxx), use NCI logo instead of profile picture (50% of cover size)
-    let nciLogoImage = null;
-    if (isNCIProject(payload) && base64.nciLogo) {
-      nciLogoImage = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
-    }
-
-    // print company logo and profile picture
-    if (nciLogoImage) {
-      // NCI project - use NCI logo instead of profile picture
-      safeSetImage(form, "ProfilePicture", nciLogoImage);
+    // For NCI projects (CoolMaxx/HeatMaxx), draw NCI logo in place of profile picture (15% larger)
+    let isNCI = isNCIProject(payload) && base64.nciLogo;
+    if (isNCI) {
+      const nciLogoImage = await pdfDoc.embedPng(util._base64ToArrayBuffer(base64.nciLogo));
+      const pages = pdfDoc.getPages();
+      const firstPage = pages[0];
+      const { width, height } = firstPage.getSize();
+      // Draw NCI logo in profile picture area (upper right), 15% larger than normal
+      const logoWidth = 75;
+      const logoHeight = logoWidth * (nciLogoImage.height / nciLogoImage.width);
+      const x = width - logoWidth - 15;
+      const y = height - logoHeight - 42;
+      firstPage.drawImage(nciLogoImage, {
+        x: x,
+        y: y,
+        width: logoWidth,
+        height: logoHeight,
+      });
+      // Still set company logo
       if (companyImage) {
         safeSetImage(form, "HalfWidthLogo", companyImage);
       } else {
@@ -152,7 +161,10 @@ export async function getReport(payload, _test) {
           "TechName",
           `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
         );
-    } else if (profileImage && companyImage) {
+    }
+
+    // print company logo and profile picture
+    if (!isNCI && profileImage && companyImage) {
       safeSetImage(form, "ProfilePicture", profileImage);
       safeSetImage(form, "HalfWidthLogo", companyImage);
       if (
@@ -164,7 +176,7 @@ export async function getReport(payload, _test) {
           "TechName",
           `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
         );
-    } else if (profileImage) {
+    } else if (!isNCI && profileImage) {
       safeSetImage(form, "ProfilePicture", profileImage);
       safeSetImage(form, "HalfWidthLogo", mqLogo);
       if (
@@ -176,7 +188,7 @@ export async function getReport(payload, _test) {
           "TechName",
           `${payload.meta.profile_settings.techFirstName} ${payload.meta.profile_settings.techLastName}`
         );
-    } else {
+    } else if (!isNCI) {
       if (companyImage) safeSetImage(form, "FullWidthLogo", companyImage);
       else safeSetImage(form, "FullWidthLogo", mqLogo);
     }