@medicus.ai/medicus-report-pdf-generator 1.3.2 → 1.3.4

package/index.js

@@ -235,7 +235,7 @@ module.exports = {
             showHeaderLogo || true
         );
 
-        const fileBuffer = await generatePDFReport({ ...html, client: reportData.client });
+        const fileBuffer = await generatePDFReport({ ...html, client: reportData.client, footer: decodedJSON?.footer });
 
         if (isDebugging) {
             console.log('3: save PDF buffer');

package/lib/wellbeing_report_generator.js

@@ -1137,6 +1137,8 @@ let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clien
 
     if (client.toLowerCase() === 'pha') {
         $('#content').append('<style>.patient-details .details-label, .patient-details .details-value { padding: 4px !important; }</style>');
+        // PHA-only: Prevent first page content from overlapping PDF footer (email/address)
+        $('#content').append('<style>body { padding-bottom: 60px !important; } #content { padding-bottom: 35px !important; } .first-section-scores { overflow: visible; clear: both; } .report-header { overflow: auto; } .row.scores-parts { clear: both; }</style>');
     }
 
     // Handle missing photo
@@ -1433,6 +1435,7 @@ let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clien
         historyData,
         profileInfo,
         language,
+        selectedLabs,
         pdfHeader: cleanStyledHeader(renderedPdfHeader, profileInfo, language, clientName, selectedLabs, showHeaderLogo)
     };
 };
