@medicus.ai/medicus-report-pdf-generator 1.0.242 → 1.0.244

package/index.js

@@ -2,8 +2,6 @@ const {generateHTMLStaging, generatePDF, generatePatientQR} = require("./lib/pdf
 const {generateHTMLWellbeingReport, generatePDFWellbeingReport} = require("./lib/wellbeing_report_generator");
 const {generateSanusXReport, generateHTMLSanusXReport} = require("./lib/sanusx_report_generator");
 const fs = require('fs');
-const {fork} = require('child_process');
-const {join} = require('path');
 const {sendNascoEmail, sendEmailNotification} = require('./lib/sendEmail')
 const {generatePDFCorporateReport, generateHTMLCorporateReport} = require('./lib/corporate_report_generator')
 module.exports = {
@@ -93,7 +91,9 @@ module.exports = {
         let LOGS = '';
         let LOGS_FILE_PATH = __dirname + '/output/LOGS.txt';
         let PDF_FILE_PATH = __dirname + '/output/nasco-sample.pdf';
-
+        if (reportData.client === 'sanusx') {
+            PDF_FILE_PATH = __dirname + '/output/sanusx-sample.pdf';
+        }
         let mailConfig = {
             host: reportData.host,
             port: reportData.port,
@@ -133,30 +133,14 @@ module.exports = {
             LOGS += '3: save decoded json' + '\n' + '=============' + '\n';
             LOGS += decodedJSON + '\n\n\n';
         }
-        let  html = await generateHTMLSanusXReport(decodedJSON, isDebugging, reportData.client, reportData.language);
-
-
-        console.log("shouldSendEmail", shouldSendEmail)
-        // 3: save PDF buffer
-        let  fileBuffer = await generateSanusXReport(html);
-
-        if (isDebugging) {
-            console.log('3: save PDF buffer')
-            LOGS += '3: save PDF buffer' + '\n' + '=============' + '\n';
-            LOGS += fileBuffer + '\n\n\n';
-        }
-
-        console.log("PDF_FILE_PATH", PDF_FILE_PATH)
-        fs.writeFileSync(PDF_FILE_PATH, fileBuffer, 'utf8');
-
-        // 4: save encoded base64
-        const base64data = Buffer.from(fileBuffer, 'utf8').toString('base64');
-        if (isDebugging) {
-            console.log('4: save encoded base64');
-            LOGS += '4: save encoded base64' + '\n' + '=============' + '\n';
-            LOGS += base64data + '\n\n\n';
+        let html
+        if (reportData.client === 'sanusx') {
+            html = await generateHTMLSanusXReport(decodedJSON, isDebugging, reportData.client, reportData.language);
+        } else {
+            html = await generateHTMLWellbeingReport(decodedJSON, isDebugging, reportData.client, reportData.language);
         }
 
+        console.log("shouldSendEmail", shouldSendEmail)
 
         // 5: save logs to file
         fs.writeFileSync(LOGS_FILE_PATH, LOGS, 'utf8');
@@ -165,7 +149,7 @@ module.exports = {
         }
 
         if (isDownloadable) {
-            return fileBuffer;
+            return html;
         } else {
             if (shouldSendEmail)
                 return await sendNascoEmail(decodedJSON, PDF_FILE_PATH, mailConfig, reportData.client)

package/lib/sanusx_report_generator.js

@@ -93,18 +93,11 @@ let generateHTMLSanusXReport = async (data, isDebugging, clientName, language) =
 
 
     let client = clientName ? clientName : 'default'
-    let pathFile = path.resolve(__dirname + '/../config/' + client + '.json');
-    let defaultConfig = require('../config/default.json');
-    if (fs.existsSync(pathFile)) {
-        defaultConfig = require('../config/' + client + '.json');
-    }
-
+    let defaultConfig = require('../config/sanusx.json');
     logo = defaultConfig['logo'];
-  //  language='de'
 
     /*check if the language is an RTL language*/
     localeService.setLocale(language);
-    console.log("localeService.getLocales()",localeService.getLocales())
     debugLog("pdf language:", language);
 
     /*choose the right template*/
@@ -272,7 +265,6 @@ let generateHTMLSanusXReport = async (data, isDebugging, clientName, language) =
     let mindTips = []
     let bodyTips = []
     tips.map((tip, index) => {
-        console.log("index tip", index)
         if (index === 0) {
             lifeStyleTips.push(tip)
         }
@@ -346,13 +338,6 @@ let generateHTMLSanusXReport = async (data, isDebugging, clientName, language) =
     }
     await promisify(fs.writeFile)(OUT_FILE, dom.serialize());
 
-
-    let REQUEST_OUTPUT_DIRECTORY = path.resolve(`${__dirname}/../output/request`);
-    if (!fs.existsSync(REQUEST_OUTPUT_DIRECTORY)) {
-        fs.mkdirSync(REQUEST_OUTPUT_DIRECTORY)
-    }
-
-    console.log("OUT_FILE", OUT_FILE)
     return {
         "html": dom.serialize(),
         "outputFile": OUT_FILE,
@@ -420,66 +405,11 @@ let generateSanusXReport = async (data) => {
     }
 };
 
-const isEmpty = (obj) => {
-    for (let key in obj) {
-        if (obj.hasOwnProperty(key))
-            return false;
-    }
-    return true;
-}
 
 const empty = (value) => {
     return (typeof value === "undefined" || typeof value === 'undefined' || typeof value === undefined || value === null || value === '' || value === "" || value.length === 0 || value === 'undefined');
 }
 
-const renderDetails = (list) => {
-    if (list.length === 1 && empty(list[0].children)) {
-        return (
-            `<li>${list[0].content.substring(list[0].sepCount, list[0].content.length + 1)}</li>`
-        )
-    }
-
-    let columns = []
-    let isParent = false
-
-    list.map((child, index) => {
-        if (child.parent_id === "0")
-            isParent = true
-
-        let div = '';
-        if (empty(child.children)) {
-            div = `<li>`
-                +
-                `${child.content.substring(child.sepCount, child.content.length + 1)}`
-                +
-                `</li>`
-        } else {
-            div = `<li>`
-                +
-                `${child.content.substring(child.sepCount, child.content.length + 1)}`
-                +
-                `</li>`
-                +
-                `<ul>` +
-                `${renderDetails(child.children)}`
-                + `</ul>`
-        }
-
-
-        if (!empty(div))
-            columns.push(
-                div
-            )
-
-    })
-
-    let results = ''
-    columns.map((tabel) => {
-        if (!empty(tabel))
-            results += tabel
-    })
-    return !empty(columns) ? `${results}` : null
-}
 
 let renderInsightTips = (tips, elementScores) => {
     let lifeHighScore, bodyHighScore, mindHighScore
@@ -492,7 +422,6 @@ let renderInsightTips = (tips, elementScores) => {
         tips.map((tip, index) => {
             let tipTitle = ''
             let insightClass = '';
-            let tipsTextClass = ''
             let score = 0
             let name = tip[0]['icon'].split(".png", [1]);
             let tipImage = icons[name];
@@ -515,7 +444,7 @@ let renderInsightTips = (tips, elementScores) => {
             let roundScore = Math.round(score / 2)
             let score_segments = Math.round(score / 2) + "/5"; // get score between 1 and 5
             let line1Class, line2Class, line3Class, line4Class, line5Class = ''
-            console.log("roundScore", roundScore)
+
             if (roundScore === 1 || roundScore > 1) {
                 line1Class = 'highlighted highlight-1'
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medicus.ai/medicus-report-pdf-generator",
-  "version": "1.0.242",
+  "version": "1.0.244",
   "description": "Nasco corporate report - latest update in 5/3/2023 - New design for SanusX PDF",
   "main": "index.js",
   "scripts": {