@medicus.ai/medicus-report-pdf-generator 1.3.31 → 1.3.33

package/config/Pha.json

@@ -5,11 +5,11 @@
   "lifestyle_icon": "https://i.ibb.co/ZNkkF12/lifestyle-section.png",
   "mind_icon": "https://i.ibb.co/gVjxNZ7/mind-section.png",
   "bulb_icon": "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACUAAAAoCAYAAAB5ADPdAAABYWlDQ1BrQ0dDb2xvclNwYWNlRGlzcGxheVAzAAAokWNgYFJJLCjIYWFgYMjNKykKcndSiIiMUmB/yMAOhLwMYgwKicnFBY4BAT5AJQwwGhV8u8bACKIv64LMOiU1tUm1XsDXYqbw1YuvRJsw1aMArpTU4mQg/QeIU5MLikoYGBhTgGzl8pICELsDyBYpAjoKyJ4DYqdD2BtA7CQI+whYTUiQM5B9A8hWSM5IBJrB+API1klCEk9HYkPtBQFul8zigpzESoUAYwKuJQOUpFaUgGjn/ILKosz0jBIFR2AopSp45iXr6SgYGRiaMzCAwhyi+nMgOCwZxc4gxJrvMzDY7v",
-  "first-level-color": "#A43B2F",
-  "second-level-color": "#ED6D59",
-  "third-level-color": "#F4A837",
-  "forth-level-color": "#F8E242",
-  "fifth-level-color": "#02D9D1",
+  "first-level-color": "#EF4444",
+  "second-level-color": "#EF4444",
+  "third-level-color": "#F59E0B",
+  "forth-level-color": "#F59E0B",
+  "fifth-level-color": "#10B981",
   "score-header-color": "#0F2062",
   "score-description-color": "#0F2062",
   "svg-icon-color": "#2D4A8C",
@@ -17,7 +17,7 @@
   "section-title-border-color": "#0F2062",
   "first-section-scores-border-color": "#0F2062",
   "general-font-color": "#A43B2F",
-  "disclaimer-text-color": "rgba(15, 32, 98, 0.3)",
+  "disclaimer-text-color": "#000000",
   "top-box-background": "#f0f4ff",
   "footer-background": "rgba(15, 32, 98, 0.14)",
   "footer-border-color": "#0F2062",

package/lib/corporate_report_generator.js

@@ -7,7 +7,7 @@ const path = require("path");
 const LocaleService = require('../app/services/localeService.js');
 const i18n = require('../app/i18n_wellbeing.config.js');
 const puppeteer = require("puppeteer");
-const hummus = require('hummus');
+const hummus = require('muhammara');
 const memoryStreams = require('memory-streams');
 
 var localeService = new LocaleService(i18n);

package/lib/pdf_generator.min.js

@@ -1,6 +1,6 @@
 "use strict";
 const fs = require("fs"), {promisify: promisify} = require("util"), {JSDOM: JSDOM} = require("jsdom"),
-    fetch = require("node-fetch"), hummus = require("hummus"), memoryStreams = require("memory-streams"),
+    fetch = require("node-fetch"), hummus = require("muhammara"), memoryStreams = require("memory-streams"),
     path = require("path"), LocaleService = require("../app/services/localeService.js"),
     i18n = require("../app/i18n.config.js"), puppeteer = require("puppeteer");
 var Chart = require("chart.js"), QRCode = require("qrcode"), localeService = new LocaleService(i18n);

package/lib/wellbeing_report_generator.js

@@ -60,6 +60,24 @@ let debugLog = (val1, val2 = "") => {
 }
 
 