@@ -1612,25 +1615,51 @@ const cleanStyledHeader = (html, profileInfo, language = 'ar', clientName = 'med
 /**
  * Get PDF footer template HTML (client-specific contact info)
  * @param {string} [client='mediclinic'] - Client identifier: 'mediclinic' | 'pha' | other
+ * @param {array} [selectedLabs=[]] - Selected divisions/labs (e.g. ['wp'], ['labcorp'])
+ * @param {object} [footerFromData] - Footer data from input (e.g. { address: "123 Main St..." }) for PHA + LabCorp
  * @returns {string} Footer template HTML
  */
-const getPdfFooterTemplate = (client = 'mediclinic') => {
+const getPdfFooterTemplate = (client = 'mediclinic', selectedLabs = [], footerFromData = null) => {
     const clientKey = (client || 'mediclinic').toLocaleLowerCase();
+    const isPhaWithWp = clientKey === 'pha' && selectedLabs?.some(lab => lab?.toLowerCase() === 'wp');
+    const isPhaWithLabcorp = clientKey === 'pha' && selectedLabs?.some(lab => lab?.toLowerCase() === 'labcorp');
+    const footerAddress = 
+    (footerFromData && typeof footerFromData === 'object' && footerFromData.address) ? String(footerFromData.address) : null;
     let contactBlock = '';
     if (clientKey === 'mediclinic') {
         contactBlock = `
                 <div style="font-family: 'Open Sans', sans-serif; font-feature-settings: 'tnum';">Telephone: 800 20 33</div>
                 <div style="font-family: 'Open Sans', sans-serif;">Email: info@mediclinic.ae</div>`;
     } else if (clientKey === 'pha') {
-        contactBlock = `
+        // PHA + LabCorp: use address from data.footer (fallback to no-address if footer missing)
+        // PHA + WP: use static footer (106 W 3rd St...)
+        // PHA + no lab: hide address (Tel + Email only)
+        if (isPhaWithLabcorp && footerAddress) {
+            contactBlock = `
+                <div style="font-family: 'Open Sans', sans-serif;">Address: ${footerAddress}</div>
+                <div style="font-family: 'Open Sans', sans-serif; font-feature-settings: 'tnum';">Tel: (877) 345-7775</div>
+                <div style="font-family: 'Open Sans', sans-serif;">Email: processing@wellness-partners.org</div>`;
+        } else if (isPhaWithWp) {
+            contactBlock = `
+                <div style="font-family: 'Open Sans', sans-serif;">Address: 106 W 3rd St, McCook, NE 69001</div>
                 <div style="font-family: 'Open Sans', sans-serif; font-feature-settings: 'tnum';">Telephone: (877) 345-7775</div>
                 <div style="font-family: 'Open Sans', sans-serif;">Email: processing@wellness-partners.org</div>`;
+        } else {
+            // PHA with no lab, or PHA + LabCorp without footer address: hide address line
+            contactBlock = `
+                <div style="font-family: 'Open Sans', sans-serif; font-feature-settings: 'tnum';">Tel: (877) 345-7775</div>
+                <div style="font-family: 'Open Sans', sans-serif;">Email: processing@wellness-partners.org</div>`;
+        }
     } else {
         contactBlock = `
                 <div style="font-family: 'Open Sans', sans-serif;">&nbsp;</div>`;
     }
+    const isPha = clientKey === 'pha';
+    const footerStyle = isPha
+        ? 'width: 100%; font-size: 6px; line-height: 1.2; color: ' + config.colors.footerText + '; padding: 0 20px 2px; box-sizing: border-box; display: flex; justify-content: space-between; align-items: center; font-family: \'Open Sans\', sans-serif;'
+        : 'width: 100%; font-size:7.3px; color: ' + config.colors.footerText + '; padding: 0 20px; box-sizing: border-box; display: flex; justify-content: space-between; align-items: center; font-family: \'Open Sans\', sans-serif;';
     return `
-        <div style="width: 100%; font-size:7.3px; color: ${config.colors.footerText}; padding: 0 20px; box-sizing: border-box; display: flex; justify-content: space-between; align-items: center; font-family: 'Open Sans', sans-serif;">
+        <div style="${footerStyle}">
             <div style="display: flex; align-items: center;font-family: 'Open Sans', sans-serif;">
                 <span style="font-style: italic; font-family: 'Open Sans', sans-serif;">Page 
                     <span class="pageNumber" style="font-family: 'Open Sans', sans-serif; font-feature-settings: 'tnum';"></span> 
@@ -1701,7 +1730,7 @@ const generatePDFReport = async (data, hideWellbeingUI = false) => {
     try {
         const contentHtml = data.html;
         const OUT_FILE = data.outputFile;
-        const footerTemplate = getPdfFooterTemplate(data.client);
+        const footerTemplate = getPdfFooterTemplate(data.client, data.selectedLabs, data.footer);
 
         // Launch browser and setup page
         const browser = await launchExtendedBrowser();
@@ -1710,7 +1739,8 @@ const generatePDFReport = async (data, hideWellbeingUI = false) => {
         // Setup content
         await setupExtendedPageContent(page, contentHtml, Pdf_file);
 
-        // Generate PDF with header and footer
+        // Generate PDF with header and footer (PHA needs larger bottom margin to prevent content overlapping footer)
+        const bottomMargin = (data.client || '').toLowerCase() === 'pha' ? '60px' : '50px';
         const buffer = await page.pdf({
             format: 'A4',
             displayHeaderFooter: true,
@@ -1719,7 +1749,7 @@ const generatePDFReport = async (data, hideWellbeingUI = false) => {
             width: "220mm",
             margin: {
                 top: '125px',
-                bottom: '50px',
+                bottom: bottomMargin,
                 left: '20px',
                 right: '20px'
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medicus.ai/medicus-report-pdf-generator",
-  "version": "1.3.02",
+  "version": "1.3.04",
   "description": "Nasco corporate report - latest update in 12/10/2023 - Fix HRC for bionext",
   "main": "index.js",
   "scripts": {

package/test.js

@@ -36,7 +36,7 @@ async function generateTestPDF() {
         true,
         client,
         "en",
-        ['wp'],
+        [],
         true
     );
 
@@ -47,11 +47,12 @@ async function generateTestPDF() {
         defaultConfig = require(configPath);
     }
 
-    // Generate the raw PDF buffer
+    // Generate the raw PDF buffer (pass data.footer for PHA + LabCorp address)
     const fileBuffer = await generatePDFReport({
         ...html,
         client: client,
         logo: defaultConfig.logo,
+        footer: data.footer,
     });
 
     // Write original PDF