@baravak/risloo-profile-cli 4.19.0 → 4.19.1

package/package.json

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

package/src/publish/json/profiles/MMFAD9A.json

@@ -91,12 +91,26 @@
     }
   ],
   "score": {
-    "overall_performance": 24,
-    "problem_solving": 12,
-    "communication": 19,
-    "roles": 22,
-    "affective_involvement": 14,
-    "behaviour_control": 16,
-    "affective_responsiveness": 9
+    "overall_performance_raw": 24,
+    "overall_performance_avg": 2,
+    "overall_performance_report": "unhealthy",
+    "problem_solving_raw": 12,
+    "problem_solving_avg": 2,
+    "problem_solving_report": "healthy",
+    "communication_raw": 19,
+    "communication_avg": 2.1,
+    "communication_report": "healthy",
+    "roles_raw": 22,
+    "roles_avg": 2,
+    "roles_report": "healthy",
+    "affective_involvement_raw": 14,
+    "affective_involvement_avg": 2,
+    "affective_involvement_report": "healthy",
+    "behaviour_control_raw": 16,
+    "behaviour_control_avg": 1.7,
+    "behaviour_control_report": "healthy",
+    "affective_responsiveness_raw": 9,
+    "affective_responsiveness_avg": 1.5,
+    "affective_responsiveness_report": "healthy"
   }
 }

package/src/samples/MMFAD9A.js

@@ -7,13 +7,33 @@ class MMAFD9A extends Profile {
 
   // Labels of the sample
   labels = {
-    L1: { eng: "problem_solving", fr: "حل مسأله", CoP: 2.2, max: 24},
-    L2: { eng: "roles", fr: "نقش‌ها", CoP: 2.3, max: 44},
-    L3: { eng: "affective_responsiveness", fr: "پاسخ‌دهی عاطفی", CoP: 2.2, max: 24},
-    L4: { eng: "communication", fr: "ارتباط", CoP: 2.2, max: 36},
-    L5: { eng: "affective_involvement", fr: "مشارکت عاطفی", CoP: 2.1, max: 28},
-    L6: { eng: "behaviour_control", fr: "کنترل رفتار", CoP: 1.9, max: 36},
-    L7: { eng: "overall_performance", fr: "کارکرد عمومی", CoP: 2, max: 48},
+    L1: { eng: "problem_solving_raw", fr: "حل مسأله", CoP: 2.2},
+    L1_2 : {eng: "problem_solving_avg"},
+    L1_3 : {eng: "problem_solving_report"},
+
+    L2: { eng: "roles_raw", fr: "نقش‌ها", CoP: 2.3},
+    L2_2 : {eng: "roles_avg"},
+    L2_3 : {eng: "roles_report"},
+
+    L3: { eng: "affective_responsiveness_raw", fr: "پاسخ‌دهی عاطفی", CoP: 2.2},
+    L3_2 : {eng: "affective_responsiveness_avg"},
+    L3_3 : {eng: "affective_responsiveness_report"},
+
+    L4: { eng: "communication_raw", fr: "ارتباط", CoP: 2.2},
+    L4_2 : {eng: "communication_avg"},
+    L4_3 : {eng: "communication_report"},
+
+    L5: { eng: "affective_involvement_raw", fr: "مشارکت عاطفی", CoP: 2.1},
+    L5_2 : {eng: "affective_involvement_avg"},
+    L5_3 : {eng: "affective_involvement_report"},
+
+    L6: { eng: "behaviour_control_raw", fr: "کنترل رفتار", CoP: 1.9},
+    L6_2 : {eng: "behaviour_control_avg"},
+    L6_3 : {eng: "behaviour_control_report"},
+
+    L7: { eng: "overall_performance_raw", fr: "کارکرد عمومی", CoP: 2},
+    L7_2 : {eng: "overall_performance_avg"},
+    L7_3 : {eng: "overall_performance_report"},
   };
 
   profileSpec = {
@@ -53,51 +73,54 @@ class MMAFD9A extends Profile {
       spec: { parameters: spec },
       dataset,
     } = this;
+    const scores = []
+    for (let i = 0; i < 21; i+= 3) {
+      const item = {mark: dataset.score[i].mark, label: {...dataset.score[i].label}}
+      const avg = dataset.score[i + 1].mark
+      item.label.avg = avg
 
+      const elements = [];
+      let greenLiene = 12;
+      for (let i = 0; i < 31; i++) {
+        let color = "";
+        let type = "";
+        const point = 1 + round(i * 0.1, 1);
+        if (point < item.label.CoP) {
+          greenLiene += 14;
+        }
+        if (point === avg) {
+          color = avg >= item.label.CoP ? "#DC2626" : "#16A34A";
+          type = "selected";
+        } else {
+          type = Math.round(point) === point ? "z" : "nz";
+          if (point === item.label.CoP) {
+            color = "#A8A29E";
+          } else if (point > item.label.CoP) {
+            color = type === "z" ? '#F43F5E33' : "#F43F5E1A";
+          } else {
+            color = type === 'z' ? '#16A34A33' : "#16A34A1A";
+          }
+        }
+        elements.push({
+          point,
+          color,
+          type,
+          isCoP: point === item.label.CoP,
+        });
+      }
+      item.label.CoPText = item.label.CoP.toString().replace(".", "٬");
+      scores.push({
+        ...item,
+        elements,
+        greenLiene,
+        redLine: 446 - greenLiene,
+        avgText: item.label.avg.toString().replace(".", "٬"),
+        avgSelected: elements.findIndex((e) => e.type === "selected")
+      })
+    }
     return [
       {
-        scores: dataset.score.map((score) => {
-          const elements = [];
-          score.label.avg = round(score.mark / (score.label.max/4), 1);
-          const avg = round(score.label.avg, 1);
-          let greenLiene = 12;
-          for (let i = 0; i < 31; i++) {
-            let color = "";
-            let type = "";
-            const point = 1 + round(i * 0.1, 1);
-            if (point < score.label.CoP) {
-              greenLiene += 14;
-            }
-            if (point === avg) {
-              color = avg >= score.label.CoP ? "#DC2626" : "#16A34A";
-              type = "selected";
-            } else {
-              type = Math.round(point) === point ? "z" : "nz";
-              if (point === score.label.CoP) {
-                color = "#A8A29E";
-              } else if (point > avg) {
-                color = type === "z" ? '#F43F5E33' : "#F43F5E1A";
-              } else {
-                color = type === 'z' ? '#16A34A33' : "#16A34A1A";
-              }
-            }
-            elements.push({
-              point,
-              color,
-              type,
-              isCoP: point === score.label.CoP,
-            });
-          }
-          score.label.CoPText = score.label.CoP.toString().replace(".", "٬");
-          return {
-            ...score,
-            elements,
-            greenLiene,
-            redLine: 446 - greenLiene,
-            avgText: score.label.avg.toString().replace(".", "٬"),
-            avgSelected: elements.findIndex((e) => e.type === "selected")
-          };
-        }),
+        scores
       },
     ];
   }