+// PHA-only: grey report text is hard to read when printed, so it renders black. Status and
+// chart colours are not listed here, and neither are the .title of a status-coloured card or
+// an .insight-content with an inline colour (the theme already sets it).
+const PHA_BLACK_TEXT_STYLE = '<style>' + [
+    '.html-content', '.html-content *', '.card', '.stats-card', '.section-content', '.insight-content:not([style*="color"])',
+    '.insight-disclaimer', '.details-label', '.details-label *', '.details-value',
+    '.info-label', '.info-value', '.info-title', '.client-name',
+    '.panel-title', '.panel-title-text', '.resume-title', '.report-title', '.panel-subtitle',
+    '.panel-subtitle-item', '.panel-biomarker-title', '.panel-sample', '.bio-name-info',
+    '.card:not(.darkred):not(.dark-red):not(.red):not(.orange):not(.yellow):not(.light-blue):not(.lightblue):not(.blue) .title',
+    '.biom-method', '.method-type', '.lab-info', '.biom-past', '.biom-last', '.biom-range',
+    '.biom-past-data', '.biom-last-data', '.biom-range-data', '.parent-reference-range', '.child-referene-range',
+    '.biom-bar .labels td', '.biom-bar .labels td span:not(.colorable)', '.biom-bar .values td', '.biom-sample-value', '.related .label',
+    '.biomarker-notes', '.biomarker-notes span', 'tr.labels td span:not(.colorable)', 'tr.values td',
+    '.speedometer-value-up', '.speedometer-value-up *', '.speedometer-value-down', '.needle-value', '.needle-value *',
+    '.score-list', '.chunk-text', '.score-subtext', '.disclaimer-text', '.question-title'
+].join(',') + '{color:#000 !important}.speedometer-value-down{opacity:1 !important}</style>';
+
 // Config object to hold all configuration values
 let config = {
     logo: "",
@@ -104,13 +122,13 @@ const loadColorTheme = (clientName = 'default') => {
             warningIcon: '#ffc107'
         },
         pha: {
-            headerText: '#2C3E50',
+            headerText: '#000000',
             headerBackground: '#ECF0F1',
             headerDivider: '#0F2062',
-            footerText: '#95A5A6',
+            footerText: '#000000',
             listIcon: '#7F8C8D',
             insightPrimary: '#0F2062',
-            insightSecondary: '#2C3E50',
+            insightSecondary: '#000000',
             warningIcon: '#F39C12'
         },
         nasco: {
@@ -1281,6 +1299,7 @@ let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clien
     $('#content').append(dynamicStyles);
 
     if (client.toLowerCase() === 'pha') {
+        $('#content').append(PHA_BLACK_TEXT_STYLE);
         // PHA-only: compact patient info table to reduce total height.
         $('#content').append('<style>.patient-details .details-column { gap: 2px !important; } .patient-details .details-row { margin-top: 2px !important; } .patient-details .details-label, .patient-details .details-value { padding: 2px 6px !important; }</style>');
         // PHA-only: Prevent first page content from overlapping PDF footer (email/address)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medicus.ai/medicus-report-pdf-generator",
-  "version": "1.3.31",
+  "version": "1.3.33",
   "description": "Nasco corporate report - latest update in 12/10/2023 - Fix HRC for bionext",
   "main": "index.js",
   "scripts": {
@@ -13,17 +13,14 @@
     "babel-register": "^6.26.0",
     "big-text.js": "^1.0.1",
     "body-parser": "^1.18.3",
-    "canvas": "^2.11.2",
-    "canvas-constructor": "^3.2.0",
     "chart.js": "^2.7.3",
     "express": "^4.16.4",
-    "get-canvas-context": "^1.0.2",
-    "hummus": "1.0.111",
     "i18n": "^0.8.3",
     "i18n-nodejs": "^3.0.0",
     "jquery": "^3.3.1",
-    "jsdom": "^13.1.0",
+    "jsdom": "^16.7.0",
     "memory-streams": "^0.1.3",
+    "muhammara": "6.0.6",
     "node-fetch": "^2.3.0",
     "node-pdftk": "^2.0.2",
     "node-qpdf2": "^6.0.0",
@@ -43,5 +40,11 @@
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "webpack": "^4.28.4"
+  },
+  "allowScripts": {
+    "puppeteer": true,
+    "muhammara": true,
+    "core-js": false,
+    "fsevents": false
   }
 }