@measurequick/measurequick-report-generator 1.5.177 → 1.5.178

package/package.json

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

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

@@ -57,12 +57,16 @@ export async function getReport(payload) {
       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;
+      // Get the ProfilePicture button position from the form field
+      const profilePictureButton = form.getButton("ProfilePicture");
+      const widgets = profilePictureButton.acroField.getWidgets();
+      const rect = widgets[0].getRectangle();
+      // Draw NCI logo at the profile picture position, 15% larger
+      const logoWidth = rect.width * 1.15;
       const logoHeight = logoWidth * (nciLogoImage.height / nciLogoImage.width);
-      const x = width - logoWidth - 15;
-      const y = height - logoHeight - 42;
+      // Center the logo in the original field area
+      const x = rect.x + (rect.width - logoWidth) / 2;
+      const y = rect.y + (rect.height - logoHeight) / 2;
       firstPage.drawImage(nciLogoImage, {
         x: x,
         y: y,

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

@@ -209,26 +209,32 @@ export async function getReport(payload) {
       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;
+      // Get the ProfilePicture button position from form fields
+      const profilePictureButtonPg1 = formPg1.getButton("ProfilePicture");
+      const widgetsPg1 = profilePictureButtonPg1.acroField.getWidgets();
+      const rectPg1 = widgetsPg1[0].getRectangle();
+      const profilePictureButtonPg2 = formPg2.getButton("ProfilePicture");
+      const widgetsPg2 = profilePictureButtonPg2.acroField.getWidgets();
+      const rectPg2 = widgetsPg2[0].getRectangle();
+      // Draw NCI logo at the profile picture position, 15% larger
+      const logoWidth1 = rectPg1.width * 1.15;
+      const logoHeight1 = logoWidth1 * (nciLogoImagePg1.height / nciLogoImagePg1.width);
+      const x1 = rectPg1.x + (rectPg1.width - logoWidth1) / 2;
+      const y1 = rectPg1.y + (rectPg1.height - logoHeight1) / 2;
+      const logoWidth2 = rectPg2.width * 1.15;
+      const logoHeight2 = logoWidth2 * (nciLogoImagePg2.height / nciLogoImagePg2.width);
+      const x2 = rectPg2.x + (rectPg2.width - logoWidth2) / 2;
+      const y2 = rectPg2.y + (rectPg2.height - logoHeight2) / 2;
       firstPagePg1.drawImage(nciLogoImagePg1, {
         x: x1,
         y: y1,
-        width: logoWidth,
+        width: logoWidth1,
         height: logoHeight1,
       });
       firstPagePg2.drawImage(nciLogoImagePg2, {
         x: x2,
         y: y2,
-        width: logoWidth,
+        width: logoWidth2,
         height: logoHeight2,
       });
       // Still set company logo

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

@@ -133,12 +133,16 @@ export async function getReport(payload, _test) {
       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;
+      // Get the ProfilePicture button position from the form field
+      const profilePictureButton = form.getButton("ProfilePicture");
+      const widgets = profilePictureButton.acroField.getWidgets();
+      const rect = widgets[0].getRectangle();
+      // Draw NCI logo at the profile picture position, 15% larger
+      const logoWidth = rect.width * 1.15;
       const logoHeight = logoWidth * (nciLogoImage.height / nciLogoImage.width);
-      const x = width - logoWidth - 15;
-      const y = height - logoHeight - 42;
+      // Center the logo in the original field area
+      const x = rect.x + (rect.width - logoWidth) / 2;
+      const y = rect.y + (rect.height - logoHeight) / 2;
       firstPage.drawImage(nciLogoImage, {
         x: x,
         y: y,

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

@@ -121,12 +121,16 @@ export async function getReport(payload, _test) {
       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;
+      // Get the ProfilePicture button position from the form field
+      const profilePictureButton = form.getButton("ProfilePicture");
+      const widgets = profilePictureButton.acroField.getWidgets();
+      const rect = widgets[0].getRectangle();
+      // Draw NCI logo at the profile picture position, 15% larger
+      const logoWidth = rect.width * 1.15;
       const logoHeight = logoWidth * (nciLogoImage.height / nciLogoImage.width);
-      const x = width - logoWidth - 15;
-      const y = height - logoHeight - 42;
+      // Center the logo in the original field area
+      const x = rect.x + (rect.width - logoWidth) / 2;
+      const y = rect.y + (rect.height - logoHeight) / 2;
       firstPage.drawImage(nciLogoImage, {
         x: x,
         y: y,

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

@@ -134,12 +134,16 @@ export async function getReport(payload, _test) {
       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;
+      // Get the ProfilePicture button position from the form field
+      const profilePictureButton = form.getButton("ProfilePicture");
+      const widgets = profilePictureButton.acroField.getWidgets();
+      const rect = widgets[0].getRectangle();
+      // Draw NCI logo at the profile picture position, 15% larger
+      const logoWidth = rect.width * 1.15;
       const logoHeight = logoWidth * (nciLogoImage.height / nciLogoImage.width);
-      const x = width - logoWidth - 15;
-      const y = height - logoHeight - 42;
+      // Center the logo in the original field area
+      const x = rect.x + (rect.width - logoWidth) / 2;
+      const y = rect.y + (rect.height - logoHeight) / 2;
       firstPage.drawImage(nciLogoImage, {
         x: x,
         y: y,