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

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/index.js

@@ -94,9 +94,7 @@ module.exports = {
         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 LOGS = '';
         let LOGS_FILE_PATH = __dirname + '/output/LOGS.txt';
         let PDF_FILE_PATH = __dirname + '/output/nasco-sample.pdf';
@@ -170,6 +168,7 @@ module.exports = {
             else{
                 let xorEncrypted = encryptDecrypt.XOREncrypt(base64data, encryptionKey)
                 let ecbEncrypted = encryptDecrypt.ecbEncrypt(xorEncrypted.toString(), encryptionKey)
+                console.log("ecbEncrypted",ecbEncrypted)
                 return ecbEncrypted;
             }
 

package/lib/encrypt_decrypt.js

@@ -1,5 +1,5 @@
 const CryptoJS = require('crypto-js');
-var atob = require('atob');
+let atob = require('atob');
 
 function ecbEncrypt(data, key) {
     let encJson = CryptoJS.AES.encrypt(JSON.stringify(data), key).toString();

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.233",
+  "description": "Nasco corporate report - latest update in 17/11/2023 - Decrypt/Encrypt Nasco report",
   "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",

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;
-}