@baravak/risloo-profile-cli 4.3.0 → 4.3.2

package/package.json

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

package/src/handlebars/importPartials.js

@@ -8,6 +8,7 @@ const baseProfiles = [
   "MMFAD93",
   "PIES93",
   "JPFQ93_partial",
+  "JPFQ93_partial2",
   "FACES93_1_partial",
   "FACES93_2_1_partial",
   "FACES93_2_2_partial",

package/src/samples/JPFQ93.js

@@ -2,7 +2,7 @@ const { Profile, FS } = require("../Profile");
 
 class JPFQ93 extends Profile {
   // Number of pages
-  static pages = 1;
+  static pages = 2;
 
   // Labels of the sample
   labels = {
@@ -25,7 +25,7 @@ class JPFQ93 extends Profile {
     sample: {
       name: "کارکردهای شخصیت - جان‌بزرگی"      /* Name of the sample */,
       multiProfile: false /* Whether the sample has multiple profiles or not */,
-      questions: false /* Determines whether to get questions from inital dataset or not */,
+      questions: true /* Determines whether to get questions from inital dataset or not */,
       defaultFields: true /* Determines whether to have default prerequisites in the profile or not */,
       fields: [] /* In case you want to get some additional fields and show in the profile */,
     },
@@ -53,25 +53,70 @@ class JPFQ93 extends Profile {
   }
 
   _calcContext() {
-    const { dataset } = this;
+    const { dataset, questions } = this;
     let markSum = 0
+    const clinicalScores = clinicalScoring(dataset.questions)
+    const score2 = []
     dataset.score.forEach(score => {
         markSum += score.mark
+        const s2= {label: {...score.label}}
+        s2.mark = clinicalScores[score.label.eng].total
+        s2.label.percentage = clinicalScores[score.label.eng].percentage
+        s2.label.width = clinicalScores[score.label.eng].width
+        score2.push(s2)
     })
-    // const items = dataset.score.map((data) => ({
-    //   label: data.label,
-    //   mark: data.mark,
-    //   coordinates: {
-    //     x: (data.mark.interaction - 6) * 25,
-    //     y: (data.mark.structure - 6) * 25,
-    //   },
-    // }));
-    // markSum = 378
     this.dataset.score.forEach((f, i) => {
       this.dataset.score[i].label.percentage = Math.round(((this.dataset.score[i].mark * 100) / this.dataset.score[i].label.width))
     })
-    return [{ markSum  }];
+    let markSum1 = 0
+    for(const cs in clinicalScores){
+      markSum1 += clinicalScores[cs].total
+    }
+    return [{ markSum: markSum1, clinicalScores: score2, titleAppend:' - نیم‌رخ بالینی'  }, { markSum, titleAppend:' - نیم‌رخ پژوهشی'  }];
   }
 }
-
+function clinicalScoring(items){
+    f1 = 'identity'
+    f2 = 'self_direction'
+    f3 = 'empathy'
+    f4 = 'intimacy'
+    f5 = 'psychoticism'
+    f6 = 'detachment'
+    f7 = 'disinhibition'
+    f8 = 'negative_affectivity'
+    f9 = 'antagonism'
+    factors = {
+        [`${f1}`] : [1,5,9,12,14,17,19,21,23,25,27,29,31,33,35,37,39,41,43,45,48,50,53],
+        [`${f2}`] : [2,6,10,15,20,26,32,38,44,49],
+        [`${f3}`] : [4,8,13,18,24,30,36,42,47,52,55],
+        [`${f4}`] : [3,7,11,16,22,28,34,40,46,51,54],
+        [`${f5}`] : [56,62,68,73,78,83,88,96,102,108,111],
+        [`${f6}`] : [60,67,72,77,82,87,94,100,106],
+        [`${f7}`] : [57,61,63,66,69,74,79,84,89,91,93,95,97,103,107,110,114,118,120,122,124,126],
+        [`${f8}`] : [59,65,71,76,81,86,92,99,105,112,116,119,121,123,125],
+        [`${f9}`] : [58,64,70,75,80,85,90,98,101,104,109,113,115,117]
+    }
+    reverse_scoring_numbers = [1,5,6,10,11,12,14,26,32,34,47,50,115]
+    result = {}
+    for(const f in factors){
+        const fItems = factors[f]
+        if(result[f] === undefined){
+            result[f] = {total: 0, percentage: 0, width: fItems.length * 2}
+        }
+        
+        fItems.forEach(index => {
+            answer = parseInt(items[index -1].user_answered)
+          let incScore = 0
+            if(reverse_scoring_numbers.indexOf(index) === -1){
+                incScore = Math.floor((4 - answer)/1.5)
+            }else{
+                incScore = Math.floor((answer - 1)/1.5)
+            }
+            result[f].total = result[f].total + incScore
+        })
+        totalScore = fItems.length * 2
+        result[f].percentage = Math.round((result[f].total * 100) / totalScore)
+    }
+    return result
+}
 module.exports = JPFQ93;

package/src/samples/PMCIEF93.js

@@ -145,6 +145,7 @@ class PMCIEF93 extends Profile {
       {
         score: Object.fromEntries(dataset.score.slice(49, 58).map((s) =>[s.label.eng, s.mark])),
         fields: dataset.info.fields,
+        items: dataset.questions.slice(328, 454)
       },
       {},
       {

package/src/samples/YSQ93.js

@@ -1,5 +1,4 @@
 const { Profile, FS, Mappings } = require("../Profile");
-
 class YSQ93 extends Profile {
   // Number of pages
   static pages = 1;
@@ -74,31 +73,31 @@ class YSQ93 extends Profile {
         const a6 = [];
         let start = 0;
         const a5_line = [32]
-        for(let j = 0; j < 5; j++){
-            const key = i + (j * 18);
-            if(dataset.questions[key].user_answered == 5){
-                if(!a5.length){
-                    start+= 37
-                }else{
-                    start+= 26
-                }
-                a5.push({item: key+1, start:start})
+        factors_key[s.label.eng].forEach((e, ei) => {
+          e = parseInt(e)
+          if(dataset.questions[e - 1].user_answered == 5){
+            if(!a5.length){
+                start+= 37
+            }else{
+                start+= 26
             }
-        }
+            a5.push({item: e, start:start})
+          }
+        });
         a5_line.push(start + 2)
         const a6_start = start ? start + 36 : 0;
         const a6_line = [a6_start + 32]
-        for(let j = 0; j < 5; j++){
-            const key = i + (j * 18);
-            if(dataset.questions[key].user_answered == 6){
-                if(!a6.length){
-                    start = a6_start + 37
-                }else{
-                    start+= 26
-                }
-                a6.push({item: key+1, start:start})
+        factors_key[s.label.eng].forEach((e, ei) => {
+          e = parseInt(e)
+          if(dataset.questions[e -1].user_answered == 6){
+            if(!a6.length){
+                start = a6_start + 37
+            }else{
+                start+= 26
             }
+            a6.push({item: e, start:start})
         }
+        })
         a6_line.push(start + 2)
         const is_critical = a5.length + a6.length >= 3 ? true : false
         return Object.assign({}, s, {
@@ -118,5 +117,39 @@ class YSQ93 extends Profile {
     return [{ items }];
   }
 }
+const f1= 'ed'
+const f2 = 'ab'
+const f3 = 'ma'
+const f4 = 'si'
+const f5 = 'ds'
+const f6 = 'fa'
+const f7 = 'ai'
+const f8 = 'vu'
+const f9 = 'eu'
+const f10 = 'sb'
+const f11 = 'ss'
+const f12 = 'ei'
+const f13 = 'us'
+const f14 = 'et'
+const f15 = 'is'
+const f16 = 'as'
+const f17 = 'np'
+const f18 = 'pu'
 
+const factors_item = {
+    1: f1,  2: f2,   3: f3,   4: f4,   5: f5,    6: f6,   7: f7,   8: f8,   9: f9,   10: f10, 11: f11, 12: f12, 13: f13, 14: f14, 15: f15, 16: f16, 17: f17, 18: f18,
+    19: f1, 20: f2, 21: f3, 22: f4, 23: f5, 24: f6, 25: f7, 26: f8, 27: f9, 28: f10, 29: f11, 30: f12, 31: f13, 32: f14, 33: f15, 34: f16, 35: f17, 36: f18,
+    37: f1, 38: f2, 39: f3, 40: f4, 41: f5, 42: f6, 43: f7, 44: f8, 45: f9, 46: f10, 47: f11, 48: f12, 49: f13, 50: f14, 51: f15, 52: f16, 53: f17, 54: f18,
+    55: f1, 56: f2, 57: f3, 58: f4, 59: f5, 60: f6, 61: f7, 62: f8, 63: f9, 64: f10, 65: f11, 66: f12, 67: f13, 68: f14, 69: f15, 70: f16, 71: f17, 72: f18,
+    73: f1, 74: f2, 75: f3, 76: f4, 77: f5, 78: f6, 79: f7, 80: f8, 81: f9, 82: f10, 83: f11, 84: f12, 85: f13, 86: f14, 87: f15, 88: f16, 89: f17, 90: f18
+}
+const factors_key = {}
+for(const fi in factors_item){
+  const fk = factors_item[fi]
+  if(factors_key[fk] === undefined){
+    factors_key[fk] = [fi]
+  }else{
+    factors_key[fk].push(fi)
+  }
+}
 module.exports = YSQ93;

package/views/profiles/samples/JPFQ93_2.hbs

@@ -0,0 +1,5 @@
+{{#> layout}}
+<g transform="translate({{spec.profile.padding.x}}, {{spec.profile.padding.y}})">
+    {{> JPFQ93_partial2}}
+</g>
+{{/ layout}}

package/views/profiles/samples/JPFQ93_partial.hbs

@@ -1,16 +1,16 @@
-{{#each dataset.score}}
+{{#each clinicalScores}}
     <g transform="translate(0, {{math 5  '+' ( math 51 '*' @key )}})">
         <text y="0" x="169" text-anchor="start" font-size="24px" font-weight="400" dy="24px" fill="#3F3F46">{{label.fr}}</text>
         <g transform="translate(186, 0)">
-            {{bar (math label.width '*' 3.5) 30 (object tl=0 tr=15 bl=0 br=15) (toRad 0) fill=label.background opacity='.8'}}
-            {{bar (math mark '*' 3.5) 30 (object tl=0 tr=15 bl=0 br=15) (toRad 0) fill=label.fill opacity='.8'}}
-            <text y="17" x="{{math (math label.width '*' 3.5) '+' 8 }}" dy="6px" text-anchor="start" direction="ltr">
+            {{bar (math label.width '*' 5.25) 30 (object tl=0 tr=15 bl=0 br=15) (toRad 0) fill=label.background opacity='.8'}}
+            {{bar (math mark '*' 5.25) 30 (object tl=0 tr=15 bl=0 br=15) (toRad 0) fill=label.fill opacity='.8'}}
+            <text y="17" x="{{math (math label.width '*' 5.25) '+' 8 }}" dy="6px" text-anchor="start" direction="ltr">
                 <tspan fill="{{label.fill}}" font-size="27px" font-weight="500">
                     {{mark}}
                 </tspan>
                 <tspan font-size="20px" fill="#71717A" font-weight="400">/ {{label.width}}</tspan>
             </text>
-            <g transform="translate({{math 95 '+' (math label.width '*' 3.5)}}, 4)">
+            <g transform="translate({{math 95 '+' (math label.width '*' 5.25)}}, 4)">
                 <rect x="0" y="0" rx="4" fill="#F8FAFC" width="50" height="25" />
                 <text x="25" y="12.5" dy="0.25em" text-anchor="middle" font-weight="400" font-size="20px" fill="{{label.fill}}">%{{label.percentage}}</text>
             </g>
@@ -21,10 +21,10 @@
 <g transform="translate(612, 447)">
     <g transform="translate(53, -3)">
         {{bar 9 378 (object tl=0 tr=0 bl=4.5 br=4.5) (toRad 180) fill='#E4E4E7'}}
-        {{bar 9 markSum (object tl=0 tr=0 bl=4.5 br=4.5) (toRad 180) fill='#52525B'}}
+        {{bar 9 (math markSum '*' 1.5) (object tl=0 tr=0 bl=4.5 br=4.5) (toRad 180) fill='#52525B'}}
     </g>
-    <text x="49.5" y="-410.5" dominant-baseline="auto" text-anchor="middle" fill="#71717A" font-size="30px" font-weight="400">378</text>
-    <text x="66" y="{{math markSum '*' -1}}" dy="6" text-anchor="start" font-size="36px" fill="#3F3F46" font-weight="500" direction="ltr">{{markSum}}</text>
+    <text x="49.5" y="-410.5" dominant-baseline="auto" text-anchor="middle" fill="#71717A" font-size="30px" font-weight="400">252</text>
+    <text x="66" y="{{math markSum '*' -1.5}}" dy="6" text-anchor="start" font-size="36px" fill="#3F3F46" font-weight="500" direction="ltr">{{markSum}}</text>
     <text transform="rotate(-90, 0, 0)" x="0" y="0" text-anchor="end" dy="18" font-size="24px" font-weight="400" fill="#52525B">نمره کل</text>
 
     <rect x="41" y="-3" width="15" height="3" fill="#FFFFFF" style="filter: drop-shadow(0 -3px 5px rgba(0,0,0, .5));"/>

package/views/profiles/samples/JPFQ93_partial2.hbs

@@ -0,0 +1,31 @@
+{{#each dataset.score}}
+    <g transform="translate(0, {{math 5  '+' ( math 51 '*' @key )}})">
+        <text y="0" x="169" text-anchor="start" font-size="24px" font-weight="400" dy="24px" fill="#3F3F46">{{label.fr}}</text>
+        <g transform="translate(186, 0)">
+            {{bar (math label.width '*' 3.5) 30 (object tl=0 tr=15 bl=0 br=15) (toRad 0) fill=label.background opacity='.8'}}
+            {{bar (math mark '*' 3.5) 30 (object tl=0 tr=15 bl=0 br=15) (toRad 0) fill=label.fill opacity='.8'}}
+            <text y="17" x="{{math (math label.width '*' 3.5) '+' 8 }}" dy="6px" text-anchor="start" direction="ltr">
+                <tspan fill="{{label.fill}}" font-size="27px" font-weight="500">
+                    {{mark}}
+                </tspan>
+                <tspan font-size="20px" fill="#71717A" font-weight="400">/ {{label.width}}</tspan>
+            </text>
+            <g transform="translate({{math 95 '+' (math label.width '*' 3.5)}}, 4)">
+                <rect x="0" y="0" rx="4" fill="#F8FAFC" width="50" height="25" />
+                <text x="25" y="12.5" dy="0.25em" text-anchor="middle" font-weight="400" font-size="20px" fill="{{label.fill}}">%{{label.percentage}}</text>
+            </g>
+        </g>
+    </g>
+{{/each}}
+<rect x="183" y="3" width="3" height="450" rx="1" fill="#FFFFFF" style="filter: drop-shadow(3px 0 5px rgba(0,0,0, .5));"/>
+<g transform="translate(612, 447)">
+    <g transform="translate(53, -3)">
+        {{bar 9 378 (object tl=0 tr=0 bl=4.5 br=4.5) (toRad 180) fill='#E4E4E7'}}
+        {{bar 9 markSum (object tl=0 tr=0 bl=4.5 br=4.5) (toRad 180) fill='#52525B'}}
+    </g>
+    <text x="49.5" y="-410.5" dominant-baseline="auto" text-anchor="middle" fill="#71717A" font-size="30px" font-weight="400">378</text>
+    <text x="66" y="{{math markSum '*' -1}}" dy="6" text-anchor="start" font-size="36px" fill="#3F3F46" font-weight="500" direction="ltr">{{markSum}}</text>
+    <text transform="rotate(-90, 0, 0)" x="0" y="0" text-anchor="end" dy="18" font-size="24px" font-weight="400" fill="#52525B">نمره کل</text>
+
+    <rect x="41" y="-3" width="15" height="3" fill="#FFFFFF" style="filter: drop-shadow(0 -3px 5px rgba(0,0,0, .5));"/>
+</g>