@baravak/risloo-profile-cli 4.40.0 → 4.40.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@baravak/risloo-profile-cli",
-  "version": "4.40.0",
+  "version": "4.40.2",
   "description": "**Risloo Profile CLI** is a library for creating profiles, reports and sheets for *psychological* samples.",
   "main": "bin/risloo.js",
   "publishConfig": {

package/src/samples/BDI93.js

@@ -91,21 +91,27 @@ class BDI93 extends Profile {
     const sorted = [...questions].sort((a, b) => b.option - a.option)
     for(let i = 0; i < 6; i+=2){
         factors.push({
-            ...dataset.score[i],
-            percentage: dataset.score[i+1].mark,
-            percentageText: Math.round(dataset.score[i+1].mark * 100),
+            ...{
+              ...dataset.score[i],
+              mark: dataset.score[i].mark ?? 0
+            },
+            percentage: dataset.score[i+1].mark ?? 0,
+            percentageText: Math.round((dataset.score[i+1].mark ?? 0) * 100),
             bg:`url(#bg${dataset.score[i].label.eng})`
         })
     }
 
     const report = dataset.score[8].mark
     const total = {
-        ...dataset.score[6],
-        percentage: dataset.score[7].mark,
-        percentageText: Math.round(dataset.score[7].mark * 100),
-        w: calculateWidth(dataset.score[6].mark),
+        ...{
+          ...dataset.score[6],
+          mark: dataset.score[6].mark ?? 0
+        },
+        percentage: dataset.score[7].mark ?? 0,
+        percentageText: Math.round((dataset.score[7].mark ?? 0) * 100),
+        w: calculateWidth(dataset.score[6].mark ?? 0),
         colors: totalColors[report],
-        alert: dataset.score[9].mark
+        alert: dataset.score[9].mark ?? 0
     }
     const alerts = []
     if(questions[1].option > 0){

package/src/samples/BDI9A.js

@@ -75,7 +75,8 @@ class BDI9A extends Profile {
 
     const report = dataset.score[3].mark
     const gReport = dataset.score[2].mark
-
+    dataset.score[0].mark = dataset.score[0].mark ?? 0
+    dataset.score[1].mark = dataset.score[1].mark ?? 0
     dataset.score[1].mark = isNaN(dataset.score[1].mark) ? 0 : dataset.score[1].mark
     const total = {
         ...dataset.score[0],
@@ -93,6 +94,7 @@ class BDI9A extends Profile {
     if(questions[6].option > 0){
       alerts.push(questions[6])
     }
+    console.log(total)
     return [{total, report, gReport, alerts,sorted}];
   }
 }

package/views/profiles/samples/BDI93_1.hbs

@@ -23,6 +23,12 @@
         <stop offset="1" stop-color="{{colors.[1]}}"/>
       </linearGradient>
     {{/with}}
+    <clipPath id="raw-rect">
+        {{bar 28 300 (object tr=4 tl=4 br=0 bl=0) (toRad 0)}}
+    </clipPath>
+    <clipPath id="total-rect">
+        {{bar 449 28 (object tr=4 br=4 tl=0 bl=0) (toRad 0)}}
+    </clipPath>
 </defs>
 
 <g transform="translate({{spec.profile.padding.[0].x}}, {{spec.profile.padding.[0].y}})">
@@ -55,7 +61,7 @@
     <g transform="translate(141,0)">
       {{#each factors as | factor index |}}
         <g transform="translate({{math 128 '*' index}},{{math 300 '-' (math 300 '*' percentage)}})">
-          {{bar 28 (math 300 '*' percentage) (object tr=4 tl=4 br=0 bl=0) (toRad 0) fill=bg transform="translate(0,24)"}}
+          {{bar 28 (math 300 '*' percentage) (object tr=4 tl=4 br=0 bl=0) (toRad 0) fill=bg transform="translate(0,24)" clip-path="url(#raw-rect)"}}
           <text font-size="16" font-weight="600" fill="{{ternary (boolean percentage '>' 0.24) '#FFFFFF' '#4F46E5'}}" transform="{{ternary (boolean percentage '>' 0.24) 'translate(19,34) rotate(-90 0 0)' 'translate(19,16) rotate(-90 0 0)'}}" text-anchor="{{ternary (boolean percentage '>' 0.24) 'start' 'end'}}">{{percentageText}} ٪</text>
         </g>
       {{/each}}
@@ -68,7 +74,7 @@
         <text y="0" x="-8" dy=".85em" text-anchor="start" font-size="13" font-weight="500" fill="#64748B">نمره کل</text>
         <text y="0" x="-8" dy="2.1em" text-anchor="start" font-size="13" font-weight="600" fill="#475569">{{total.percentageText}} ٪</text>
         {{bar 449 28 (object tr=4 br=4 tl=0 bl=0) (toRad 0) fill="#F8FAFC"}}
-        {{bar total.w 28 (object tr=4 br=4 tl=0 bl=0) (toRad 0) fill="url(#bgtotal)"}}
+        {{bar total.w 28 (object tr=4 br=4 tl=0 bl=0) (toRad 0) fill="url(#bgtotal)" clip-path="url(#total-rect)"}}
         <text y="14" x="{{ternary (boolean total.mark '>' 5) (math total.w '-' 8) (math total.w '+' 8)}}" dy=".3em" text-anchor="{{ternary (boolean total.mark '>' 5) 'start' 'end'}}" font-size="16" font-weight="600" fill="{{ternary (boolean total.mark '>' 5) '#FFFFFF' total.colors.[1]}}">{{total.mark}}</text>
       </g>
       <g transform="translate(48,0)">