@medicus.ai/medicus-report-pdf-generator 1.0.231 → 1.0.232

package/assets/corporate_report/css/report.css

@@ -34,16 +34,14 @@ body {
 
 .participant-analytics-section.single-section.page {
     background-color: #fff;
-    margin-top: -20px;
+    margin-top: -65px;
 }
 
 .bottom-section {
     display: block;
     width: 100%;
-    page-break-inside: avoid;
+
     float: left;
-    margin-top:3%;
-    page-break-before: avoid;
 }
 
 .page .relations-section-container {
@@ -228,7 +226,9 @@ td.bar-title span {
     color: rgb(51, 51, 51);
     text-align: right;
     direction: ltr;
+    text-transform: capitalize
 }
+
 /*
 .participant-analytics-section .container .side-chart-container:nth-child(odd) .bar-title span {
     text-align: left;
@@ -390,23 +390,19 @@ td {
 }
 
 .relations-section .single-relation {
-    width: 48.5%;
+    width: 30%;
     float: left;
     padding: 1% 1% 0% 1%;
     box-sizing: border-box;
     color: rgb(0, 0, 153);
     margin-right: 3%;
-    margin-bottom: 3%;
-}
-.relations-section .single-relation:nth-child(even){
-    margin-right: 0
 }
-/*
+
 .relations-section .single-relation:nth-child(4n) {
     margin-right: 5%;
     width: 30%;
 }
-*/
+
 .relation-title {
     font-weight: 600;
     font-size: 83%;
@@ -449,14 +445,12 @@ table.data-by-gender {
     margin-top: 3%;
     float: left;
     text-align: left;
-    font-size: 85%;
+    font-size: 91%;
     border-spacing: 0;
     margin-bottom: 6%;
     page-break-inside: avoid;
 }
-table.data-by-gender tr th{
-    font-size: 12px;
-}
+
 table.data-by-gender tr th:first-child {
     width: 20%;
 }
@@ -465,9 +459,6 @@ table.data-by-gender tr td {
     color: rgb(51, 51, 51);
     font-size: 80%;
 }
-table.data-by-gender tr:first-child td{
-    border-bottom: 1px solid #5F9CC8;
-}
 
 table.data-by-gender th {
     color: rgb(139, 139, 167);
@@ -479,33 +470,19 @@ table.data-by-gender th {
 table.data-by-gender tbody tr:first-child td {
     color: rgb(139, 139, 167);
     font-weight: 600;
-    font-size: 8px;
-}
-table.data-by-gender tbody tr:first-child td:first-child{
-    color: rgba(51, 51, 51, 1) !important;
-    font-weight: 600;
-    font-size: 10px;
+    font-size: 9px;
 }
+
 table.data-by-gender td, table.data-by-gender th {
     padding: 4px;
 }
-table.data-by-gender th:nth-child(2),
-table.data-by-gender th:nth-child(3){
-    text-align: center;
-}
-table.data-by-gender th:nth-child(2),
-table.data-by-gender th:nth-child(3),
-table.data-by-gender tbody tr td:nth-child(6),
-table.data-by-gender tbody tr td:nth-child(11){
-    border-right: 1px solid rgba(98, 142, 171, 1)
+
+table.data-by-gender tbody tr:nth-child(even) {
+    background-color: rgb(237, 237, 248);
 }
 
 table.data-by-gender tr td:last-child {
     text-align: center;
-    color:rgba(98, 142, 171, 1)
-}
-table.data-by-gender tr td:not(:first-child) {
-    text-align: center;
 }
 
 .recommends-section {
@@ -519,7 +496,6 @@ table.data-by-gender tr td:not(:first-child) {
     transform: skewY(3deg);
     border-top-right-radius: 20px;
     border-bottom-right-radius: 20px;
-    page-break-inside: avoid;
 }
 
 .recommends-section-content {

package/assets/corporate_report/css/report_rtl.css

@@ -18,10 +18,6 @@ body {
     padding-left: 50px;
 }
 
-.side-chart-container {
-    float: right;
-}
-
 td.bar-title {
     width: 35.7%;
     border-right: 1px solid;

package/config/sanusx.json

@@ -20,12 +20,12 @@
     "corporate_report":{
       "logo": "data:image/png;base64,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",
       "main_color": "rgb(23, 107, 97)",
-      "report_date_color": "rgba(98, 142, 171, 1)",
+      "report_date_color": "rgb(139, 139, 167)",
       "section_title_color": "rgb(23, 107, 97)",
       "section_title_border_color": "rgb(112, 162, 147)",
       "chart_title": "rgb(139, 139, 167)",
       "summary_background":"#e5f5fc",
-      "relation_content_border_color":"rgba(98, 142, 171, 1)",
+      "relation_content_border_color":"rgba(0, 0, 153, 0.3)",
       "relation_content_bg":"#f2f2ff",
       "table_tr_even_bg":"rgb(237, 237, 248)",
       "recommends_bg":"rgba(0, 0, 153, 0.05)",

package/index.js

@@ -5,8 +5,6 @@ const {fork} = require('child_process');
 const {join} = require('path');
 const {sendNascoEmail, sendEmailNotification} = require('./lib/sendEmail')
 const {generatePDFCorporateReport, generateHTMLCorporateReport} = require('./lib/corporate_report_generator')
-const encryptDecrypt = require('./lib/encrypt_decrypt');
-
 module.exports = {
     generateHTMLStaging,
     generateMedicusPDF: async (base64Object, isDebugging, isDownloadable, onlyHTML) => {
@@ -89,14 +87,8 @@ module.exports = {
 
     },
     generateNascoPDF: async (data, isDebugging, isDownloadable, shouldSendEmail) => {
-
         let reportData = JSON.parse(data)
-        let encryptionKey=reportData.encryptionKey
-        let sentData=reportData.data
-        let ecbDecrypted = encryptDecrypt.ecbDecrypt(sentData, encryptionKey)
-
-        let xorDecrypted = encryptDecrypt.XORDecrypt(ecbDecrypted.toString(), encryptionKey)
-        console.log("xorDecrypted",xorDecrypted)
+        let base64Object = reportData.data
         let LOGS = '';
         let LOGS_FILE_PATH = __dirname + '/output/LOGS.txt';
         let PDF_FILE_PATH = __dirname + '/output/nasco-sample.pdf';
@@ -122,11 +114,18 @@ module.exports = {
         if (isDebugging) {
             console.log('2: save json string');
             LOGS += '2: save json string' + '\n' + '=============' + '\n';
-            LOGS += xorDecrypted + '\n\n\n';
+            LOGS += base64Object + '\n\n\n';
+        }
+        // 2: save decoded json string
+        const json = Buffer.from(base64Object, 'base64').toString('utf8');
+        if (isDebugging) {
+            console.log('2: save decoded json string');
+            LOGS += '2: save decoded json string' + '\n' + '=============' + '\n';
+            LOGS += json + '\n\n\n';
         }
 
         // 3: save decoded json
-        const decodedJSON = JSON.parse(xorDecrypted);
+        const decodedJSON = JSON.parse(json);
         if (isDebugging) {
             console.log('3: save decoded json string')
             LOGS += '3: save decoded json' + '\n' + '=============' + '\n';
@@ -166,13 +165,9 @@ module.exports = {
             return fileBuffer;
         } else {
             if (shouldSendEmail)
-                return await sendNascoEmail(decodedJSON, PDF_FILE_PATH, mailConfig,reportData.client)
-            else{
-                let xorEncrypted = encryptDecrypt.XOREncrypt(base64data, encryptionKey)
-                let ecbEncrypted = encryptDecrypt.ecbEncrypt(xorEncrypted.toString(), encryptionKey)
-                return ecbEncrypted;
-            }
-
+               return await sendNascoEmail(decodedJSON, PDF_FILE_PATH, mailConfig,reportData.client)
+            else
+                return base64data;
         }
     },
     sendEmail: async (json) => {
@@ -218,7 +213,7 @@ module.exports = {
 
 
         let html = await generateHTMLCorporateReport(decodedJSON, isDebugging);
-
+        
 
         // 3: save PDF buffer
         let fileBuffer = await generatePDFCorporateReport(html);

package/lib/corporate_report_generator.js

@@ -141,7 +141,7 @@ let generateHTMLCorporateReport = async (data, isDebugging) => {
         '.element-summary-text,.summary-bg{background: ' + summary_background + ' !important;}' +
         '.relation-content,table.data-by-gender th{border-color: ' + relation_content_border_color + ' !important;}' +
         '.relation-content{background: ' + relation_content_bg + ' !important;}' +
-        //  'table.data-by-gender tbody tr:nth-child(even){background-color: ' + table_tr_even_bg + ' !important;}' +
+        'table.data-by-gender tbody tr:nth-child(even){background-color: ' + table_tr_even_bg + ' !important;}' +
         '.report-date,table.data-by-gender th,table.data-by-gender tbody tr:first-child td,.sources-title{color: ' + report_date_color + ' !important;}' +
         '.recommends-section{background: ' + recommends_bg + ' !important;}' +
 
@@ -174,7 +174,7 @@ let generateHTMLCorporateReport = async (data, isDebugging) => {
             }
             /*check relations*/
             if (!empty(element.relations)) {
-                console.log("element.relations", element.relations.length)
+                console.log("element.relations",element.relations.length)
                 element.relations.map((relation) => {
                     $("#" + pageId + " .relations-section-container .relations-section-titles").append("<div class='single-relation'>" +
                         "<div class='relation-title'>" + relation.title + "</div>" +
@@ -197,18 +197,10 @@ let generateHTMLCorporateReport = async (data, isDebugging) => {
                 })
                 tabelHeaderHTML += '</thead>'
                 let tabelBody = element.dataByGender.slice(1)
-                let dataByGenderHTML = '<tbody>';
-                let countTrs = 0
+                let dataByGenderHTML = '<tbody>'
                 tabelBody.map((genderData) => {
-                    countTrs = countTrs + 1;
                     dataByGenderHTML += "<tr>"
-                    let CountTds = 0
                     genderData.map((td) => {
-                        CountTds++;
-                        let colSpan = 1
-                        if (CountTds === 1 && countTrs ===1) {
-                            colSpan = 2
-                        }
                         dataByGenderHTML += "<td>" + td.value + "</td>"
                     })
                     dataByGenderHTML += "</tr>"
@@ -217,7 +209,7 @@ let generateHTMLCorporateReport = async (data, isDebugging) => {
                 $("#" + pageId + " .data-by-gender").append(tabelHeaderHTML);
                 $("#" + pageId + " .data-by-gender").append(dataByGenderHTML);
             } else {
-                 $("#" + pageId + " .data-by-gender").remove();
+                $("#" + pageId + " .data-by-gender").remove();
             }
 
             if (!empty(element.recommends)) {
@@ -317,7 +309,7 @@ let generatePDFCorporateReport = async (data) => {
             displayHeaderFooter: true,
             margin: {
                 top: 0,
-                bottom: 80,
+                bottom: 60,
                 right: 0,
                 left: 0
             },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@medicus.ai/medicus-report-pdf-generator",
-  "version": "1.0.231",
-  "description": "Nasco corporate report - latest update in 2/11/2022 - Fix sanusx coprorate report issues",
+  "version": "1.0.232",
+  "description": "Nasco corporate report - latest update in 17/11/2023 - Fix sanusx coprorate report issues",
   "main": "index.js",
   "scripts": {
     "start": "node index.js"
@@ -16,7 +16,6 @@
     "canvas": "^2.6.1",
     "canvas-constructor": "^3.2.0",
     "chart.js": "^2.7.3",
-    "crypto-js": "^4.1.1",
     "express": "^4.16.4",
     "get-canvas-context": "^1.0.2",
     "hummus": "1.0.111",
@@ -36,7 +35,6 @@
   },
   "devDependencies": {
     "@babel/core": "^7.2.2",
-    "atob": "^2.1.2",
     "babel-core": "^6.26.3",
     "babel-loader": "^8.0.5",
     "babel-polyfill": "^6.26.0",

package/templates/corporate_report/page.html

@@ -12,6 +12,7 @@
             <div class="relations-section relations-section-content"></div>
         </div>
         <table class="data-by-gender">
+
         </table>
         <div class="bottom-section">
             <div class="recommends-section">

package/assets/xorcrypt12.js

@@ -1,217 +0,0 @@
-/*
-This Javascript will en/decrypt a string using the HTML XOR algorithim
-XORCRYPT Version 1.2
-
-This version is much faster because it does not use Base64 encoding.
-It is also more difficult to crack, because the key is as long as the
-password, and the only way to hack it is to try every possible password.
-
-The latest version has some small bugs cleaned up, reorganized decrypt
-sequence and is now crossplatform, crossbrowser compatible, with the
-exception of Netscape 2.X. It would be possible to make it compatible
-with Netscape 2.X, but I see no point.
-
-For more information on this very simple algorithim email me.
-
-This script was written by:
-Evan Jones, 1997
-jonesev@home.com
-You may use this script any way you wish as long as you email me and let me know.
-*/
-
-/* Create the encrypt table */
-// The last char in the table is always the escape code
-// The table is not quite 128 chars, it is 95 (minus the escape char)
-// Values 93-127 must be escaped
-
-var cryptTable=new String(" ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789	!@#$%^&*()`'-=[];,./?_+{}|:<>~");
-var cryptLength=new Number(cryptTable.length-1) //93 Chars
-var escapeChar=cryptTable.charAt(cryptLength); // The escape code is ~
-
-var lineFeed="\n"; //The linefeed char - escaped to double escapeChar
-var doubleQuote='"'; //Double quotes are escaped to ~'
-var clearMessage=new Number(5000); //The number of ms to wait to clear the status bar message
- 
-/* This function uses the key and encrypts a string with the password */
-// Encryption strips all linefeeds - but they are replaced upon decrypt
-function encrypt(input, password)
-{
-var inChar, inValue, outValue;
-
-var output="";
-var arNumberPw = new Array();
-
-var pwLength=password.length;
-var inLength=input.length;
-
-var stopStatus=Math.round(inLength/10);
-var statusBar=0;
-
-for (var pwIndex=0; pwIndex<pwLength; pwIndex++)
-	{
-	arNumberPw[pwIndex]=cryptTable.indexOf(password.charAt(pwIndex));
-	}
-
-/* XOR all the chars */
-for (var inIndex=0, pwIndex=0; inIndex<inLength; inIndex++, pwIndex++)
-	{
-	if (pwIndex==pwLength) //Make sure the password index is in range
-		{
-		pwIndex=0;
-		}
-	
-	/* Get the input */
-
-	inChar=input.charAt(inIndex)
-	inValue=cryptTable.indexOf(inChar);
-
-	/* Conversion/Escaping Sequence */
-	// If the outValue is in the character map, encode it
-		// If the encoded value is outside the character map, escape it
-		// Else convert it to a char
-	// If the input char is a linefeed, escape it
-	// If the input char is a double quote, escape it
-	// If the input char wasn't found, pass it through
-
-	if (inValue!=-1)
-		{
-		outValue=arNumberPw[pwIndex] ^ inValue;
-		if (outValue>=cryptLength)
-			{
-			outValue=escapeChar+cryptTable.charAt(outValue-cryptLength);
-			}
-		else outValue=cryptTable.charAt(outValue);
-		}	
-	else if (inChar=="\r")
-		{
-		outValue=escapeChar+escapeChar;
-		if (input.charAt(inIndex+1)=="\n") inIndex++; //If it is a 2 char linefeed skip next one
-		}
-	else if (inChar=="\n")
-		{
-		outValue=escapeChar+escapeChar;
-		}
-	else if (inChar==doubleQuote)
-		{
-		outValue=escapeChar+"'";
-		}
-	else
-		{
-		outValue=inChar;
-		}
-
-	output+=outValue; //Output the char
-
-	/* Status bar progress indicator */
-
-	if (inIndex>=statusBar)
-		{
-		window.status=inIndex+"/"+inLength+" characters decrypted ("+Math.round(inIndex/inLength*100)+"%)";
-		statusBar+=stopStatus;
-		}
-	}
-
-window.status=inLength+"/"+inLength+" characters encrypted (100%)";
-setTimeout("window.status=''", clearMessage);
-
-return output;
-}
-
-
-/* This function uses the key and encrypts a string with the password */
-
-function decrypt(input, password)
-{
-var inChar, inValue, outValue, escape=false;
-
-var output="";
-var arNumberPw = new Array();
-
-var pwLength=password.length;
-var inLength=input.length;
-
-var stopStatus=Math.round(inLength/10);
-var statusBar=0;
-
-for (var pwIndex=0; pwIndex<pwLength; pwIndex++)
-	{
-	arNumberPw[pwIndex]=cryptTable.indexOf(password.charAt(pwIndex));
-	}
-
-/* XOR all the chars */
-for (var inIndex=0, pwIndex=0; inIndex<inLength; inIndex++, pwIndex++)
-	{
-	if (pwIndex>=pwLength) //Make sure the password index is in range
-		{
-		pwIndex=0;
-		}
-	
-	/* Get the input */
-	inChar=input.charAt(inIndex);
-	inValue=cryptTable.indexOf(inChar);
-
-	/* Decrypting/Unescaping Sequence */
-	// If the input char wasn't found, pass it through (error checking)
-	// If the last char was an escapeChar
-		//And the input is an escapeChar, output a linefeed
-		//Or the input is a single quote, output a double quote
-		//Otherwise just add the cryptLength to the inValue
-		//Turn escape off
-	// If the inValue hasn't been coverted to an outValue yet
-		// If the inChar is an escapeChar, turn escape on
-		// Otherwise decrypt the encrypted character
-	
-	if (inValue==-1)
-		{
-		outValue=inChar;
-		}	
-
-	else if (escape)
-		{
-		if (inValue==cryptLength)
-			{
-			outValue=lineFeed;
-			inValue=-1;
-			}
-		else if (inChar=="'")
-			{
-			outValue=doubleQuote;
-			inValue=-1;
-			}
-		else
-			{
-			inValue+=cryptLength;
-			}
-		escape=false;
-		}
-	else if (inValue==cryptLength)
-		{
-		escape=true;
-		pwIndex--; //Stop the password from incrementing
-		outValue="";
-		inValue=-1;
-		}
-
-	if (inValue!=-1)
-		{
-		outValue=cryptTable.charAt(arNumberPw[pwIndex] ^ inValue);
-		}
-	
-	/* Output */
-
-	output+=outValue;
-
-	/* Status bar progress indicator */
-
-	if (inIndex>=statusBar)
-		{
-		window.status=inIndex+"/"+inLength+" characters decrypted ("+Math.round(inIndex/inLength*100)+"%)";
-		statusBar+=stopStatus;
-		}
-	}
-
-window.status=inLength+"/"+inLength+" characters decrypted (100%)";
-setTimeout("window.status=''", clearMessage);
-
-return output;
-}

package/lib/encrypt_decrypt.js

@@ -1,58 +0,0 @@
-const CryptoJS = require('crypto-js');
-var atob = require('atob');
-
-function ecbEncrypt(data, key) {
-    let encJson = CryptoJS.AES.encrypt(JSON.stringify(data), key).toString();
-    return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encJson));
-}
-
-function ecbDecrypt(data, key) {
-    var keys = CryptoJS.enc.Utf8.parse(key);
-    let base64 = CryptoJS.enc.Base64.parse(data);
-    let src = CryptoJS.enc.Base64.stringify(base64);
-    var decrypt = CryptoJS.AES.decrypt(src, keys, {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7});
-    return decrypt.toString(CryptoJS.enc.Utf8);
-}
-
-
-function XORDecrypt(input, key) {
-    var decodedText = atob(input);
-    var plainText = '';
-    var length = decodedText.length;
-
-    for (var i = 0; i < length; i++) {
-        plainText += String.fromCharCode(decodedText.charCodeAt(i) ^ key.charCodeAt(Math.floor(i % key.length)));
-    }
-
-    return plainText;
-}
-
-function XOREncrypt(input, key){
-    var c = '';
-    while (key.length < input.length) {
-        key += key;
-    }
-    for(var i=0; i<input.length; i++) {
-        var value1 = input[i].charCodeAt(0);
-        var value2 = key[i].charCodeAt(0);
-
-        var xorValue = value1 ^ value2;
-
-        var xorValueAsHexString = xorValue.toString("16");
-
-        if (xorValueAsHexString.length < 2) {
-            xorValueAsHexString = "0" + xorValueAsHexString;
-        }
-
-        c += xorValueAsHexString;
-    }
-    return c;
-}
-
-module.exports =
-    {
-        ecbEncrypt,
-        ecbDecrypt,
-        XORDecrypt,
-        XOREncrypt
-    }