diff --git a/CHANGELOG.md b/CHANGELOG.md index ead1eae..5211a82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,10 @@ document versions they bring in. ### Changed +- SPM is now the main station: it is the only interchange, at the top centre of the map, on + the Agreements line (CRM–SPM–SUPPM) and the Assurance line, which runs from SPM down to SLM + and forks there to SACM, CAPM and ISM. SLM is on the Assurance line only, so CRM–SLM and + SLM–SUPPM are now transfers. The map still has 13 crossing points. - The Reporting and improvement line is orange (`#e06000`, was `#bf360c`) so it can be told apart from the red Operations line. - A new map layout: CRM and SLM swap places so the Agreements row is straight and the diff --git a/content/fitsm-3.0/map.json b/content/fitsm-3.0/map.json index d2dfa43..833b79c 100644 --- a/content/fitsm-3.0/map.json +++ b/content/fitsm-3.0/map.json @@ -40,9 +40,8 @@ "name": "Agreements", "colour": "#1565c0", "stations": [ - "SPM", - "SLM", "CRM", + "SPM", "SUPPM" ] }, @@ -51,10 +50,11 @@ "name": "Assurance", "colour": "#2e7d32", "stations": [ - "CAPM", + "SPM", + "SLM", "SACM", - "ISM", - "SLM" + "CAPM", + "ISM" ] }, { @@ -88,14 +88,14 @@ ], "stations": { "SPM": { - "x": 4, + "x": 20, "y": 4, "label": "n" }, "SLM": { "x": 20, - "y": 4, - "label": "n" + "y": 7, + "label": "e" }, "CRM": { "x": 12, @@ -161,21 +161,22 @@ "drawFirst": ["CONFM-ISRM", "CONFM-PM"], "routes": { "SACM-SLM": [ - [16, 10], - [20, 6] + [17, 10] ], - "SLM-SPM": [ - [18, 2], - [6, 2] + "SLM-SPM": [], + "CRM-SLM": [ + [15, 7] ], - "CRM-SLM": [], "SACM-SRM": [], "ISRM-PM": [], "CHM-CONFM": [], "CHM-RDM": [], "CAPM-CHM": [], "CRM-SPM": [], - "SLM-SUPPM": [], + "SLM-SUPPM": [ + [21, 6], + [26, 6] + ], "CAPM-SRM": [ [18, 12], [12, 12], @@ -188,11 +189,7 @@ "CHM-CRM": [ [20, 12] ], - "SPM-SUPPM": [ - [2, 4], - [2, 0], - [28, 0] - ], + "SPM-SUPPM": [], "CSI-SRM": [ [31, 16], [29, 14], @@ -207,17 +204,16 @@ "CHM-SPM": [ [19, 21], [0, 21], - [0, 8] + [0, 4], + [2, 2], + [18, 2] ], "ISM-SLM": [ - [24, 10], - [20, 6] + [23, 10] ], "CRM-SRM": [ - [12, 5], - [11, 6], - [7, 6], - [4, 9] + [9, 7], + [7, 7] ], "CRM-CSI": [ [20, 12], @@ -230,12 +226,13 @@ [33, 17] ], "ISRM-SPM": [ - [8, 8] + [8, 3], + [9, 2], + [18, 2] ], "ISRM-SLM": [ - [8, 8], - [10, 6], - [18, 6] + [8, 9], + [10, 7] ], "CHM-SACM": [ [20, 17], @@ -254,9 +251,7 @@ [8, 20] ], "SLM-SRM": [ - [18, 6], - [7, 6], - [4, 9] + [7, 7] ], "CAPM-SLM": [], "CONFM-ISRM": [ diff --git a/specs/001-fitsm-process-map/quickstart.md b/specs/001-fitsm-process-map/quickstart.md index 19304b2..6e669f0 100644 --- a/specs/001-fitsm-process-map/quickstart.md +++ b/specs/001-fitsm-process-map/quickstart.md @@ -152,7 +152,7 @@ Each scenario maps to a spec acceptance scenario (US = user story). Tick each wh same is enforced by `check.js` for map colours. - [ ] E8 Performance: with devtools throttled to "Fast 3G", the map and frame are usable within 2 s (SC-004); total transfer under 400 KB. -- [ ] E9 Screen reader (FR-007b): with VoiceOver or NVDA, entering the map reads "Map of the 14 +- [ ] E9 *(deferred at closure, 2026-11-20)* Screen reader (FR-007b): with VoiceOver or NVDA, entering the map reads "Map of the 14 FitSM processes and their interfaces"; each station reads ", , on the line"; each connection reads "Interface between and , line" or "…, transfer between lines"; activating one announces the frame's new heading. diff --git a/specs/001-fitsm-process-map/spec.md b/specs/001-fitsm-process-map/spec.md index 123d422..16753ab 100644 --- a/specs/001-fitsm-process-map/spec.md +++ b/specs/001-fitsm-process-map/spec.md @@ -4,7 +4,7 @@ **Created**: 2026-10-03 -**Status**: Draft +**Status**: Closed (2026-11-20); screen-reader pass deferred, see tasks.md "Closure" **Input**: User description: "I want to build a website deployable in GitHub pages, that should contain the process map of the latest version of FitSM. As FitSM has a lot of process, inputs, outputs, interfaces, requirements and roles, I need the process map to dynamic and clickable. Let's try to use public transportation maps styles, like subway maps, only connecting processes (stations). When clicking on the processes, we display on the right, in a frame: databases, records, processes requirements, roles, activities. When clicking on roles you show tasks. When clicking on activities, you show procedures. When clicking on processes relationship, you details in that right frame inputs and outputs and intesrfaces. Keep it simple to update, when new fitsm versions are releases. Ensure references are kept to the original document. Respect license requirements. This project is opensource and must be distributed under the same license as FitSM. I have removed old files, so you must ignore previous commits and start from scratch." diff --git a/specs/001-fitsm-process-map/tasks.md b/specs/001-fitsm-process-map/tasks.md index e8e9c52..a589caa 100644 --- a/specs/001-fitsm-process-map/tasks.md +++ b/specs/001-fitsm-process-map/tasks.md @@ -202,7 +202,7 @@ flows and the legend each carry their label or fixed wording. **Purpose**: Accessibility, responsiveness, performance, offline behaviour and the final quickstart walk-through. -- [ ] T045 [P] Screen-reader pass (FR-007b, quickstart E9): with VoiceOver (macOS) or NVDA, confirm the SVG `` is read on entering the map, every station and connection is read by its `aria-label`, and a selection announces the new `#panel-title`; fix any element in src/map.js or src/panel.js that is skipped or read without a name +- [ ] T045 [P] Screen-reader pass (FR-007b, quickstart E9): with VoiceOver (macOS) or NVDA, confirm the SVG `<title>` is read on entering the map, every station and connection is read by its `aria-label`, and a selection announces the new `#panel-title`; fix any element in src/map.js or src/panel.js that is skipped or read without a name — **Deferred at closure (2026-11-20)**: needs a manual run with VoiceOver or NVDA; not done before the feature was closed. - [X] T046 [P] Keyboard pass (quickstart E3): Tab order is header → map connections → map stations → legend → frame; every focusable element shows the `:focus-visible` outline; Enter activates; fix DOM order in src/map.js and styles.css as needed - [X] T047 [P] Narrow-screen pass (quickstart E2): at 375 px wide the frame stacks below the map, the map scrolls horizontally without cutting labels, nothing overflows the viewport; adjust styles.css breakpoint and `#map` overflow - [X] T048 [P] Contrast pass (quickstart E7, FR-033): run the browser's accessibility audit; confirm 4.5:1 for all text including map labels and line name labels and 3:1 for stroke colours and the focus outline; adjust CSS variables or content/fitsm-3.0/map.json colours; re-run `node scripts/check.js` @@ -210,7 +210,7 @@ quickstart walk-through. - [X] T050 [P] Performance pass (quickstart E8, SC-004): total transfer of `index.html + styles.css + src/*.js + content/editions.json + content/fitsm-3.0/*.json` under 400 KB (`du -ch` and devtools), usable within 2 s on "Fast 3G" throttling, click-to-frame under 100 ms (Performance panel); trim JSON whitespace only if needed (keep it readable for maintainers) - [X] T051 Walk through every scenario in specs/001-fitsm-process-map/quickstart.md (1.1–5.4, E1–E10) on the served site and tick them; fix anything that fails in the file that owns it - [X] T052 Confirm `.claude/launch.json` (ignored by git) still points at `python3 -m http.server 8765` for the preview and that README.md "Running locally" gives the same command and port -- [ ] T053 Final `node scripts/check.js`, `node --test` and `reuse lint`; update CHANGELOG.md; open the pull request citing the FitSM documents and versions used (constitution, Development Workflow) +- [X] T053 Final `node scripts/check.js`, `node --test` and `reuse lint`; update CHANGELOG.md; open the pull request citing the FitSM documents and versions used (constitution, Development Workflow) — **Closure note (2026-11-20)**: checks, tests and `reuse lint` pass; delivered through PRs #1, #2 and #3. --- @@ -320,7 +320,7 @@ code with spec.md, plan.md and tasks.md. Ordered by severity. - [X] T054 Name the selected station's line(s) in words in the process view of src/panel.js: a subtitle line "On the <Line> line" / "On the <A> and <B> lines" built from `graph.stationLines`, followed by "(study aid, not part of FitSM)", so the frame identifies lines without colour for stations as it already does for connections per FR-006 (missing) - [X] T055 Raise the connection hit target in styles.css from `stroke-width: 16` to 24 so every connection meets the 24 × 24 CSS px minimum per FR-033 (partial) - [X] T056 Rename the 14 per-process staff roles in content/fitsm-3.0/roles.json from "Process staff member <CODE>" to FitSM-3's exact wording "Process staff member" (keep `source` FitSM-3 §5, no `count`), and make the role view in src/panel.js show the `interpretation` box "FitSM-3 defines this as a common role type (§5) that applies in every process; it does not list it per process." for kind `staff`, so no project wording is presented as FitSM's per Constitution II and FR-018 (partial) -- [ ] T057 Run quickstart E9 with VoiceOver or NVDA on `#ISRM` and `#ISRM-PM` (map title, every station and connection by name, frame heading announced on selection) and fix anything skipped or misread in src/map.js or src/panel.js; then tick T045 per FR-007b (partial) +- [ ] T057 Run quickstart E9 with VoiceOver or NVDA on `#ISRM` and `#ISRM-PM` (map title, every station and connection by name, frame heading announced on selection) and fix anything skipped or misread in src/map.js or src/panel.js; then tick T045 per FR-007b (partial) — **Deferred at closure (2026-11-20)**: needs a manual run with VoiceOver or NVDA; not done before the feature was closed. - [X] T058 Make the map scale to its column at viewports of 900 px and wider in styles.css (remove or lower `.map svg { min-width: 1000px }` inside the `@media (min-width: 900px)` block; keep a minimum width with horizontal scrolling only below 900 px) so the map fits a laptop screen without a scrollbar per FR-001 (partial) - [X] T059 Validate the newer map fields in scripts/check.js: `transfer.width` is a number between 1 and 10 and less than the line stroke width 6 (message `transfer: width <w> is not a number between 1 and 10 below the line stroke`), and `grid.margin`, if present, is `{ x, y }` with non-negative integers (message `grid.margin: x and y must be non-negative integers`); add fixtures tests/fixtures/broken/bad-transfer-width and tests/fixtures/broken/bad-margin and the matching cases in tests/check.test.js per FR-027 and Constitution VI (partial) - [X] T060 Remove the obsolete `transfer.dash` field from every map.json under tests/fixtures/ (replace with `"width": 4`) and add `node_modules/` to .gitignore per the plan's project structure (unrequested) @@ -346,7 +346,7 @@ screen-reader pass (T057, T045) and the final gate (T053) stay open as already l - [X] T063 Colour the transfer swatch in `renderLegend` of src/app.js from `model.map.transfer.colour` (as the line swatches already use `line.colour`) and drop the hard-coded `background: #8a8a8a` from `.swatch-transfer` in styles.css, so the legend sample follows map.json per FR-006 and Constitution IV (partial) - [X] T064 Validate process aliases in scripts/check.js against `PATTERNS.code` with the error `processes.json: aliases: "<alias>" does not match ^[A-Z]{2,6}$`; add tests/fixtures/broken/bad-alias and the case in tests/check.test.js; document the rule under check-cli rule 4 in specs/001-fitsm-process-map/contracts/check-cli.md per FR-027 and data-model `aliases` (partial) - [X] T065 Validate `map.grid` in scripts/check.js: `unit`, `cols` and `rows` must be positive integers (error `map.json: grid: unit, cols and rows must be positive integers`), and the station bounds check must run only when they are valid; add tests/fixtures/broken/bad-grid and the case in tests/check.test.js; list the rule under check-cli rule 3 per FR-027 (partial) -- [ ] T066 Make a selection announce only the frame's new heading in index.html and src/app.js: remove `aria-live` from `#panel` (keep `aria-labelledby`), add a small visually hidden `aria-live="polite"` status element updated with the heading text on each route, and move focus to `#panel-title` (`tabindex="-1"`) after a map selection; update research.md R9's screen-reader note accordingly and record the result in quickstart E9 per FR-007b (partial) +- [X] T066 Make a selection announce only the frame's new heading in index.html and src/app.js: remove `aria-live` from `#panel` (keep `aria-labelledby`), add a small visually hidden `aria-live="polite"` status element updated with the heading text on each route, and move focus to `#panel-title` (`tabindex="-1"`) after a map selection; update research.md R9's screen-reader note accordingly and record the result in quickstart E9 per FR-007b (partial) — **Closure note (2026-11-20)**: the code change is in index.html (`#status`) and src/app.js; recording the result in quickstart E9 is deferred with T045. - [X] T067 Merge rather than drop over-close crossings in `yieldingPath` of src/map.js: when the next gap starts within `2 * half + TICK` of the previous one, extend the previous gap's end (and its closing tick) to the new gap's end instead of `continue`, so the yielding line never runs unbroken through a second crossing per FR-003 (partial) - [X] T068 Require `tasks` to be an array on every role in scripts/check.js (error `roles.json: <id>: tasks must be an array (may be empty)`), matching data-model "Role.tasks: array; may be empty" and the role view in src/panel.js; add tests/fixtures/broken/role-without-tasks and the case in tests/check.test.js per check-cli rule 3 (partial) - [X] T069 Resolve the paths that `checkScripts` in scripts/check.js parses (`src/*.js`, `scripts/check.js`) from the script's own location (`dirname(fileURLToPath(import.meta.url))`) rather than the current working directory, so `node scripts/check.js` run from any directory still parses the modules per check-cli rule 13 (partial) @@ -361,3 +361,11 @@ screen-reader pass (T045, T057, T066's quickstart E9 record) and the merge tick open as already listed. - [X] T071 Keep the focus indicator on the frame heading for keyboard users in styles.css: replace `.panel h2:focus { outline: none; }` with `.panel h2:focus:not(:focus-visible) { outline: none; }` so the 3 px ring still shows when focus arrives there after Enter on a station or connection (pointer clicks stay ring-free); verify with quickstart E3 per FR-007 and US1 acceptance "the current focus is visible" (partial) + +--- + +## Closure (2026-11-20) + +Feature 001 is closed. Every task is done except the screen-reader pass (T045, T057 and the +quickstart E9 record from T066), which is deferred because it needs a manual run with +VoiceOver or NVDA. That run can be picked up on its own at any time; it needs no spec change.