@baravak/risloo-profile-cli 4.86.0 → 4.87.0

package/package.json

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

package/src/samples/AIS93.js

@@ -1,25 +1,25 @@
 const { Profile } = require("../Profile");
 
 // ---------------------------------------------------------------------------
-// AIS93 — مقیاس بی‌خوابی آتن (AIS-8 فارسی). No Figma source: the chart is
-// designed from the approved individual-result specification of the science
-// package (AIS-FA8-C2), whose rules this layout enforces rather than decorates:
-//   - one score only, the 0–24 total, drawn as its position on one line with
-//     that range; no night/day subscore, no component, no comparison;
-//   - classification is off: one neutral hue, no coloured zone, no threshold,
-//     no label, no warning, no percentile or norm;
-//   - the only interpretation is the two approved sentences, verbatim;
-//   - the reference cut-off (6) is text only, with its source, sample and year,
-//     because the profile is read by the authorised specialist and never handed
-//     to the respondent; the score is never compared with it;
-//   - all-or-nothing: unless scoring/AIS93.py returns status "valid", only the
-//     no-result message is drawn — never a partial or zero score.
-// Chart 863 × 674, centred on the 943 × 754 design page.
+// AIS93 — مقیاس بی‌خوابی آتن (AIS-8 فارسی). Chart drawn from the Figma
+// half-ring gauge (Assessments v3.0.0, node 5405:146150): the total (0–24) as
+// a 180° gauge filling clockwise from 0 on the left to 100 % on the right,
+// percentage and "mark از max" in the centre, title above.
+// The interpretation panel and the reference cut-off text were dropped on
+// request to match that design.
+// All-or-nothing: unless scoring/AIS93.py returns status "valid", only the
+// no-result message is drawn — never a partial or zero score.
+// The gauge piece sits at (346, 284) on the 943 × 754 design page, one pixel
+// off-centre on each axis (insets 346 / 347 and 284 / 283), so the Chart is
+// the page minus the measured left/top insets: 251 × 186. The piece is 250
+// wide; its bottom labels paint down to y ≈ 186.
 // ---------------------------------------------------------------------------
-const CHART = { width: 863, height: 674 };
+const CHART = { width: 251, height: 186 };
+const INSET = { x: 346, y: 284 }; // measured on the design page
 
