@medicus.ai/medicus-report-pdf-generator 1.0.364 → 1.0.366

package/assets/Mediclinic/css/nasco_report.css

@@ -1,15 +1,14 @@
 body {
   margin: 0;
   padding: 0;
-  /*background: url(../../wellbeing/images/report-sample.png);*/
-  /*background-repeat: no-repeat;*/
-  /*background-size: 211mm;*/
-  /*background-position: center top;*/
   box-sizing: border-box;
   width: 240mm;
   height: 297mm;
   margin: auto;
   font-family: "Open Sans", sans-serif;
+  font-feature-settings: normal !important;
+  -webkit-font-feature-settings: normal !important;
+  -moz-font-feature-settings: normal !important;
 }
 
 html {
@@ -3727,7 +3726,7 @@ div[key="mind"] .score-details-title {
   padding: 7px;
   font-size: 13px;
   display: flex;
-  align-items: center; /* 👈 center text vertically */
+  align-items: center;
 }
 
 .details-label {

package/assets/Mediclinic/css/nasco_report_rtl.css

@@ -1,7 +1,22 @@
 body {
+    font-family: 'Cairo',serif !important;
     direction: rtl;
+    font-feature-settings: normal !important;
+    -webkit-font-feature-settings: normal !important;
+    -moz-font-feature-settings: normal !important;
 }
 
+.biom-unit .biom-parent-unit.unit-text {
+    direction: rtl !important;
+    white-space: nowrap;
+}
+
+.biom-unit .biom-parent-unit.unit-text {
+    direction: rtl !important;
+    white-space: nowrap;
+}
+
+
 .span.bio-name-info{
   direction: ltr;
   text-align: right;
@@ -10,17 +25,17 @@ body {
 .panel-title-text{
     direction: ltr;
     text-align: right;
-        font-family: 'Open Sans', sans-serif;
+    /*font-family: 'Open Sans', sans-serif;*/
 }
 
 .speedometer-value{
     top: 62px;
-    font-family: "Open Sans", sans-serif !important;
+    /*font-family: "Open Sans", sans-serif !important;*/
 }
 
 .speedometer-value2{
     top:37px;
-    font-family: "Open Sans", sans-serif !important;
+    /*font-family: "Open Sans", sans-serif !important;*/
 }
 
 .biom-bar.big .labels td{
@@ -38,7 +53,8 @@ body {
 .score-text {
     color: #124374;
     font-size: 12px;
-    font-family: "Open Sans", sans-serif !important;
+    font-family: "Cairo", sans-serif !important;
+    letter-spacing: -0.5px;
     font-weight: 400;
     word-wrap: break-word;
     margin-left: 0;
@@ -76,7 +92,7 @@ body {
 }
 
 .info-value{
-    font-family: "Open Sans", sans-serif !important;
+    /*font-family: "Open Sans", sans-serif !important;*/
     padding: 0;
 }
 
@@ -463,7 +479,7 @@ ul li::before {
 
 .privacy-policy-page p {
     margin-bottom: 10px;
-    font-family: OpenSans;
+    /*font-family: OpenSans;*/
     font-size: 15px;
     font-stretch: normal;
     font-style: normal;
@@ -550,6 +566,7 @@ ul li::before {
 }
 
 .score-description {
+    font-family: "Cairo",sans-serif !important;
     text-align: right;
 }
 

package/lib/template.js

@@ -1104,6 +1104,7 @@ function renderBiomarkerV3(biomarker, nestingLevel, isChildBiomarker, isCompactV
         }
 
         let biomarkerNameAlign = isRtl ? 'text-align: right;' : '';
+        const RTL_FLAG = '\u200E';
         newBiomarkerHtml += `<table id="${biomarkerCssId}" style="width:100%; margin: 0 auto;" class="biomarker-block biomarker-block-row ${biomarkerClass}">
             <tr>
                 <td style="width:${firstTdWidth}">
@@ -1113,7 +1114,7 @@ function renderBiomarkerV3(biomarker, nestingLevel, isChildBiomarker, isCompactV
                 <td class="biom-value value" style="width:max-content;">
                     <span class="biom-parent-value value-text" style="${biomarkerParentValueStyle}">${biomarkerValue.replace(/\r\n/g, "<br/>")}</span>
                 </td>
-                ${biomarkerUnit ? `<td class="biom-unit unit"><div class="biom-parent-unit unit-text" style="padding: 0 6px;">${biomarkerUnit}</div></td>` : ''}
+                ${biomarkerUnit ? `<td class="biom-unit unit"><div class="biom-parent-unit unit-text" style="padding: 0 6px;">${isRtl ?RTL_FLAG+biomarkerUnit:biomarkerUnit}</div></td>` : ''}
                 ${rangePlaceholder ? `<td class="biom-bar listing" style="width:${tdWidth}px; margin: 0;"><div class="range-placeholder b">${rangePlaceholder}</div></td>` : ''}
                 <td class="biom-range biom-range-data" style="width:${tdWidth}px; margin: 0;"><div class="parent-reference-range range">${referenceRange}</div></td>
                

package/lib/wellbeing_report_generator.js

@@ -253,7 +253,8 @@ let generateHTMLWellbeingReport = async (data, isDebugging, clientName, language
         rotatePsychologicalAmount = 336
     }
 
-    let firstSectionlHtml = firstSectionTemplate.replace("{{physicalScore}}", parseFloat(Math.floor(data.calculation.physicalScore)))
+    let firstSectionlHtml =
+        firstSectionTemplate.replace("{{physicalScore}}", parseFloat(Math.floor(data.calculation.physicalScore)))
         .replace("{{physicalScoreDecimalPart}}", parseFloat((data.calculation.physicalScore)?.toFixed(1) % 1)?.toFixed(1).substring(1))
         .replace("{{physicalScoreStatement}}", data.calculation.physicalScoreStatement)
         .replace("{{PhysicalWord}}", localeService.t('physical'))
@@ -269,9 +270,6 @@ let generateHTMLWellbeingReport = async (data, isDebugging, clientName, language
         .replace(/{{firstLevelColor}}/g, client === 'nasco' ? second_level_color : first_level_color)
         .replace("{{psychologicalColor}}", psychologicalColor)
         .replace(/{{listIconsFontColor}}/g, list_icons_font_color)
-       
-
-
 
     let footerTemplateHTML = footerTemplate.replace("{{Disclaimer}}", localeService.t('Disclaimer'))
         .replace("{{Disclaimer Text}}", localeService.t('Disclaimer Text'));
@@ -405,7 +403,6 @@ let generateHTMLWellbeingReport = async (data, isDebugging, clientName, language
 }
 
 let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clientName, language) => {
-
     debug = isDebugging;
     OUT_FILE = path.resolve(__dirname + `/../output/${clientName}-pdf` + Date.now() + '.html');
     Pdf_file = `/output/${clientName}-pdf` + Date.now() + '.html'
@@ -621,7 +618,6 @@ let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clien
     $(".score-main").addClass(language);
     /* Second section*/
     let partScores = wellbeingData.partsScore;
-    
     let allScores = {'lifeStyle': [], 'body': [], 'mind': [], healthRisk: []}
     let tempScore = {
         'lifeStyle': partScores.lifeStyle,
@@ -634,7 +630,6 @@ let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clien
     let mind = [];
     let healthRisk = []
     Object.entries(partScores).map(([key, value], index) => {
-        
         if (key === 'body' || key === 'lifeStyle' || key === 'mind') {
             partScores[key].map((item, index) => {
                 let iconName = item['icon'].split(" ").join("")
@@ -643,14 +638,12 @@ let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clien
                 if (empty(value)) {
                     console.log("missing icon", name)
                 }
-
                 let tempScore = {
                     percentage: Math.round(item['score']/(item['base']/5)),
                     icon: value,
                     scoreText: item['scoreText'],
                     key
                 };
-                
                 if (key === 'body') {
                     body.push(tempScore)
                 } else if (key === 'lifeStyle') {
@@ -660,7 +653,6 @@ let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clien
                 } else {
                     healthRisk.push(tempScore)
                 }
-
             })
         }
     });
@@ -670,13 +662,9 @@ let generateHTMLWellbeingReportWithSmartReport = async (data, isDebugging, clien
     tempScore['healthRisk'] = healthRisk;
     $('#content').append("<div class='row scores-parts' style='width:99.5% !important;'>" + renderItems(allScores, partScores) + "</div>");
     debugLog("after signature");
-    /*Footer*/
     let tips = wellbeingData.insights.tips
-    
     if(!empty(tips)) 
     $('#content').after("<h5 class='recommended-tips-title'>" + localeService.t('weRecommend') + "</h5>");
-    // $('.footer').append(footerTemplateHTML);
-    /*tips*/
     let allTips = []
     let lifeStyleTips = []
     let mindTips = []
@@ -872,10 +860,9 @@ let generatePDFWellbeingReport = async (data) => {
 
 
 const generatePDFReport = async (data) => {
-    
     try {
         let contentHtml = data.html;
-        let profileInfo = data.profileInfo;
+
         const footerTemplate = `
         <div style="width: 100%; font-size:7.3px; font-family: Inter, sans-serif; color: #B5B5B5; padding: 0 20px; box-sizing: border-box; display: flex; justify-content: space-between; align-items: center;">
           <div style="display: flex; align-items: center;">
@@ -888,32 +875,6 @@ const generatePDFReport = async (data) => {
           </div>
         </div>
       `;
-      
-
-      const headerTemplate=`
-      <div style="width: 400px; height: 61.50px; position: relative">
-  <div style="left: 0px; top: 18px; position: absolute; color: #555555; font-size: 14px; font-family: Metropolis; font-weight: 700; text-transform: uppercase; word-wrap: break-word">Health Risk Assessment</div>
-  <img style="width: 97px; height: 32px; left: 450px; top: 0px; position: absolute" src="https://placehold.co/97x32" />
-  <div style="width: 547px; padding-left: 8px; padding-right: 8px; padding-top: 5px; padding-bottom: 5px; left: 0px; top: 43.50px; position: absolute; background: #F2F5F8; justify-content: space-between; align-items: center; display: inline-flex">
-    <div style="justify-content: flex-start; align-items: center; gap: 2px; display: flex">
-      <div style="color: #333333; font-size: 8px; font-family: Metropolis; font-weight: 500; word-wrap: break-word">LAB:</div>
-      <div style="justify-content: center; display: flex; flex-direction: column; color: #2F2F2F; font-size: 7.50px; font-family: Metropolis; font-weight: 400; word-wrap: break-word">Mediclinic</div>
-    </div>
-    <div style="justify-content: flex-start; align-items: center; gap: 2px; display: flex">
-      <div style="color: #333333; font-size: 8px; font-family: Metropolis; font-weight: 500; word-wrap: break-word">REFERENCE:</div>
-      <div style="color: #2F2F2F; font-size: 7.50px; font-family: Metropolis; font-weight: 400; word-wrap: break-word">MR-EAAA792</div>
-    </div>
-    <div style="justify-content: flex-start; align-items: center; gap: 2px; display: flex">
-      <div style="color: #333333; font-size: 8px; font-family: Metropolis; font-weight: 500; word-wrap: break-word">PATIENT:</div>
-      <div style="color: #2F2F2F; font-size: 7.50px; font-family: Metropolis; font-weight: 400; word-wrap: break-word">Amir - EU</div>
-    </div>
-    <div style="justify-content: flex-start; align-items: center; gap: 2px; display: flex">
-      <div style="color: #333333; font-size: 8px; font-family: Metropolis; font-weight: 500; word-wrap: break-word">REPORT DATE:</div>
-      <div style="color: #2F2F2F; font-size: 7.50px; font-family: Metropolis; font-weight: 400; word-wrap: break-word">17/10/2023</div>
-    </div>
-  </div>
-</div>
-      `
 
         const OUT_FILE = data.outputFile;
         const browser = await puppeteer.launch({
@@ -927,14 +888,17 @@ const generatePDFReport = async (data) => {
         });
         const page = await browser.newPage();
         debugLog("page launched!");
-
-
-        await page.evaluateHandle('document.fonts.ready');
+        await page.evaluate(async () => {
+            await document.fonts.ready;
+            await Promise.all([
+                document.fonts.load('400 12px "Open Sans"'),
+                document.fonts.load('400 12px "Cairo"')
+            ]);
+        });
+        debugLog("fonts loaded!");
 
         await page.addScriptTag({ url: 'https://code.jquery.com/jquery-3.3.1.min.js' });
-        // debugLog("fonts loaded!");
-
-        await page.setContent(contentHtml, { waitUntil: 'networkidle2',timeout: 30000000, });
+        await page.setContent(contentHtml, { waitUntil: 'networkidle2', timeout: 30000 });
         await page.goto("file:///" + path.resolve(__dirname + `/../${Pdf_file}`), {
             timeout: 30000000,
             waitUntil: 'networkidle2'
@@ -948,11 +912,11 @@ const generatePDFReport = async (data) => {
             format: 'A4',
             printBackground: true,
             displayHeaderFooter: true,
-            footerTemplate,
+            footerTemplate:footerTemplate,
             width: "220mm",
             margin: {
-                top: '20px', // Adjust top margin to accommodate header
-                bottom: '50px', // Adjust bottom margin to accommodate footer
+                top: '20px',
+                bottom: '50px',
                 left: '20px',
                 right: '20px'
             }

package/package.json

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

package/templates/Mediclinic/blocks/first-section.html

@@ -58,7 +58,7 @@
          <path d="M12.816 11.2807C12.6497 11.2854 12.5359 11.3466 12.4642 11.4785C12.3887 11.6181 12.4088 11.7739 12.5015 11.8733C12.6707 12.0511 12.8342 12.2395 13.0359 12.3838C13.1267 12.4498 13.2376 12.4746 13.3408 12.423C13.6591 12.2643 13.6429 11.9728 13.4488 11.773C13.3198 11.6391 13.1831 11.513 13.0473 11.3858C12.9785 11.3208 12.8992 11.2711 12.816 11.2807ZM5.81284 4.28133C5.82049 4.17427 5.76982 4.09684 5.69717 4.0261C5.5404 3.87506 5.40083 3.70586 5.22685 3.57299C5.08155 3.46401 4.88272 3.47644 4.76323 3.59975C4.63991 3.72498 4.59403 3.93242 4.71256 4.07772C4.86551 4.26413 5.03662 4.43141 5.21825 4.58819C5.33965 4.69047 5.48782 4.69525 5.63026 4.62069C5.766 4.54995 5.80902 4.42377 5.81284 4.28133ZM8.74755 2.42013C8.74755 2.58646 8.74182 2.70118 8.74851 2.81589C8.75807 2.99369 8.90528 3.12944 9.08786 3.14091C9.29912 3.1562 9.45399 3.03384 9.47788 2.85221C9.51134 2.59985 9.50656 2.3427 9.47597 2.09034C9.45877 1.94026 9.32111 1.82363 9.16721 1.80738C8.99227 1.78826 8.84697 1.86856 8.78005 2.01482C8.71314 2.16394 8.75998 2.31976 8.74755 2.42013ZM3.62662 7.60033C3.52243 7.60033 3.41823 7.59842 3.31499 7.60033C3.10182 7.60511 2.94887 7.75901 2.946 7.96836C2.94409 8.1672 3.10851 8.34309 3.30925 8.34787C3.51382 8.35265 3.71744 8.35169 3.92201 8.34882C4.12371 8.345 4.28717 8.17676 4.29195 7.97505C4.29673 7.77335 4.13709 7.60702 3.92774 7.60033C3.82737 7.59746 3.727 7.60033 3.62662 7.60033ZM14.6189 8.345V8.34882C14.7269 8.34882 14.834 8.35265 14.941 8.34787C15.1179 8.34118 15.2861 8.16337 15.288 7.98748C15.2909 7.77909 15.1485 7.60893 14.9525 7.60224C14.7336 7.59555 14.5147 7.59555 14.2967 7.6032C14.0941 7.60989 13.9421 7.77049 13.9411 7.96263C13.9392 8.16337 14.0855 8.32875 14.2862 8.34404C14.3962 8.35265 14.508 8.345 14.6189 8.345ZM9.13088 15.3816V15.3797C8.99418 15.3797 8.85748 15.3759 8.72174 15.3807C8.54011 15.3864 8.35753 15.3606 8.17686 15.4189C7.91685 15.5021 7.8203 15.851 8.01053 16.0479C8.11759 16.1597 8.2476 16.198 8.39768 16.198C8.88616 16.198 9.37369 16.1903 9.86217 16.2009C10.0256 16.2037 10.1795 16.1425 10.2694 15.9848C10.3602 15.8261 10.342 15.678 10.2273 15.5365C10.1346 15.4227 10.0094 15.3864 9.87364 15.3835C9.62701 15.3778 9.37847 15.3816 9.13088 15.3816ZM9.12037 12.7748C8.6749 12.7748 8.23039 12.7738 7.78588 12.7757C7.72566 12.7757 7.66352 12.7805 7.60426 12.7939C7.34615 12.8541 7.21424 13.16 7.34998 13.377C7.44748 13.5328 7.59661 13.5892 7.76963 13.5892C8.67012 13.5902 9.56965 13.5902 10.4701 13.5892C10.496 13.5892 10.5208 13.5892 10.5457 13.5854C10.7636 13.5596 10.9347 13.3904 10.9395 13.1992C10.9452 12.9602 10.756 12.7757 10.4969 12.7757C10.0381 12.7738 9.57921 12.7748 9.12037 12.7748ZM7.45322 14.788C7.52778 14.8645 7.62433 14.895 7.72566 14.896C8.65387 14.8979 9.58304 14.8989 10.5122 14.895C10.7846 14.8941 10.9672 14.6819 10.9385 14.4247C10.9156 14.2259 10.7149 14.072 10.4768 14.071C9.59451 14.071 8.71218 14.071 7.82986 14.072C7.75816 14.0729 7.68455 14.0739 7.61668 14.0911C7.45035 14.1303 7.3366 14.2326 7.29931 14.4027C7.26968 14.5375 7.29836 14.658 7.4102 14.7497C7.41211 14.7765 7.42645 14.7899 7.45322 14.788ZM11.9738 5.4275L11.97 5.42463C11.9576 5.39213 11.9413 5.36249 11.9098 5.34529C11.905 5.33859 11.8993 5.33477 11.8916 5.33477C11.884 5.32808 11.8763 5.32139 11.8677 5.31374C11.7454 5.16079 11.6029 5.03174 11.4366 4.92754C11.4299 4.90938 11.4156 4.9046 11.3984 4.90364C11.3831 4.87306 11.3649 4.8482 11.3267 4.85203C11.3267 4.84629 11.3228 4.84342 11.3171 4.84342C11.3028 4.81092 11.2789 4.78989 11.2425 4.78798C11.2253 4.77746 11.2091 4.76695 11.1928 4.75643C11.0925 4.6704 10.9797 4.60635 10.8544 4.56333L10.8525 4.56142C10.6384 4.43046 10.408 4.33965 10.1633 4.28707L10.1595 4.2842C9.99982 4.2364 9.84209 4.17905 9.67194 4.18383C9.649 4.18192 9.62605 4.18 9.60311 4.17714C9.39185 4.12074 9.17772 4.12743 8.96359 4.14272C8.94639 4.14368 8.92918 4.14464 8.91197 4.14655C8.83263 4.11882 8.75711 4.15611 8.68064 4.16375C8.50666 4.18192 8.32694 4.18478 8.16539 4.26699C8.14914 4.26891 8.13384 4.27082 8.11855 4.27177C7.97803 4.29472 7.84611 4.3406 7.71992 4.40656L7.71323 4.40465L7.70845 4.40943C7.6683 4.41325 7.63198 4.42663 7.60139 4.4534C7.59087 4.45914 7.5794 4.46583 7.56984 4.47156C7.55837 4.47539 7.54786 4.47826 7.53734 4.48208C7.49337 4.48973 7.45417 4.50502 7.42072 4.53561C6.98099 4.744 6.60244 5.03461 6.27742 5.39404C5.77747 5.94561 5.45914 6.58895 5.33487 7.32693C5.24693 7.84983 5.26413 8.3689 5.37789 8.88606C5.48687 9.38314 5.69622 9.83625 5.97726 10.2559C6.21242 10.6077 6.49633 10.9222 6.76304 11.2491C6.96474 11.4967 7.15975 11.7443 7.21232 12.0779C7.24196 12.2748 7.40733 12.3829 7.60043 12.3809C7.79736 12.38 7.93883 12.2758 7.99332 12.0903C8.03538 11.9441 7.98854 11.8055 7.9503 11.6678C7.84133 11.2749 7.58896 10.9633 7.33755 10.6564C7.11291 10.383 6.88157 10.1163 6.677 9.82574C6.28985 9.27703 6.09388 8.67097 6.09484 8.00373C6.09675 7.08699 6.43706 6.31556 7.12629 5.70472C7.63198 5.25734 8.2237 5.01167 8.89763 4.961C9.3039 4.92946 9.69679 4.98394 10.083 5.11204C10.559 5.27072 10.9701 5.53456 11.3114 5.89686C11.7033 6.31365 11.9595 6.80404 12.0761 7.37186C12.1774 7.86895 12.1545 8.35647 12.0274 8.84113C11.8763 9.41947 11.5408 9.89648 11.1622 10.3458C10.8994 10.6574 10.6174 10.9547 10.4271 11.3199C10.3248 11.5168 10.2359 11.7223 10.2283 11.9508C10.2254 12.0674 10.2541 12.1764 10.3392 12.2653C10.5399 12.4756 10.9691 12.4048 11.0294 12.0502C11.0657 11.8408 11.1565 11.6563 11.2817 11.4862C11.5523 11.1201 11.8687 10.7912 12.1382 10.4242C12.642 9.73779 12.9288 8.974 12.9565 8.12131C12.9804 7.38142 12.8103 6.68646 12.4298 6.04694C12.3361 5.82803 12.1937 5.64258 12.0207 5.48007C12.0197 5.47338 12.0168 5.4686 12.0101 5.46669C12.0082 5.4447 11.9958 5.43132 11.9738 5.4275ZM5.20965 12.3771C5.22303 12.3781 5.22877 12.3743 5.22685 12.3609L5.23163 12.3561C5.26509 12.3446 5.2995 12.3331 5.31193 12.294C5.43238 12.1639 5.57386 12.0559 5.68952 11.9192C5.85872 11.7194 5.8549 11.5369 5.66085 11.3476C5.65893 11.338 5.65416 11.3323 5.64364 11.338C5.63312 11.3342 5.62357 11.3304 5.61305 11.3275C5.4687 11.2405 5.32531 11.2549 5.20869 11.3677C5.202 11.3724 5.19435 11.3763 5.1867 11.3801C5.17523 11.3763 5.17332 11.381 5.17619 11.3906C5.17045 11.3916 5.16854 11.3954 5.1695 11.4011C5.14082 11.4088 5.12266 11.425 5.11979 11.4566C5.10736 11.468 5.09398 11.4805 5.08155 11.4929C5.03089 11.49 5.00317 11.511 5.00221 11.5627L4.97353 11.598C4.95537 11.598 4.94963 11.6095 4.94868 11.6248L4.94963 11.6238C4.93147 11.6248 4.92 11.6325 4.91809 11.6516C4.9114 11.6516 4.90853 11.6554 4.90853 11.6611L4.90088 11.6602L4.90184 11.6669C4.8961 11.6745 4.89037 11.6812 4.88463 11.6889L4.86169 11.7118C4.855 11.7156 4.8483 11.7194 4.84257 11.7233C4.83014 11.7204 4.82823 11.7252 4.8311 11.7357C4.82536 11.7366 4.82345 11.7395 4.82441 11.7443C4.80529 11.7462 4.79955 11.7596 4.79764 11.7768C4.79095 11.7816 4.78521 11.7864 4.77948 11.7921C4.7508 11.7969 4.73933 11.815 4.7355 11.8418H4.73455C4.64278 11.9221 4.60932 12.1085 4.67337 12.228C4.69344 12.2643 4.6858 12.336 4.76036 12.3303L4.76227 12.3351H4.76801C4.84735 12.4603 4.99839 12.4985 5.11501 12.423C5.12648 12.4201 5.137 12.4163 5.14847 12.4144C5.15994 12.4201 5.16472 12.4144 5.16759 12.4039C5.17523 12.401 5.18288 12.3982 5.18957 12.3953C5.202 12.3982 5.20678 12.3934 5.20582 12.3809L5.20965 12.3771ZM12.7252 3.8483L12.7261 3.84734C12.7185 3.85499 12.7118 3.86264 12.7042 3.87028L12.7051 3.86933C12.6975 3.87697 12.6898 3.88367 12.6822 3.89131L12.6831 3.89036C12.6764 3.898 12.6688 3.90565 12.6611 3.9133V3.91234C12.5904 3.95727 12.5359 4.0175 12.491 4.08728C12.4709 4.10353 12.4623 4.12456 12.4652 4.15037C12.3954 4.29472 12.425 4.44862 12.5206 4.55186C12.6592 4.7029 12.9374 4.70863 13.0731 4.54039C13.1171 4.48495 13.1773 4.44193 13.2232 4.38744C13.337 4.2517 13.5043 4.16471 13.5702 3.98595C13.6171 3.8569 13.5578 3.64755 13.4402 3.5749C13.25 3.45828 13.1009 3.47548 12.9307 3.63512C12.9269 3.64182 12.924 3.64851 12.9202 3.65424C12.8915 3.66858 12.8667 3.68674 12.8552 3.71829C12.8475 3.72594 12.8409 3.73263 12.8342 3.74028C12.8265 3.74792 12.8189 3.75461 12.8122 3.76226V3.76131C12.7931 3.76704 12.7816 3.77756 12.7816 3.79763L12.7845 3.79859C12.7692 3.79859 12.7606 3.80815 12.7567 3.82249L12.75 3.8244C12.7414 3.83205 12.7338 3.84065 12.7252 3.8483ZM17.9962 9.20056C17.8155 14.723 13.2032 18.1318 8.81638 17.9961C3.2691 17.824 -0.170339 13.1782 0.0065085 8.73311C0.108793 6.15783 1.10965 3.98404 3.03108 2.27005C4.80911 0.683205 6.92459 -0.0863209 9.30486 0.0102291C14.6762 0.226269 18.131 4.70863 17.9962 9.20056Z" fill="#0092D2"/>
         </svg>
         </div>
-        <div class="score-text" style="font-family: 'Open Sans', sans-serif !important;">
+        <div class="score-text">
           {{ScoreText}}
         </div>
       </div>
@@ -200,7 +200,7 @@
          <path d="M12.816 11.2807C12.6497 11.2854 12.5359 11.3466 12.4642 11.4785C12.3887 11.6181 12.4088 11.7739 12.5015 11.8733C12.6707 12.0511 12.8342 12.2395 13.0359 12.3838C13.1267 12.4498 13.2376 12.4746 13.3408 12.423C13.6591 12.2643 13.6429 11.9728 13.4488 11.773C13.3198 11.6391 13.1831 11.513 13.0473 11.3858C12.9785 11.3208 12.8992 11.2711 12.816 11.2807ZM5.81284 4.28133C5.82049 4.17427 5.76982 4.09684 5.69717 4.0261C5.5404 3.87506 5.40083 3.70586 5.22685 3.57299C5.08155 3.46401 4.88272 3.47644 4.76323 3.59975C4.63991 3.72498 4.59403 3.93242 4.71256 4.07772C4.86551 4.26413 5.03662 4.43141 5.21825 4.58819C5.33965 4.69047 5.48782 4.69525 5.63026 4.62069C5.766 4.54995 5.80902 4.42377 5.81284 4.28133ZM8.74755 2.42013C8.74755 2.58646 8.74182 2.70118 8.74851 2.81589C8.75807 2.99369 8.90528 3.12944 9.08786 3.14091C9.29912 3.1562 9.45399 3.03384 9.47788 2.85221C9.51134 2.59985 9.50656 2.3427 9.47597 2.09034C9.45877 1.94026 9.32111 1.82363 9.16721 1.80738C8.99227 1.78826 8.84697 1.86856 8.78005 2.01482C8.71314 2.16394 8.75998 2.31976 8.74755 2.42013ZM3.62662 7.60033C3.52243 7.60033 3.41823 7.59842 3.31499 7.60033C3.10182 7.60511 2.94887 7.75901 2.946 7.96836C2.94409 8.1672 3.10851 8.34309 3.30925 8.34787C3.51382 8.35265 3.71744 8.35169 3.92201 8.34882C4.12371 8.345 4.28717 8.17676 4.29195 7.97505C4.29673 7.77335 4.13709 7.60702 3.92774 7.60033C3.82737 7.59746 3.727 7.60033 3.62662 7.60033ZM14.6189 8.345V8.34882C14.7269 8.34882 14.834 8.35265 14.941 8.34787C15.1179 8.34118 15.2861 8.16337 15.288 7.98748C15.2909 7.77909 15.1485 7.60893 14.9525 7.60224C14.7336 7.59555 14.5147 7.59555 14.2967 7.6032C14.0941 7.60989 13.9421 7.77049 13.9411 7.96263C13.9392 8.16337 14.0855 8.32875 14.2862 8.34404C14.3962 8.35265 14.508 8.345 14.6189 8.345ZM9.13088 15.3816V15.3797C8.99418 15.3797 8.85748 15.3759 8.72174 15.3807C8.54011 15.3864 8.35753 15.3606 8.17686 15.4189C7.91685 15.5021 7.8203 15.851 8.01053 16.0479C8.11759 16.1597 8.2476 16.198 8.39768 16.198C8.88616 16.198 9.37369 16.1903 9.86217 16.2009C10.0256 16.2037 10.1795 16.1425 10.2694 15.9848C10.3602 15.8261 10.342 15.678 10.2273 15.5365C10.1346 15.4227 10.0094 15.3864 9.87364 15.3835C9.62701 15.3778 9.37847 15.3816 9.13088 15.3816ZM9.12037 12.7748C8.6749 12.7748 8.23039 12.7738 7.78588 12.7757C7.72566 12.7757 7.66352 12.7805 7.60426 12.7939C7.34615 12.8541 7.21424 13.16 7.34998 13.377C7.44748 13.5328 7.59661 13.5892 7.76963 13.5892C8.67012 13.5902 9.56965 13.5902 10.4701 13.5892C10.496 13.5892 10.5208 13.5892 10.5457 13.5854C10.7636 13.5596 10.9347 13.3904 10.9395 13.1992C10.9452 12.9602 10.756 12.7757 10.4969 12.7757C10.0381 12.7738 9.57921 12.7748 9.12037 12.7748ZM7.45322 14.788C7.52778 14.8645 7.62433 14.895 7.72566 14.896C8.65387 14.8979 9.58304 14.8989 10.5122 14.895C10.7846 14.8941 10.9672 14.6819 10.9385 14.4247C10.9156 14.2259 10.7149 14.072 10.4768 14.071C9.59451 14.071 8.71218 14.071 7.82986 14.072C7.75816 14.0729 7.68455 14.0739 7.61668 14.0911C7.45035 14.1303 7.3366 14.2326 7.29931 14.4027C7.26968 14.5375 7.29836 14.658 7.4102 14.7497C7.41211 14.7765 7.42645 14.7899 7.45322 14.788ZM11.9738 5.4275L11.97 5.42463C11.9576 5.39213 11.9413 5.36249 11.9098 5.34529C11.905 5.33859 11.8993 5.33477 11.8916 5.33477C11.884 5.32808 11.8763 5.32139 11.8677 5.31374C11.7454 5.16079 11.6029 5.03174 11.4366 4.92754C11.4299 4.90938 11.4156 4.9046 11.3984 4.90364C11.3831 4.87306 11.3649 4.8482 11.3267 4.85203C11.3267 4.84629 11.3228 4.84342 11.3171 4.84342C11.3028 4.81092 11.2789 4.78989 11.2425 4.78798C11.2253 4.77746 11.2091 4.76695 11.1928 4.75643C11.0925 4.6704 10.9797 4.60635 10.8544 4.56333L10.8525 4.56142C10.6384 4.43046 10.408 4.33965 10.1633 4.28707L10.1595 4.2842C9.99982 4.2364 9.84209 4.17905 9.67194 4.18383C9.649 4.18192 9.62605 4.18 9.60311 4.17714C9.39185 4.12074 9.17772 4.12743 8.96359 4.14272C8.94639 4.14368 8.92918 4.14464 8.91197 4.14655C8.83263 4.11882 8.75711 4.15611 8.68064 4.16375C8.50666 4.18192 8.32694 4.18478 8.16539 4.26699C8.14914 4.26891 8.13384 4.27082 8.11855 4.27177C7.97803 4.29472 7.84611 4.3406 7.71992 4.40656L7.71323 4.40465L7.70845 4.40943C7.6683 4.41325 7.63198 4.42663 7.60139 4.4534C7.59087 4.45914 7.5794 4.46583 7.56984 4.47156C7.55837 4.47539 7.54786 4.47826 7.53734 4.48208C7.49337 4.48973 7.45417 4.50502 7.42072 4.53561C6.98099 4.744 6.60244 5.03461 6.27742 5.39404C5.77747 5.94561 5.45914 6.58895 5.33487 7.32693C5.24693 7.84983 5.26413 8.3689 5.37789 8.88606C5.48687 9.38314 5.69622 9.83625 5.97726 10.2559C6.21242 10.6077 6.49633 10.9222 6.76304 11.2491C6.96474 11.4967 7.15975 11.7443 7.21232 12.0779C7.24196 12.2748 7.40733 12.3829 7.60043 12.3809C7.79736 12.38 7.93883 12.2758 7.99332 12.0903C8.03538 11.9441 7.98854 11.8055 7.9503 11.6678C7.84133 11.2749 7.58896 10.9633 7.33755 10.6564C7.11291 10.383 6.88157 10.1163 6.677 9.82574C6.28985 9.27703 6.09388 8.67097 6.09484 8.00373C6.09675 7.08699 6.43706 6.31556 7.12629 5.70472C7.63198 5.25734 8.2237 5.01167 8.89763 4.961C9.3039 4.92946 9.69679 4.98394 10.083 5.11204C10.559 5.27072 10.9701 5.53456 11.3114 5.89686C11.7033 6.31365 11.9595 6.80404 12.0761 7.37186C12.1774 7.86895 12.1545 8.35647 12.0274 8.84113C11.8763 9.41947 11.5408 9.89648 11.1622 10.3458C10.8994 10.6574 10.6174 10.9547 10.4271 11.3199C10.3248 11.5168 10.2359 11.7223 10.2283 11.9508C10.2254 12.0674 10.2541 12.1764 10.3392 12.2653C10.5399 12.4756 10.9691 12.4048 11.0294 12.0502C11.0657 11.8408 11.1565 11.6563 11.2817 11.4862C11.5523 11.1201 11.8687 10.7912 12.1382 10.4242C12.642 9.73779 12.9288 8.974 12.9565 8.12131C12.9804 7.38142 12.8103 6.68646 12.4298 6.04694C12.3361 5.82803 12.1937 5.64258 12.0207 5.48007C12.0197 5.47338 12.0168 5.4686 12.0101 5.46669C12.0082 5.4447 11.9958 5.43132 11.9738 5.4275ZM5.20965 12.3771C5.22303 12.3781 5.22877 12.3743 5.22685 12.3609L5.23163 12.3561C5.26509 12.3446 5.2995 12.3331 5.31193 12.294C5.43238 12.1639 5.57386 12.0559 5.68952 11.9192C5.85872 11.7194 5.8549 11.5369 5.66085 11.3476C5.65893 11.338 5.65416 11.3323 5.64364 11.338C5.63312 11.3342 5.62357 11.3304 5.61305 11.3275C5.4687 11.2405 5.32531 11.2549 5.20869 11.3677C5.202 11.3724 5.19435 11.3763 5.1867 11.3801C5.17523 11.3763 5.17332 11.381 5.17619 11.3906C5.17045 11.3916 5.16854 11.3954 5.1695 11.4011C5.14082 11.4088 5.12266 11.425 5.11979 11.4566C5.10736 11.468 5.09398 11.4805 5.08155 11.4929C5.03089 11.49 5.00317 11.511 5.00221 11.5627L4.97353 11.598C4.95537 11.598 4.94963 11.6095 4.94868 11.6248L4.94963 11.6238C4.93147 11.6248 4.92 11.6325 4.91809 11.6516C4.9114 11.6516 4.90853 11.6554 4.90853 11.6611L4.90088 11.6602L4.90184 11.6669C4.8961 11.6745 4.89037 11.6812 4.88463 11.6889L4.86169 11.7118C4.855 11.7156 4.8483 11.7194 4.84257 11.7233C4.83014 11.7204 4.82823 11.7252 4.8311 11.7357C4.82536 11.7366 4.82345 11.7395 4.82441 11.7443C4.80529 11.7462 4.79955 11.7596 4.79764 11.7768C4.79095 11.7816 4.78521 11.7864 4.77948 11.7921C4.7508 11.7969 4.73933 11.815 4.7355 11.8418H4.73455C4.64278 11.9221 4.60932 12.1085 4.67337 12.228C4.69344 12.2643 4.6858 12.336 4.76036 12.3303L4.76227 12.3351H4.76801C4.84735 12.4603 4.99839 12.4985 5.11501 12.423C5.12648 12.4201 5.137 12.4163 5.14847 12.4144C5.15994 12.4201 5.16472 12.4144 5.16759 12.4039C5.17523 12.401 5.18288 12.3982 5.18957 12.3953C5.202 12.3982 5.20678 12.3934 5.20582 12.3809L5.20965 12.3771ZM12.7252 3.8483L12.7261 3.84734C12.7185 3.85499 12.7118 3.86264 12.7042 3.87028L12.7051 3.86933C12.6975 3.87697 12.6898 3.88367 12.6822 3.89131L12.6831 3.89036C12.6764 3.898 12.6688 3.90565 12.6611 3.9133V3.91234C12.5904 3.95727 12.5359 4.0175 12.491 4.08728C12.4709 4.10353 12.4623 4.12456 12.4652 4.15037C12.3954 4.29472 12.425 4.44862 12.5206 4.55186C12.6592 4.7029 12.9374 4.70863 13.0731 4.54039C13.1171 4.48495 13.1773 4.44193 13.2232 4.38744C13.337 4.2517 13.5043 4.16471 13.5702 3.98595C13.6171 3.8569 13.5578 3.64755 13.4402 3.5749C13.25 3.45828 13.1009 3.47548 12.9307 3.63512C12.9269 3.64182 12.924 3.64851 12.9202 3.65424C12.8915 3.66858 12.8667 3.68674 12.8552 3.71829C12.8475 3.72594 12.8409 3.73263 12.8342 3.74028C12.8265 3.74792 12.8189 3.75461 12.8122 3.76226V3.76131C12.7931 3.76704 12.7816 3.77756 12.7816 3.79763L12.7845 3.79859C12.7692 3.79859 12.7606 3.80815 12.7567 3.82249L12.75 3.8244C12.7414 3.83205 12.7338 3.84065 12.7252 3.8483ZM17.9962 9.20056C17.8155 14.723 13.2032 18.1318 8.81638 17.9961C3.2691 17.824 -0.170339 13.1782 0.0065085 8.73311C0.108793 6.15783 1.10965 3.98404 3.03108 2.27005C4.80911 0.683205 6.92459 -0.0863209 9.30486 0.0102291C14.6762 0.226269 18.131 4.70863 17.9962 9.20056Z" fill="#0092D2"/>
         </svg>
         </div>
-        <div class="score-text" style="font-family: 'Open Sans', sans-serif !important;">
+        <div class="score-text">
             {{lowScoreText}}
         </div>
       </div>

package/templates/Mediclinic/rtl_no_pages.html

@@ -3,8 +3,8 @@
 <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
     <title>TEMPLATE</title>
-    <link rel="preload" href="../assets/Mediclinic/Cairo-Regular.ttf" as="font" type="font/ttf" crossorigin>
-    <link rel="preload" href="../assets/Mediclinic/OpenSans-Regular.ttf" as="font" type="font/ttf" crossorigin>
+    <link rel="preload" href="../assets/Mediclinic/css/style.css" as="style">
+
     <link rel="stylesheet" href="../assets/Mediclinic/css/nasco_report.css" type="text/css">
     <link rel="stylesheet" href="../assets/Mediclinic/css/nasco_report_rtl.css" type="text/css">
     <link rel="stylesheet" href="../assets/Mediclinic/css/style.css" type="text/css">
@@ -15,7 +15,7 @@
 <div id="chartsData" style="font-family: 'Cairo',serif;"></div>
 <body>
 <!--********************** PAGE 1 ********************-->
-<div class='score-main' style="font-family: 'Cairo',serif;">
+<div class='score-main'>
     <div id="content" class="content">
     </div>
     <div class="footer footer-background">

package/test.js

@@ -59,10 +59,8 @@ async function tttt() {
 
   // Write original PDF
   fs.writeFileSync(PDF_FILE_PATH, fileBuffer);
-
-  (async () => {
+  await (async () => {
     const qpdf = await import('node-qpdf2');
-  
     qpdf.encrypt({
       input: PDF_FILE_PATH,
       output: ENCRYPTED_PATH,