@baravak/risloo-profile-cli 3.1.1 → 3.1.2

package/src/samples/JPFQ93.js

@@ -6,16 +6,16 @@ class JPFQ93 extends Profile {
 
   // Labels of the sample
   labels = {
-    L1: { eng: "identity", fr: "هویت", fill:"#8B5CF6 ", background:"#EDE9FE", width: 69},
-    L2: { eng: "intimacy", fr: "صمیمیت" , fill:"#8B5CF6 ", background:"#EDE9FE", width: 33},
-    L3: { eng: "empathy", fr: "همدلی" , fill:"#8B5CF6 ", background:"#EDE9FE", width: 33},
-    L4: { eng: "self_direction", fr: "خودراهبری" , fill:"#8B5CF6 ", background:"#EDE9FE", width: 30},
+    L1: { eng: "identity", fr: "هویت", fill:"#8B5CF6 ", background:"#EDE9FE", fontColor:"#7C3AED", width: 69},
+    L2: { eng: "intimacy", fr: "صمیمیت" , fill:"#8B5CF6 ", background:"#EDE9FE", fontColor:"#7C3AED", width: 33},
+    L3: { eng: "empathy", fr: "همدلی" , fill:"#8B5CF6 ", background:"#EDE9FE", fontColor:"#7C3AED", width: 33},
+    L4: { eng: "self_direction", fr: "خودراهبری" , fill:"#8B5CF6 ", background:"#EDE9FE", fontColor:"#7C3AED", width: 30},
 
-    L5: { eng: "psychoticism", fr: "سایکوزگرایی", fill:"#EC4899 ", background:"#FCE7F3", width: 33},
-    L6: { eng: "detachment", fr: "دل‌بریدگی", fill:"#EC4899 ", background:"#FCE7F3", width: 27},
-    L7: { eng: "disinhibition", fr: "مهارگسیختگی", fill:"#EC4899 ", background:"#FCE7F3", width: 66},
-    L8: { eng: "negative_affectivity", fr: "عاطفه‌پذیری منفی", fill:"#EC4899 ", background:"#FCE7F3", width: 45},
-    L9: { eng: "antagonism", fr: "تضادورزی", fill:"#EC4899 ", background:"#FCE7F3", width: 42},
+    L5: { eng: "psychoticism", fr: "سایکوزگرایی", fill:"#EC4899 ", background:"#FCE7F3", fontColor:"#DB2777", width: 33},
+    L6: { eng: "detachment", fr: "دل‌بریدگی", fill:"#EC4899 ", background:"#FCE7F3", fontColor:"#DB2777", width: 27},
+    L7: { eng: "disinhibition", fr: "مهارگسیختگی", fill:"#EC4899 ", background:"#FCE7F3", fontColor:"#DB2777", width: 66},
+    L8: { eng: "negative_affectivity", fr: "عاطفه‌پذیری منفی", fill:"#EC4899 ", background:"#FCE7F3", fontColor:"#DB2777", width: 45},
+    L9: { eng: "antagonism", fr: "تضادورزی", fill:"#EC4899 ", background:"#FCE7F3", fontColor:"#DB2777", width: 42},
   };
 
   profileSpec = {
@@ -34,13 +34,13 @@ class JPFQ93 extends Profile {
     profile: {
       get dimensions() {
         return {
-          width: 702 + 2 * this.padding.x,
-          height: 450 + 2 * this.padding.y,
+          width: 735 + 2 * this.padding.x,
+          height: 456 + 2 * this.padding.y,
         };
       },
       padding: {
-        x: 120.5,
-        y: 152,
+        x: 84,
+        y: 89,
       },
     },
     /* "labels" part which has to be provided for each profile */

package/src/samples/PMCIEF93.js

@@ -1,4 +1,7 @@
 const { Profile, FS } = require("../Profile");
+const JPFQ93 = require("./JPFQ93");
+const FACES93 = require("./FACES93");
+const Handlebars = require("handlebars");
 
 class PMCIEF93 extends Profile {
   // Number of pages
@@ -6,9 +9,100 @@ class PMCIEF93 extends Profile {
 
   // Labels of the sample
   labels = {
-    L1: { eng: "me_and_my_partner", fr: "رابطه با شریک جنسی / همسر" },
-    L2: { eng: "me_and_my_children", fr: "رابطه با فرزندان" },
-    L3: { eng: "me_and_my_parents", fr: "رابطه با والدین" },
+    L1 : {"eng" : "axis_2_raw", "fr" : ""},
+    L2 : {"eng" : "axis_2_percentage", "fr" : ""},
+
+    L3 : {"eng" : "axis_3_raw", "fr" : ""},
+    L4 : {"eng" : "axis_3_percentage", "fr" : ""},
+    
+    L5 : {"eng" : "axis_3_selection_raw", "fr" : "", max:76},
+    L6 : {"eng" : "axis_3_selection_percentage", "fr" : ""},
+  
+    L7 : {"eng" : "axis_3_selection_demographic_raw", "fr" : "جمعیت‌شناختی", max:14},
+    L8 : {"eng" : "axis_3_selection_demographic_percentage", "fr" : ""},
+    L9 : {"eng" : "axis_3_selection_partner_family_raw", "fr" : "خانواده مقابل", max:8},
+    L10 : {"eng" : "axis_3_selection_partner_family_percentage", "fr" : ""},
+    L11 : {"eng" : "axis_3_selection_belief_raw", "fr" : "شناختی - اعتقادی", max:8},
+    L12 : {"eng" : "axis_3_selection_belief_percentage", "fr" : ""},
+    L13 : {"eng" : "axis_3_selection_personality_raw", "fr" : "شخصیتی - اخلاقی", max:34},
+    L14 : {"eng" : "axis_3_selection_personality_percentage", "fr" : ""},
+    L15 : {"eng" : "axis_3_selection_negative_raw", "fr" : "سلبی", max:16},
+    L16 : {"eng" : "axis_3_selection_negative_percentage", "fr" : ""},
+
+    L17 : {"eng" : "axis_3_intention_raw", "fr" : ""},
+    L18 : {"eng" : "axis_3_intention_percentage", "fr" : ""},
+
+    L19 : {"eng" : "mibq_raw", "fr" : "", max:216},
+    L20 : {"eng" : "mibq_percentage", "fr" : ""},
+    L21 : {"eng" : "mibq_unrealistic_expectations", "fr" : "توقعات\nنامعقول", max:76, bg:'#EAB308', color: '#A16207'},
+    L22 : {"eng" : "mibq_negativity", "fr" : "منفی‌بافی", max:35, bg:'#6366F1', color: '#4F46E5'},
+    L23 : {"eng" : "mibq_extreme_optimism", "fr" : "خوش‌بینی\nافراطی", max:52, bg:'#14B8A6', color: '#0D9488'},
+    L24 : {"eng" : "mibq_perfectionism", "fr" : "کامل\nخواهی", max:36, bg:'#A855F7', color: '#9333EA'},
+    L25 : {"eng" : "mibq_negative_self_belief", "fr" : "خودباوری\nمنفی", max:20, bg:'#F43F5E', color: '#E11D48'},
+
+    L26 : {"eng" : "axis_5_raw", "fr" : ""},
+    L27 : {"eng" : "axis_5_percentage", "fr" : ""},
+    L28 : {"eng" : "axis_5_spirituality", "fr" : "معنویت", color:"#007BA4"},
+    L29 : {"eng" : "axis_5_control", "fr" : "کنترل", color:"#F59E0B"},
+    L30 : {"eng" : "axis_5_pleasure", "fr" : "لذت", color:"#EC4899"},
+    L31 : {"eng" : "axis_5_safety", "fr" : "امنیت", color:"#10B981"},
+    L32 : {"eng" : "axis_5_social_status", "fr" : "منزلت اجتماعی", color:"#A78BFA"},
+
+    L33 : {"eng" : "faces_a", "fr" : ""},
+    L34 : {"eng" : "faces_b", "fr" : ""},
+    L35 : {"eng" : "faces_c", "fr" : ""},
+    L36 : {"eng" : "faces_d", "fr" : ""},
+    L37 : {"eng" : "faces_e", "fr" : ""},
+    L38 : {"eng" : "faces_f", "fr" : ""},
+    L39 : {"eng" : "faces_communication", "fr" : ""},
+    L40 : {"eng" : "faces_satisfaction", "fr" : ""},
+    L41 : {"eng" : "faces_cohesion", "fr" : ""},
+    L42 : {"eng" : "faces_flexibility", "fr" : ""},
+    L43 : {"eng" : "faces_interpretation", "fr" : ""},
+
+    L44 : {"eng" : "pastq_raw", "fr" : "", max:140},
+    L45 : {"eng" : "pastq_authoritarian_family", "fr" : "خانواده سخت‌گیر", max:32},
+    L46 : {"eng" : "pastq_authoritative_family", "fr" : "خانواده مقتدر", max:44},
+    L47 : {"eng" : "pastq_permissive_family", "fr" : "سهل‌گیر", max:12},
+    L48 : {"eng" : "pastq_neglectful_family", "fr" : "بی‌تفاوت", max:12},
+    L49 : {"eng" : "pastq_family_structure", "fr" : "شاخص ساخت خانوادگی", max:28},
+
+    L50 : {"eng" : "jpfq_identity", "fr" : ""},
+    L51 : {"eng" : "jpfq_self_direction", "fr" : ""},
+    L52 : {"eng" : "jpfq_empathy", "fr" : ""},
+    L53 : {"eng" : "jpfq_intimacy", "fr" : ""},
+    L54 : {"eng" : "jpfq_psychoticism", "fr" : ""},
+    L55 : {"eng" : "jpfq_detachment", "fr" : ""},
+    L56 : {"eng" : "jpfq_disinhibition", "fr" : ""},
+    L57 : {"eng" : "jpfq_negative_affectivity", "fr" : ""},
+    L58 : {"eng" : "jpfq_antagonism", "fr" : ""},
+
+    L59 : {"eng" : "axis_7_axis7_2_raw", "fr" : ""},
+    L60 : {"eng" : "axis_7_axis7_2_percentage", "fr" : ""},
+    L61 : {"eng" : "axis_7_axis7_2_hope", "fr" : "امید", max:24},
+    L62 : {"eng" : "axis_7_axis7_2_foresight", "fr" : "آینده‌نگری", max:16},
+    L63 : {"eng" : "axis_7_axis7_2_proposing", "fr" : "نقشه زندگی", max:28},
+    L64 : {"eng" : "axis_7_axis7_2_competency", "fr" : "شایستگی", max:24},
+    L65 : {"eng" : "axis_7_axis7_2_identity", "fr" : "هویت", max: 48},
+    L66 : {"eng" : "axis_7_axis7_2_intimacy", "fr" : "صمیمت", max: 36},
+
+    L67 : {"eng" : "dswls_raw", "fr" : ""},
+    L68 : {"eng" : "dswls_percentage", "fr" : ""},
+
+    L69 : {"eng" : "axis_8_axis8_1_raw", "fr" : ""},
+    L70 : {"eng" : "axis_8_axis8_1_percentage", "fr" : ""},
+    L71 : {"eng" : "axis_8_axis8_1_physical_problem", "fr" : "مشکل جسمانی", max:28},
+    L72 : {"eng" : "axis_8_axis8_1_neurotic_problem", "fr" : "مشکل نوروتیک", max:28},
+    L73 : {"eng" : "axis_8_axis8_1_personality_disorder", "fr" : "اختلال شخصیت", max:24},
+
+    L74 : {"eng" : "alvvct_raw", "fr" : ""},
+    L75 : {"eng" : "alvvct_percentage", "fr" : ""},
+    L76 : {"eng" : "alvvct_theoretical", "fr" : "نظری"},
+    L77 : {"eng" : "alvvct_economic", "fr" : "اقتصادی"},
+    L78 : {"eng" : "alvvct_aesthetic", "fr" : "هنری"},
+    L79 : {"eng" : "alvvct_social", "fr" : "اجتماعی"},
+    L80 : {"eng" : "alvvct_political", "fr" : "سیاسی"},
+    L81 : {"eng" : "alvvct_religious", "fr" : "مذهبی"},
   };
 
   profileSpec = {
@@ -18,7 +112,7 @@ class PMCIEF93 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: ["family_role"] /* In case you want to get some additional fields and show in the profile */,
     },
@@ -32,8 +126,8 @@ class PMCIEF93 extends Profile {
         };
       },
       padding: {
-        x: 20,
-        y: 20,
+        x: 0,
+        y: 0,
       },
     },
     /* "labels" part which has to be provided for each profile */
@@ -47,17 +141,127 @@ class PMCIEF93 extends Profile {
 
   _calcContext() {
     const { dataset } = this;
+    const [JPFQ93_Context] = new JPFQ93(
+      {
+        score: Object.fromEntries(dataset.score.slice(49, 58).map((s) =>[s.label.eng, s.mark])),
+        fields: dataset.info.fields,
+      },
+      {},
+      {
+        items: {
+          offsetY: 19,
+          widthCoeff: 9,
+          label: {
+            offsetX: 9,
+          },
+        },
+        gaugeItems: {
+          offsetX: 46,
+          circle: {
+            R: 16.5,
+            r: 12,
+          },
+        },
+        labelsPrefix: "jpfq",
+      }
+    ).getTemplateEngineParams();
+    const axis_7_2_items = dataset.score.slice(58, 66)
+    const axis_7_2 = {
+      raw: axis_7_2_items[0],
+      percentage: axis_7_2_items[1],
+      items: axis_7_2_items.slice(2).map(i => {i.mark = i.mark || 0; return i})
+    }
+
+    const axis_8_1_items = dataset.score.slice(68, 73)
+    const axis_8_1 = {
+      raw: axis_8_1_items[0],
+      percentage: axis_8_1_items[1],
+      items: axis_8_1_items.slice(2).map(i => {i.mark = i.mark || 0; return i}),
+      rStart:FS.toRadians(-90),
+      rEnd:FS.toRadians(-90)
+    }
+    const dswls= {
+      raw: dataset.score[66],
+      percentage: dataset.score[67]
+    }
+
+    const alvvct_items = dataset.score.slice(73, 81)
+    const alvvct = {
+      raw: alvvct_items[0],
+      percentage: alvvct_items[1],
+      items:alvvct_items.slice(2)
+    }
+
+    const axis_3= {
+      raw:dataset.score[2],
+      percentage:dataset.score[3],
 
-    // 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,
-    //   },
-    // }));
+      selection: {
+        raw:dataset.score[4],
+        percentage:dataset.score[5],
+        items: [dataset.score[6], dataset.score[8], dataset.score[10], dataset.score[12], dataset.score[14]]
+      }
+    }
+    dataset.questions.slice(26, 30).map(q => {
+      if(q.user_answered != '' && q.user_answered){
+        axis_3.selection.items[1].label.max += 2
+        axis_3.selection.raw.label.max += 2
+      }
+    })
+    const axis_3_intention = {
+      raw:dataset.score[16],
+      percentage:dataset.score[17],
+    }
 
-    return [{  }];
+    const mibq_items = dataset.score.slice(18, 25)
+    const mibq = {
+      raw: mibq_items[0],
+      percentage: mibq_items[1],
+      items:mibq_items.slice(2)
+    }
+    const axis_5_items = dataset.score.slice(25, 32)
+    const axis_5 = {
+      raw: axis_5_items[0],
+      percentage: axis_5_items[1],
+      items:axis_5_items.slice(2)
+    }
+
+    const pastq_items = dataset.score.slice(43, 49)
+    const pastq = {
+      raw: pastq_items[0],
+      items:pastq_items.slice(1)
+    }
+
+
+    const [FACES93_Context_page1, FACES93_Context_page2] = new FACES93(
+      {
+        score: Object.fromEntries(dataset.score.slice(32, 43).map((s) =>[s.label.eng, s.mark])),
+        fields: dataset.info.fields,
+      },
+      {},
+      {
+        items: {
+          offsetY: 19,
+          widthCoeff: 9,
+          label: {
+            offsetX: 9,
+          },
+        },
+        gaugeItems: {
+          offsetX: 46,
+          circle: {
+            R: 16.5,
+            r: 12,
+          },
+        },
+        labelsPrefix: "faces",
+      }
+    ).getTemplateEngineParams();
+    const axis_2 = {
+      raw: dataset.score[0],
+      percentage: dataset.score[1]
+    }
+    return [{ axis_2, pastq, FACES93_Context_page2, FACES93_Context_page1, axis_5, mibq, axis_3_intention, axis_3, alvvct, dswls, axis_8_1, axis_7_2, JPFQ93_Context }];
   }
 }
 

package/views/profiles/samples/FACES93_1.hbs

@@ -15,93 +15,6 @@
   </defs>
 
   <g transform="translate({{spec.profile.padding.[0].x}}, {{spec.profile.padding.[0].y}})">
-    <g transform="translate(0, 320)">
-      <text x="0" y="12.5" font-size="16" font-weight="600" fill="#3F3F46" text-anchor="middle" transform="rotate(-90)" xml:space="preserve">انعطاف‌پذیری:   {{item.marks.flexibility}}</text>
-      <g transform="translate(0, -170)">
-        <text x="0" y="35" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" transform="rotate(-90)">آشفته</text>
-      </g>
-      <g transform="translate(0, 160)">
-        <text x="0" y="35" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" transform="rotate(-90)">خشک</text>
-      </g>
-      <line x1="50" y1="206" x2="50" y2="-192" stroke="#3F3F46" stroke-width="2" marker-end="url(#marker1)" />
-    </g>
-    <g transform="translate(427.5, 0)">
-      <text x="0" y="12.5" font-size="16" font-weight="600" fill="#3F3F46" text-anchor="middle" xml:space="preserve">انسجام:   {{item.marks.cohesion}}</text>
-      <text x="-215" y="35" font-size="14" font-weight="400" fill="#71717A" text-anchor="start">از هم گسسته</text>
-      <text x="285" y="35" font-size="14" font-weight="400" fill="#71717A" text-anchor="start">در هم تنیده</text>
-      <line x1="-295" y1="50" x2="305" y2="50" stroke="#3F3F46" stroke-width="2" marker-end="url(#marker2)" />
-    </g>
-    <g transform="translate(132, 126)">
-      {{setVar "row1" (array "#FECACA" "#FEF9C3" "#FEF9C3" "#FEF9C3" "#FECACA")}}
-      {{setVar "row2" (array "#FEF9C3" "#D1FAE5" "#D1FAE5" "#D1FAE5" "#FEF9C3")}}
-      {{setVar "stops" (array 0 15 35 65 85 100)}}
-      {{setVar "fills" (array row1 row2 row2 row2 row1)}}
-      {{#forLoop 0 5 1}}
-        {{#with i as | j |}}
-          {{#forLoop 0 5 1}}
-            <rect x="{{math j '*' 120}}" y="{{math i '*' 80}}" width="120" height="80" fill="{{lookup (lookup @root.fills j) i}}" />
-            {{#if (boolean j '===' 4)}}
-              <text x="-20" y="{{math (math i '*' 80) '+' 10}}" font-size="12" font-weight="400" text-anchor="start" fill="#71717A">{{lookup (reverse @root.stops) i}}</text>
-              {{#if (boolean i '===' 4)}}
-                <text x="-20" y="{{math (math i '+' 1) '*' 80}}" font-size="12" font-weight="400" text-anchor="start" fill="#71717A">{{lookup (reverse @root.stops) (math i '+' 1)}}</text>
-              {{/if}} 
-              {{#unless @first}}
-                <line x1="0" y1="{{math i '*' 80}}" x2="600" y2="{{math i '*' 80}}" stroke="#FFFFFF" />
-              {{/unless}}
-            {{/if}}
-            {{#if (boolean (boolean i '===' 2) '&&' (boolean j '===' 2))}}
-              <text x="{{math (math j '*' 120) '+' 60}}" y="{{math (math i '*' 80) '+' 40}}" font-size="14" font-weight="400" text-anchor="middle" fill="#A1A1AA" fill-opacity="0.6" dy="5">دمکراتیک</text>
-            {{/if}}
-          {{/forLoop}}
-          {{#if (boolean j '!==' 0)}}
-            <line x1="{{math j '*' 120}}" y1="0" x2="{{math j '*' 120}}" y2="400" stroke="#FFFFFF" />
-          {{/if}}
-          <text x="{{math j '*' 120}}" y="-20" font-size="12" font-weight="400" text-anchor="start" fill="#71717A">{{lookup @root.stops j}}</text>
-          {{#if (boolean j '===' 4)}}
-            <text x="{{math (math j '+' 1) '*' 120}}" y="-20" font-size="12" font-weight="400" text-anchor="start" fill="#71717A">{{lookup @root.stops (math j '+' 1)}}</text>
-          {{/if}}
-        {{/with}}
-      {{/forLoop}}
-      <rect x="240" y="160" width="120" height="80" fill="none" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="4" />
-
-      <line x1="240" y1="160" x2="-30" y2="-20" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="5" marker-end="url(#pointer1)" />
-      <line x1="240" y1="240" x2="-30" y2="420" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="4" marker-end="url(#pointer2)" />
-      <line x1="360" y1="160" x2="630" y2="-20" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="4" marker-end="url(#pointer3)" />
-      <line x1="360" y1="240" x2="630" y2="420" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="4" marker-end="url(#pointer4)"/>
-
-      <g transform="translate(-50, -33.35)">
-        <text x="0" y="0" font-size="14" font-weight="400" text-anchor="start" fill="#A1A1AA" transform="rotate({{math (lookup angles 0) '+' 180}})" dy="3.5">بی‌خیال</text>
-      </g>
-      <g transform="translate(-50, 433.35)">
-        <text x="0" y="0" font-size="14" font-weight="400" text-anchor="start" fill="#A1A1AA" transform="rotate({{math (lookup angles 1) '+' 180}})" dy="3.5">طردکننده</text>
-      </g>
-      <g transform="translate(650, -33.35)">
-        <text x="0" y="0" font-size="14" font-weight="400" text-anchor="end" fill="#A1A1AA" transform="rotate({{lookup angles 2}})" dy="3.5">سهل‌گیر</text>
-      </g>
-      <g transform="translate(650, 433.35)">
-        <text x="0" y="0" font-size="14" font-weight="400" text-anchor="end" fill="#A1A1AA" transform="rotate({{lookup angles 3}})" dy="3.5">مستبد</text>
-      </g>
-
-      <g transform="translate(0, 400)">
-        <g transform="translate({{item.coords.x}}, -{{item.coords.y}})">
-          <circle cx="0" cy="0" r="2.5" fill="black" />
-          <circle cx="0" cy="0" r="7.5" fill="black" fill-opacity="0.3" />
-        </g>
-      </g>
-    </g>
-    <g transform="translate(578.5, 586)">
-      <g transform="translate(0, 0)">
-        <rect x="0" y="0" width="24" height="16" fill="#FECACA" />
-        <text x="-10" y="8" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" dy="3">نامتعادل</text>
-      </g>
-      <g transform="translate(-124, 0)">
-        <rect x="0" y="0" width="24" height="16" fill="#FEF9C3" />
-        <text x="-10" y="8" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" dy="3">نیمه متعادل</text>
-      </g>
-      <g transform="translate(-268, 0)">
-        <rect x="0" y="0" width="24" height="16" fill="#D1FAE5" />
-        <text x="-10" y="8" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" dy="3">متعادل</text>
-      </g>
-    </g>
+    {{> FACES93_1_partial}}
   </g>
 {{/layout}}

package/views/profiles/samples/FACES93_1_partial.hbs

@@ -0,0 +1,89 @@
+{{setVar "angles" (array -146.3 146.3 -33.7 33.7)}}
+<g transform="translate(0, 320)">
+    <text x="0" y="12.5" font-size="16" font-weight="600" fill="#3F3F46" text-anchor="middle" transform="rotate(-90)" xml:space="preserve">انعطاف‌پذیری:   {{item.marks.flexibility}}</text>
+    <g transform="translate(0, -170)">
+    <text x="0" y="35" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" transform="rotate(-90)">آشفته</text>
+    </g>
+    <g transform="translate(0, 160)">
+    <text x="0" y="35" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" transform="rotate(-90)">خشک</text>
+    </g>
+    <line x1="50" y1="206" x2="50" y2="-192" stroke="#3F3F46" stroke-width="2" marker-end="url(#marker1)" />
+</g>
+<g transform="translate(427.5, 0)">
+    <text x="0" y="12.5" font-size="16" font-weight="600" fill="#3F3F46" text-anchor="middle" xml:space="preserve">انسجام:   {{item.marks.cohesion}}</text>
+    <text x="-215" y="35" font-size="14" font-weight="400" fill="#71717A" text-anchor="start">از هم گسسته</text>
+    <text x="285" y="35" font-size="14" font-weight="400" fill="#71717A" text-anchor="start">در هم تنیده</text>
+    <line x1="-295" y1="50" x2="305" y2="50" stroke="#3F3F46" stroke-width="2" marker-end="url(#marker2)" />
+</g>
+<g transform="translate(132, 126)">
+    {{setVar "row1" (array "#FECACA" "#FEF9C3" "#FEF9C3" "#FEF9C3" "#FECACA")}}
+    {{setVar "row2" (array "#FEF9C3" "#D1FAE5" "#D1FAE5" "#D1FAE5" "#FEF9C3")}}
+    {{setVar "stops" (array 0 15 35 65 85 100)}}
+    {{setVar "fills" (array row1 row2 row2 row2 row1)}}
+    {{#forLoop 0 5 1}}
+    {{#with i as | j |}}
+        {{#forLoop 0 5 1}}
+        <rect x="{{math j '*' 120}}" y="{{math i '*' 80}}" width="120" height="80" fill="{{lookup (lookup @root.fills j) i}}" />
+        {{#if (boolean j '===' 4)}}
+            <text x="-20" y="{{math (math i '*' 80) '+' 10}}" font-size="12" font-weight="400" text-anchor="start" fill="#71717A">{{lookup (reverse @root.stops) i}}</text>
+            {{#if (boolean i '===' 4)}}
+            <text x="-20" y="{{math (math i '+' 1) '*' 80}}" font-size="12" font-weight="400" text-anchor="start" fill="#71717A">{{lookup (reverse @root.stops) (math i '+' 1)}}</text>
+            {{/if}} 
+            {{#unless @first}}
+            <line x1="0" y1="{{math i '*' 80}}" x2="600" y2="{{math i '*' 80}}" stroke="#FFFFFF" />
+            {{/unless}}
+        {{/if}}
+        {{#if (boolean (boolean i '===' 2) '&&' (boolean j '===' 2))}}
+            <text x="{{math (math j '*' 120) '+' 60}}" y="{{math (math i '*' 80) '+' 40}}" font-size="14" font-weight="400" text-anchor="middle" fill="#A1A1AA" fill-opacity="0.6" dy="5">دمکراتیک</text>
+        {{/if}}
+        {{/forLoop}}
+        {{#if (boolean j '!==' 0)}}
+        <line x1="{{math j '*' 120}}" y1="0" x2="{{math j '*' 120}}" y2="400" stroke="#FFFFFF" />
+        {{/if}}
+        <text x="{{math j '*' 120}}" y="-20" font-size="12" font-weight="400" text-anchor="start" fill="#71717A">{{lookup @root.stops j}}</text>
+        {{#if (boolean j '===' 4)}}
+        <text x="{{math (math j '+' 1) '*' 120}}" y="-20" font-size="12" font-weight="400" text-anchor="start" fill="#71717A">{{lookup @root.stops (math j '+' 1)}}</text>
+        {{/if}}
+    {{/with}}
+    {{/forLoop}}
+    <rect x="240" y="160" width="120" height="80" fill="none" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="4" />
+
+    <line x1="240" y1="160" x2="-30" y2="-20" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="5" marker-end="url(#pointer1)" />
+    <line x1="240" y1="240" x2="-30" y2="420" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="4" marker-end="url(#pointer2)" />
+    <line x1="360" y1="160" x2="630" y2="-20" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="4" marker-end="url(#pointer3)" />
+    <line x1="360" y1="240" x2="630" y2="420" stroke="#000000" stroke-opacity="0.15" stroke-dasharray="4" marker-end="url(#pointer4)"/>
+
+    <g transform="translate(-50, -33.35)">
+    <text x="0" y="0" font-size="14" font-weight="400" text-anchor="start" fill="#A1A1AA" transform="rotate({{math (lookup angles 0) '+' 180}})" dy="3.5">بی‌خیال</text>
+    </g>
+    <g transform="translate(-50, 433.35)">
+    <text x="0" y="0" font-size="14" font-weight="400" text-anchor="start" fill="#A1A1AA" transform="rotate({{math (lookup angles 1) '+' 180}})" dy="3.5">طردکننده</text>
+    </g>
+    <g transform="translate(650, -33.35)">
+    <text x="0" y="0" font-size="14" font-weight="400" text-anchor="end" fill="#A1A1AA" transform="rotate({{lookup angles 2}})" dy="3.5">سهل‌گیر</text>
+    </g>
+    <g transform="translate(650, 433.35)">
+    <text x="0" y="0" font-size="14" font-weight="400" text-anchor="end" fill="#A1A1AA" transform="rotate({{lookup angles 3}})" dy="3.5">مستبد</text>
+    </g>
+
+    <g transform="translate(0, 400)">
+    <g transform="translate({{item.coords.x}}, -{{item.coords.y}})">
+        <circle cx="0" cy="0" r="2.5" fill="black" />
+        <circle cx="0" cy="0" r="7.5" fill="black" fill-opacity="0.3" />
+    </g>
+    </g>
+</g>
+<g transform="translate(578.5, 586)">
+    <g transform="translate(0, 0)">
+    <rect x="0" y="0" width="24" height="16" fill="#FECACA" />
+    <text x="-10" y="8" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" dy="3">نامتعادل</text>
+    </g>
+    <g transform="translate(-124, 0)">
+    <rect x="0" y="0" width="24" height="16" fill="#FEF9C3" />
+    <text x="-10" y="8" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" dy="3">نیمه متعادل</text>
+    </g>
+    <g transform="translate(-268, 0)">
+    <rect x="0" y="0" width="24" height="16" fill="#D1FAE5" />
+    <text x="-10" y="8" font-size="14" font-weight="400" fill="#71717A" text-anchor="start" dy="3">متعادل</text>
+    </g>
+</g>

package/views/profiles/samples/FACES93_2.hbs

@@ -9,42 +9,11 @@
 
   <g transform="translate({{spec.profile.padding.[1].x}}, {{spec.profile.padding.[1].y}})">
     <g transform="translate({{math spec.page2.items.top.baseline.width '/' 2}}, {{spec.page2.items.top.topPos}})">
-      {{#each items.top as | item index |}}
-        {{#with @root.spec.page2.items.top as | itemsSpec |}}
-          <g transform="translate({{lookup (array -320 -210 -100 100 210 320) index}}, 0)">
-            <g transform="translate(-{{math itemsSpec.rect.base.width '/' 2}}, 0)">
-              {{bar item.height.base itemsSpec.rect.base.width (object tl=0 tr=itemsSpec.rect.base.br br=itemsSpec.rect.base.br bl=0) (toRad -90) fill=itemsSpec.rect.base.color}}
-            </g>
-            <text x="0" y="-{{math item.height.base '+' 12}}" font-size="12" font-weight="400" text-anchor="middle" fill="#D4D4D8" dy="3">{{item.maxValue}}</text>
-            <g fill="{{item.fill}}">
-              <g transform="translate(-{{math itemsSpec.rect.body.width '/' 2}}, 0)">
-                {{#forLoop 0 item.mark 1}}
-                  <rect x="0" y="-{{math (math i '+' 1) '*' itemsSpec.rect.body.distanceY}}" width="{{itemsSpec.rect.body.width}}" height="{{itemsSpec.rect.body.height}}" rx="{{itemsSpec.rect.body.br}}"/>
-                {{/forLoop}}
-              </g>
-              <text x="{{math (math itemsSpec.rect.body.width '/' 2) '+' 16}}" y="-{{math item.mark '*' itemsSpec.rect.body.distanceY}}" font-size="16" font-weight="500" text-anchor="middle" dy="4">{{item.mark}}</text>
-              <text x="0" y="20" font-size="14" font-weight="400" text-anchor="middle" dy="5">{{item.label.fr}}</text>
-            </g>
-          </g>
-        {{/with}}
-      {{/each}}
-      <line x1="-{{math spec.page2.items.top.baseline.width '/' 2}}" y1="0" x2="{{math spec.page2.items.top.baseline.width '/' 2}}" y2="0" stroke="#A1A1AA" stroke-width="2"/>
+      {{> FACES93_2_1_partial}}
     </g>
 
     <g transform="translate(0, {{math spec.page2.items.top.topPos '+' spec.page2.items.bottom.offsetY}})">
-      {{#each items.bottom as | item index |}}
-        {{#with @root.spec.page2.items.bottom as | itemsSpec |}}
-          <g transform="translate(0, {{math index '*' (math itemsSpec.rect.body.height '+' 20)}})">
-            <text x="150" y="{{math itemsSpec.rect.body.height '/' 2}}" font-size="16" font-weight="400" text-anchor="start" fill="#52525B" dy="4">{{item.label.fr}}</text>
-            <g transform="translate(168, 0)">
-              <rect x="0" y="{{math (math itemsSpec.rect.body.height '-' itemsSpec.rect.base.height) '/' 2}}" width="{{itemsSpec.rect.base.width}}" height="{{itemsSpec.rect.base.height}}" rx="{{itemsSpec.rect.base.br}}" fill="#F4F4F5"/>
-              <text x="{{math itemsSpec.rect.base.width '+' 27}}" y="{{math itemsSpec.rect.body.height '/' 2}}" font-size="12" font-weight="400" text-anchor="middle" fill="#A1A1AA" dy="3">{{itemsSpec.maxValue}}</text>
-              <rect x="0" y="0" width="{{item.width}}" height="{{itemsSpec.rect.body.height}}" rx="{{itemsSpec.rect.body.br}}" fill="url(#bg)"/>
-              <text x="{{math item.width '-' 18}}" y="{{math itemsSpec.rect.body.height '/' 2}}" font-size="16" font-weight="600" text-anchor="middle" fill="white" dy="4">{{item.mark}}</text>
-            </g>
-          </g>
-        {{/with}}
-      {{/each}}
+      {{> FACES93_2_2_partial}}
     </g>
   </g>
 

package/views/profiles/samples/FACES93_2_1_partial.hbs

@@ -0,0 +1,20 @@
+{{#each items.top as | item index |}}
+    {{#with ../spec.page2.items.top as | itemsSpec |}}
+        <g transform="translate({{lookup (array -320 -210 -100 100 210 320) index}}, 0)">
+        <g transform="translate(-{{math itemsSpec.rect.base.width '/' 2}}, 0)">
+            {{bar item.height.base itemsSpec.rect.base.width (object tl=0 tr=itemsSpec.rect.base.br br=itemsSpec.rect.base.br bl=0) (toRad -90) fill=itemsSpec.rect.base.color}}
+        </g>
+        <text x="0" y="-{{math item.height.base '+' 12}}" font-size="12" font-weight="400" text-anchor="middle" fill="#D4D4D8" dy="3">{{item.maxValue}}</text>
+        <g fill="{{item.fill}}">
+            <g transform="translate(-{{math itemsSpec.rect.body.width '/' 2}}, 0)">
+            {{#forLoop 0 item.mark 1}}
+                <rect x="0" y="-{{math (math i '+' 1) '*' itemsSpec.rect.body.distanceY}}" width="{{itemsSpec.rect.body.width}}" height="{{itemsSpec.rect.body.height}}" rx="{{itemsSpec.rect.body.br}}"/>
+            {{/forLoop}}
+            </g>
+            <text x="{{math (math itemsSpec.rect.body.width '/' 2) '+' 16}}" y="-{{math item.mark '*' itemsSpec.rect.body.distanceY}}" font-size="16" font-weight="500" text-anchor="middle" dy="4">{{item.mark}}</text>
+            <text x="0" y="20" font-size="14" font-weight="400" text-anchor="middle" dy="5">{{item.label.fr}}</text>
+        </g>
+        </g>
+    {{/with}}
+{{/each}}
+<line x1="-{{math spec.page2.items.top.baseline.width '/' 2}}" y1="0" x2="{{math spec.page2.items.top.baseline.width '/' 2}}" y2="0" stroke="#A1A1AA" stroke-width="2"/>

package/views/profiles/samples/FACES93_2_2_partial.hbs

@@ -0,0 +1,13 @@
+{{#each items.bottom as | item index |}}
+    {{#with ../spec.page2.items.bottom as | itemsSpec |}}
+        <g transform="translate(0, {{math index '*' (math itemsSpec.rect.body.height '+' 20)}})">
+        <text x="150" y="{{math itemsSpec.rect.body.height '/' 2}}" font-size="16" font-weight="400" text-anchor="start" fill="#52525B" dy="4">{{item.label.fr}}</text>
+        <g transform="translate(168, 0)">
+            <rect x="0" y="{{math (math itemsSpec.rect.body.height '-' itemsSpec.rect.base.height) '/' 2}}" width="{{itemsSpec.rect.base.width}}" height="{{itemsSpec.rect.base.height}}" rx="{{itemsSpec.rect.base.br}}" fill="#F4F4F5"/>
+            <text x="{{math itemsSpec.rect.base.width '+' 27}}" y="{{math itemsSpec.rect.body.height '/' 2}}" font-size="12" font-weight="400" text-anchor="middle" fill="#A1A1AA" dy="3">{{itemsSpec.maxValue}}</text>
+            <rect x="0" y="0" width="{{item.width}}" height="{{itemsSpec.rect.body.height}}" rx="{{itemsSpec.rect.body.br}}" fill="url(#bg)"/>
+            <text x="{{math item.width '-' 18}}" y="{{math itemsSpec.rect.body.height '/' 2}}" font-size="16" font-weight="600" text-anchor="middle" fill="white" dy="4">{{item.mark}}</text>
+        </g>
+        </g>
+    {{/with}}
+{{/each}}

package/views/profiles/samples/JPFQ93.hbs

@@ -1,44 +1,5 @@
 {{#> layout}}
-
-<defs>
-    <linearGradient id="horizontal-shadow">
-        <stop offset="0%"  stop-color="black" />
-        <stop offset="100%" stop-color="transparent" />
-  </linearGradient>
-  <linearGradient id="vertical-shadow" gradientTransform="rotate(90)">
-        <stop offset="0%"  stop-color="transparent" />
-        <stop offset="100%" stop-color="black" />
-  </linearGradient>
-</defs>
-
 <g transform="translate({{spec.profile.padding.x}}, {{spec.profile.padding.y}})">
-    {{!-- <rect x="0" y="0" width="702" height="450" fill="#E2E8F0"/> --}}
-    {{#each dataset.score}}
-        <g transform="translate(0, {{math 5  '+' ( math 51 '*' @key )}})">
-            <text y="0" x="129" text-anchor="start" font-size="18px" font-weight="400" dy="18px">{{label.fr}}</text>
-            <g transform="translate(147, 0)">
-                {{bar (math label.width '*' 4.5) 30 (object tl=0 tr=15 bl=0 br=15) (toRad 0) fill=label.background opacity='.8'}}
-                {{bar (math mark '*' 4.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 '*' 4.5) '+' 7.5 }}" dy="6px" text-anchor="start" font-size="24px" fill="{{label.fill}}" font-weight="500" direction="ltr">
-                    {{mark}}
-                    <tspan font-size="18px" fill="#D4D4D8" font-weight="400">/ {{label.width}}</tspan>
-                </text> 
-            </g>
-        </g>
-    {{/each}}
-    <g transform="translate(642.5, 428)">
-        <g transform="translate(9, 0)">
-            {{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="4.5" y="-387" dominant-baseline="auto" text-anchor="middle" fill="#A1A1AA" font-size="18px" font-weight="400">378</text>
-        <text x="21" y="{{math markSum '*' -1}}" dy="6" text-anchor="start" font-size="24px" fill="#3F3F46" font-weight="500" direction="ltr">{{markSum}}</text>
-        <text transform="rotate(-90, 0, 0)" x="-3" y="-28" dy="14" text-anchor="end" font-size="18px" font-weight="400">نمره کل</text>
-
-        <rect x="-3" y="0" width="15" height="3" fill="#FFFFFF" style="filter: drop-shadow(0 -3px 5px rgba(0,0,0, .5));"/>
-    </g>
-    <g transform="translate(144.5, 0)">
-        <rect x="0" y="0" width="3" height="450" rx="1" fill="#FFFFFF" style="filter: drop-shadow(3px 0 5px rgba(0,0,0, .5));"/>
-    </g>
+    {{> JPFQ93_partial}}
 </g>
 {{/ layout}}