-// The total's own axis: 0 at x=LINE.left, 24 at x=LINE.right.
-const LINE = { left: 20, right: 640, y: 112 };
+// Gauge centre on the Chart; R 125 / r 87.5, so the ring's top sits at y = 42.
+const GAUGE = { x: 125, y: 167 };
+const SWEEP = { start: Math.PI, end: 2 * Math.PI }; // left → top → right, clockwise
 
 class AIS93 extends Profile {
   static pages = 1;
@@ -40,15 +40,15 @@ class AIS93 extends Profile {
     profile: {
       get dimensions() {
         return {
-          width: CHART.width + 2 * this.padding.x, // 863 → 903
-          height: CHART.height + 2 * this.padding.y, // 674 → 714
+          width: CHART.width + 2 * this.padding.x, // 251 → 903
+          height: CHART.height + 2 * this.padding.y, // 186 → 714
         };
       },
-      // Chart inset inside the 943 × 754 design page minus the 20 px the layout
-      // owns on every side, so the with-sidebar page renders at scale 1.
+      // Measured Chart inset on the 943 × 754 design page minus the 20 px the
+      // layout owns on every side, so the with-sidebar page renders at scale 1.
       padding: {
-        x: (943 - CHART.width) / 2 - 20, // 20
-        y: (754 - CHART.height) / 2 - 20, // 20
+        x: INSET.x - 20, // 326
+        y: INSET.y - 20, // 264
       },
     },
     labels: Object.values(this.labels),
@@ -68,17 +68,19 @@ class AIS93 extends Profile {
 
     const mark = s[0].mark ?? 0;
     const max = s[0].label.max;
+    const p = Math.min(Math.max(mark / max, 0), 1);
 
     return [
       {
         valid: true,
         total: {
+          title: "بی‌خوابی آتن",
           mark,
           max,
-          left: LINE.left,
-          right: LINE.right,
-          y: LINE.y,
-          x: LINE.left + ((LINE.right - LINE.left) * mark) / max,
+          pct: Math.round(p * 100),
+          zeta: SWEEP.start + p * (SWEEP.end - SWEEP.start),
+          x: GAUGE.x,
+          y: GAUGE.y,
         },
       },
     ];

package/views/profiles/samples/AIS93.hbs

@@ -1,60 +1,48 @@
 {{#> layout}}
 
+  <defs>
+    {{#if valid}}
+      {{! Fill gradient from the Figma export, in gauge-centred user space (page 346,451 → 555.826,359.187 about centre 471,451) }}
+      <linearGradient id="aisGauge" x1="-125" y1="0" x2="84.826" y2="-91.813" gradientUnits="userSpaceOnUse">
+        <stop stop-color="#818CF8"/>
+        <stop offset="1" stop-color="#4338CA"/>
+      </linearGradient>
+      {{! Track shape: both ends rounded; clips the fill so a full gauge keeps the rounded right end }}
+      <clipPath id="aisGaugeTrack">
+        {{gauge 125 87.5 (object tl=6 tr=6 bl=6 br=6) (object start=(toRad 180) end=(toRad 0)) false}}
+      </clipPath>
+    {{/if}}
+  </defs>
+
   <g transform="translate({{spec.profile.padding.x}}, {{spec.profile.padding.y}})">
 
   {{#if valid}}
 
-    {{! ===================== The total, on its own 0–24 line ===================== }}
-    {{! One neutral hue; no zone, no threshold, no tick at the reference cut-off. }}
-    <text x="843" y="24" text-anchor="start" font-size="16" font-weight="600" fill="#1E293B">نمرهٔ کل</text>
-
-    <line x1="{{total.left}}" y1="{{total.y}}" x2="{{total.right}}" y2="{{total.y}}" stroke="#CBD5E1" stroke-width="4" stroke-linecap="round"/>
-    <line x1="{{total.left}}" y1="{{math total.y '-' 7}}" x2="{{total.left}}" y2="{{math total.y '+' 7}}" stroke="#94A3B8" stroke-width="1.5"/>
-    <line x1="{{total.right}}" y1="{{math total.y '-' 7}}" x2="{{total.right}}" y2="{{math total.y '+' 7}}" stroke="#94A3B8" stroke-width="1.5"/>
-    <text x="{{total.left}}" y="{{math total.y '+' 24}}" text-anchor="middle" font-size="11" fill="#94A3B8">0</text>
-    <text x="{{total.right}}" y="{{math total.y '+' 24}}" text-anchor="middle" font-size="11" fill="#94A3B8">{{total.max}}</text>
-
-    <circle cx="{{total.x}}" cy="{{total.y}}" r="7" fill="#475569" stroke="white" stroke-width="2"/>
-    <text x="{{total.x}}" y="{{math total.y '-' 14}}" text-anchor="middle" font-size="13" font-weight="700" fill="#1E293B">{{total.mark}}</text>
-
-    {{! Total card (right of the line) }}
-    <rect x="693.5" y="52.5" width="169" height="120" rx="8" fill="#F8FAFC" stroke="#E2E8F0"/>
-    <text x="778" y="82" text-anchor="middle" font-size="14" font-weight="600" fill="#475569">نمرهٔ کل</text>
-    <text x="778" y="134" text-anchor="middle" font-size="44" font-weight="700" fill="#1E293B">{{total.mark}}</text>
-    <text x="778" y="158" text-anchor="middle" font-size="13" fill="#64748B">از {{total.max}}</text>
-
-    {{! ===================== Interpretation, uncertainty, reference cut-off ===================== }}
-    {{! Fixed text from the science package; the profile is read by the authorised specialist. }}
-    <rect x="0.5" y="204.5" width="862" height="401" rx="8" fill="#F8FAFC" stroke="#E2E8F0"/>
-
-    <text x="843" y="236" text-anchor="start" font-size="15" font-weight="600" fill="#1E293B">تفسیر</text>
-    <text x="843" y="264" text-anchor="start" font-size="13.5" fill="#334155">نمرهٔ بالاتر، دشواری بیشتری در خواب را نشان می‌دهد، همان‌طور که پاسخ‌دهنده خودش گزارش کرده است.</text>
-    <text x="843" y="288" text-anchor="start" font-size="13.5" fill="#334155">این نمره تشخیص نیست.</text>
-
-    <text x="843" y="326" text-anchor="start" font-size="15" font-weight="600" fill="#1E293B">عدم قطعیت و محدودیت</text>
-    <circle cx="840" cy="349.5" r="2" fill="#334155"/>
-    <text x="831" y="354" text-anchor="start" font-size="13.5" fill="#334155">این نسخهٔ فارسی اعتبارسنجی نشده و برش بومی ندارد.</text>
-    <circle cx="840" cy="373.5" r="2" fill="#334155"/>
-    <text x="831" y="378" text-anchor="start" font-size="13.5" fill="#334155">این ابزار غربال است، نه تشخیص.</text>
-    <circle cx="840" cy="397.5" r="2" fill="#334155"/>
-    <text x="831" y="402" text-anchor="start" font-size="13.5" fill="#334155">آزمون تصمیم‌یار است، نه تصمیم‌گیر قطعی.</text>
-
-    <text x="843" y="440" text-anchor="start" font-size="15" font-weight="600" fill="#1E293B">نقطهٔ برش مرجع</text>
-    <text x="843" y="468" text-anchor="start" font-size="13" fill="#334155">نمرهٔ کل <tspan font-weight="700">6</tspan> — فقط اطلاعات مرجع برای متخصص؛ نمرهٔ این پاسخ‌نامه با آن طبقه‌بندی نمی‌شود.</text>
-    <text x="843" y="496" text-anchor="start" font-size="13" fill="#334155">منبع: مطالعهٔ روایی تشخیصیِ نسخهٔ یونانی، در برابر تشخیص بی‌خوابی غیرارگانیک در <tspan class="eng-font" font-family="Dana">ICD-10</tspan>.</text>
-    <text x="843" y="520" text-anchor="start" font-size="13" fill="#334155">جامعه: نمونهٔ بالینی/مختلط آتن، 299 نفر.</text>
-    <text x="843" y="544" text-anchor="start" font-size="13" fill="#334155">سال: 2003.</text>
-    <text x="843" y="572" text-anchor="start" font-size="13" font-weight="600" fill="#334155">این عدد به نسخهٔ فارسی و به فرم پنج‌گویه‌ای تعلق ندارد.</text>
+    {{! ===================== Half-ring gauge (Figma node 5405:146150) ===================== }}
+    <g transform="translate({{total.x}}, {{total.y}})">
+      {{gauge 125 87.5 (object tl=6 tr=6 bl=6 br=6) (object start=(toRad 180) end=(toRad 0)) false fill="#F1F5F9"}}
+      {{#if total.mark}}{{gauge 125 87.5 (object tl=6 tr=0 bl=6 br=0) (object start=(toRad 180) end=total.zeta) false clip-path="url(#aisGaugeTrack)" fill="url(#aisGauge)"}}{{/if}}
+    </g>
+
+    <text x="124.5" y="18" text-anchor="middle" font-size="18" font-weight="500" fill="#4338CA">{{total.title}}</text>
+
+    <text x="125" y="141" text-anchor="middle" font-size="28" font-weight="600" fill="#4F46E5" direction="ltr">٪ {{total.pct}}</text>
+    <text x="125" y="166" text-anchor="middle" font-size="18" font-weight="500" fill="#64748B">{{total.mark}} از {{total.max}}</text>
+
+    <text x="18.5" y="186" text-anchor="middle" font-size="14" font-weight="500" fill="#64748B">0</text>
+    <text x="232.5" y="186" text-anchor="middle" font-size="14" font-weight="500" fill="#64748B" direction="ltr">٪ 100</text>
 
   {{else}}
 
-    {{! ===================== No result (all-or-nothing) ===================== }}
-    <rect x="181.5" y="237.5" width="500" height="199" rx="12" fill="#F8FAFC" stroke="#E2E8F0"/>
-    <circle cx="431.5" cy="288" r="17" fill="none" stroke="#64748B" stroke-width="2"/>
-    <line x1="431.5" y1="279" x2="431.5" y2="291" stroke="#64748B" stroke-width="2.5" stroke-linecap="round"/>
-    <circle cx="431.5" cy="297.5" r="1.6" fill="#64748B"/>
-    <text x="431.5" y="344" text-anchor="middle" font-size="17" font-weight="600" fill="#1E293B">نمره تولید نشد</text>
-    <text x="431.5" y="376" text-anchor="middle" font-size="13" fill="#64748B">پاسخ ناقص یا نامعتبر است؛ هیچ نمره‌ای، حتی نمرهٔ جزئی، گزارش نمی‌شود.</text>
+    {{! ===================== No result (all-or-nothing), centred on the Chart ===================== }}
+    <g transform="translate(-306.5, -243.5)">
+      <rect x="181.5" y="237.5" width="500" height="199" rx="12" fill="#F8FAFC" stroke="#E2E8F0"/>
+      <circle cx="431.5" cy="288" r="17" fill="none" stroke="#64748B" stroke-width="2"/>
+      <line x1="431.5" y1="279" x2="431.5" y2="291" stroke="#64748B" stroke-width="2.5" stroke-linecap="round"/>
+      <circle cx="431.5" cy="297.5" r="1.6" fill="#64748B"/>
+      <text x="431.5" y="344" text-anchor="middle" font-size="17" font-weight="600" fill="#1E293B">نمره تولید نشد</text>
+      <text x="431.5" y="376" text-anchor="middle" font-size="13" fill="#64748B">پاسخ ناقص یا نامعتبر است؛ هیچ نمره‌ای، حتی نمرهٔ جزئی، گزارش نمی‌شود.</text>
+    </g>
 
   {{/if}}