From b23410c190b81a5f2a34b40a717928b241608dd4 Mon Sep 17 00:00:00 2001 From: larssand Date: Mon, 2 Nov 2026 08:21:17 +0100 Subject: [PATCH] feat(race-setup): group the race list into today, upcoming and folded done, with progress and search (1.52.0) --- CHANGELOG.md | 6 +++ README.md | 2 + README.sv.md | 2 + package-lock.json | 4 +- package.json | 2 +- src/app.js | 22 ++++++++ src/event_views.js | 84 +++++++++++++++++++++---------- src/event_workspace_controller.js | 17 +++++++ src/race_list_logic.js | 38 ++++++++++++++ src/styles.css | 19 +++++++ tests/browser_race_setup.js | 13 +++++ tests/race_list.test.js | 32 ++++++++++++ tests/run.js | 1 + 13 files changed, 213 insertions(+), 29 deletions(-) create mode 100644 src/race_list_logic.js create mode 100644 tests/race_list.test.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 4252188..a495014 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.52.0 - 2026-11-02 + +### Changed + +- Race Setup's race list is grouped into Today, Upcoming and Done (folded away), with races on the same date together and how far each has come (running heat, next heat, heats run, or done). A search box finds older races. Manage is the main button on each race; delete is a small ✕. + ## 1.51.0 - 2026-11-01 ### Added diff --git a/README.md b/README.md index 6c55d3e..1a2d7b6 100644 --- a/README.md +++ b/README.md @@ -148,6 +148,8 @@ Lap validation: - **Quick Open Practice:** just a name. It creates an untimed all-transponder session and goes straight to Timing; no class, drivers or format are needed. - **Create Race Wizard:** Basics → Participants → Session plan → Confirm. Choose a class and a preset, pick the drivers, and the practice/qualifying (or team race) sessions are created. +The **race list** is grouped so it stays short: **Today** (and anything running), **Upcoming**, and **Done** folded away (races whose heats are all run or whose date has passed). Races on the same date are listed together, each with how far it has come (● running heat, *Next: Q2 H1*, *3/9 run* or ✓ Done). A search box finds older races. + After creation the race is managed in four tabs (Race Setup → Manage): - **Participants & teams:** tick who races, and manage teams for endurance. - **Format:** diff --git a/README.sv.md b/README.sv.md index f596f71..096055d 100644 --- a/README.sv.md +++ b/README.sv.md @@ -161,6 +161,8 @@ Varvkontroll: - **Snabbstart Open Practice:** bara ett namn. Den skapar en otidsatt session för alla transpondrar och går direkt till Tidtagning; ingen klass, förare eller format behövs. - **Skapa race-guiden:** Grunder → Deltagare → Sessionsplan → Bekräfta. Välj klass och förval, bocka i förarna, och träning, kval (eller lagrace) skapas. +**Racelistan** är grupperad så att den hålls kort: **Idag** (och det som pågår), **Kommande**, och **Körda** ihopfällt (race där alla heat är körda eller datumet har passerat). Race samma datum ligger ihop, var och ett med hur långt det kommit (● pågående heat, *Nästa: Q2 H1*, *3/9 körda* eller ✓ Klar). En sökruta hittar äldre race. + Efter det hanteras racet i fyra flikar (Race Setup → Hantera): - **Deltagare & lag:** bocka i vilka som kör, och hantera lag för endurance. - **Format:** diff --git a/package-lock.json b/package-lock.json index 42ab85a..b96fc8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.51.0", + "version": "1.52.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.51.0", + "version": "1.52.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index ed46519..78e2040 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.51.0", + "version": "1.52.0", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/src/app.js b/src/app.js index 52be02f..26800a6 100644 --- a/src/app.js +++ b/src/app.js @@ -1756,6 +1756,17 @@ const TRANSLATIONS = { "events.mode_track_option": "Sponsor Event (delade bilar)", "events.title": "Event", "events.race_title": "Race", + "events.list_search": "Sök race…", + "events.list_empty": "Inga race skapade än.", + "events.list_no_date": "Utan datum", + "events.progress_empty": "Inga heat än", + "events.progress_done": "Klar", + "events.progress_next": "Nästa: {name}", + "events.progress_count": "{done}/{total} körda", + "events.group_today": "Idag", + "events.group_upcoming": "Kommande", + "events.group_nothing_planned": "Inget planerat idag eller framåt.", + "events.group_done": "Körda ({count})", "events.track_only_intro": "Här skapar du sponsor-event med delade bilar/transpondrar.", "events.race_only_intro": "Här skapar du riktiga race med personlig transponder per förare.", "events.manage": "Hantera", @@ -3693,6 +3704,17 @@ const TRANSLATIONS = { "events.mode_track_option": "Track Event (shared cars)", "events.title": "Events", "events.race_title": "Races", + "events.list_search": "Search races…", + "events.list_empty": "No races created yet.", + "events.list_no_date": "No date", + "events.progress_empty": "No heats yet", + "events.progress_done": "Done", + "events.progress_next": "Next: {name}", + "events.progress_count": "{done}/{total} run", + "events.group_today": "Today", + "events.group_upcoming": "Upcoming", + "events.group_nothing_planned": "Nothing planned today or later.", + "events.group_done": "Done ({count})", "events.track_only_intro": "Create sponsor events with shared cars/transponders here.", "events.race_only_intro": "Create proper races with personal driver transponders here.", "events.manage": "Manage", diff --git a/src/event_views.js b/src/event_views.js index 4b72d2b..e6f97e0 100644 --- a/src/event_views.js +++ b/src/event_views.js @@ -1,3 +1,7 @@ +import { groupEventsForList } from "./race_list_logic.js"; + +const todayKey = () => { const d = new Date(); return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`; }; + export function renderEventWorkspaceMarkup(mode, deps) { const { state, @@ -14,6 +18,7 @@ export function renderEventWorkspaceMarkup(mode, deps) { getClassName, getModeLabel, editingEvent, + doneOpen = false, } = deps; const isRaceMode = mode === "race"; const filteredEvents = state.events.filter((event) => event.mode === mode); @@ -22,6 +27,53 @@ export function renderEventWorkspaceMarkup(mode, deps) { .map((c) => ``) .join(""); + const language = state.settings?.language === "en" ? "en-GB" : "sv-SE"; + const formatDay = (date) => { + if (!date) return t("events.list_no_date"); + const parsed = new Date(`${date}T12:00:00`); + return Number.isNaN(parsed.getTime()) ? date : parsed.toLocaleDateString(language, { weekday: "short", day: "numeric", month: "short", year: "numeric" }); + }; + const progressLabel = ({ total, done, live, next }) => { + if (!total) return `${escapeHtml(t("events.progress_empty"))}`; + if (done === total) return `✓ ${escapeHtml(t("events.progress_done"))}`; + const status = live + ? ` ${escapeHtml(live)}` + : `${escapeHtml(t("events.progress_next", { name: next }))}`; + return `${status} ${escapeHtml(t("events.progress_count", { done, total }))}`; + }; + const renderEventRow = ({ event: e, progress }) => ` +
+
+ ${escapeHtml(e.name)} + ${e.raceConfig?.practiceOnly ? escapeHtml(t("events.quick_open_practice_title")) : escapeHtml(getClassName(e.classId))}${isRaceMode ? "" : ` · ${escapeHtml(getModeLabel(e.mode))}`} +
+
${e.raceConfig?.practiceOnly ? "" : progressLabel(progress)}
+
+ ${e.raceConfig?.practiceOnly + ? `` + : ``} + + +
+
`; + const renderDays = (days) => days.map((day) => ` +
+

${escapeHtml(formatDay(day.date))}

+ ${day.items.map(renderEventRow).join("")} +
`).join(""); + const renderEventGroups = () => { + const groups = groupEventsForList(filteredEvents, (id) => getSessionsForEvent(id), todayKey()); + const doneCount = groups.done.reduce((sum, day) => sum + day.items.length, 0); + return ` + ${groups.today.length ? `

${escapeHtml(t("events.group_today"))}

${renderDays(groups.today)}
` : ""} + ${groups.upcoming.length ? `

${escapeHtml(t("events.group_upcoming"))}

${renderDays(groups.upcoming)}
` : ""} + ${!groups.today.length && !groups.upcoming.length ? `

${escapeHtml(t("events.group_nothing_planned"))}

` : ""} + ${doneCount ? `
+ ${escapeHtml(t("events.group_done", { count: doneCount }))} + ${renderDays(groups.done)} +
` : ""}`; + }; + return ` ${ isRaceMode @@ -101,33 +153,13 @@ export function renderEventWorkspaceMarkup(mode, deps) { } -
-

${t(isRaceMode ? "events.race_title" : "events.title")}

+
+
+

${t(isRaceMode ? "events.race_title" : "events.title")}

+ ${filteredEvents.length > 6 ? `` : ""} +
- ${renderTable( - [t("table.name"), t("table.date"), t("table.class"), t("table.mode"), t("events.sessions"), t("events.actions")], - filteredEvents.map((e) => { - const sessions = getSessionsForEvent(e.id); - return ` - - ${escapeHtml(e.name)} - ${escapeHtml(e.date)} - ${e.raceConfig?.practiceOnly ? escapeHtml(t("events.open_practice_all_transponders")) : escapeHtml(getClassName(e.classId))} - ${e.raceConfig?.practiceOnly ? escapeHtml(t("events.quick_open_practice_title")) : getModeLabel(e.mode)} - ${sessions.length} - - - ${ - e.raceConfig?.practiceOnly - ? `` - : `` - } - - - - `; - }) - )} + ${filteredEvents.length ? renderEventGroups() : `

${escapeHtml(t("events.list_empty"))}

`}
diff --git a/src/event_workspace_controller.js b/src/event_workspace_controller.js index 67d033b..cd2c345 100644 --- a/src/event_workspace_controller.js +++ b/src/event_workspace_controller.js @@ -1,5 +1,20 @@ import { renderEventWorkspaceMarkup } from "./event_views.js"; +// The folded "Done" races remember whether they were opened (per browser only). +const DONE_OPEN_KEY = "rc_event_list_done_open"; +const readDoneOpen = () => { try { return localStorage.getItem(DONE_OPEN_KEY) === "1"; } catch { return false; } }; +function bindEventListTools() { + const done = document.getElementById("eventListDone"); + done?.addEventListener("toggle", () => { try { localStorage.setItem(DONE_OPEN_KEY, done.open ? "1" : "0"); } catch { /* per browser only */ } }); + // Search filters the rows in place and opens the done group so older races are found too. + document.getElementById("eventListSearch")?.addEventListener("input", (event) => { + const query = String(event.target.value || "").trim().toLowerCase(); + document.querySelectorAll("[data-event-row]").forEach((row) => { row.hidden = Boolean(query) && !row.dataset.search.includes(query); }); + document.querySelectorAll("[data-event-day]").forEach((day) => { day.hidden = ![...day.querySelectorAll("[data-event-row]")].some((row) => !row.hidden); }); + if (query && done) done.open = true; + }); +} + export function renderEventWorkspaceView(context) { const { mode, @@ -65,7 +80,9 @@ export function renderEventWorkspaceView(context) { getClassName, getModeLabel, editingEvent, + doneOpen: readDoneOpen(), }); + bindEventListTools(); document.getElementById("quickOpenPracticeForm")?.addEventListener("submit", (event) => { event.preventDefault(); diff --git a/src/race_list_logic.js b/src/race_list_logic.js new file mode 100644 index 0000000..83c89c1 --- /dev/null +++ b/src/race_list_logic.js @@ -0,0 +1,38 @@ +// The race list in Race Setup, grouped so it stays short: today, upcoming and done (folded +// away), each grouped per date, with how far each race has come. +import { orderSessionsForRunning } from "./event_race_logic.js"; + +const isDone = (session) => ["finished", "stopped"].includes(session.status); +const isLive = (session) => ["running", "paused"].includes(session.status); + +// { total, done, live, next }: live/next are session names (in running order). +export function getEventProgress(event, sessions = []) { + const ordered = orderSessionsForRunning(sessions, event?.sessionOrder); + const live = ordered.find(isLive) || null; + const next = ordered.find((session) => !isDone(session) && !isLive(session)) || null; + return { total: ordered.length, done: ordered.filter(isDone).length, live: live?.name || "", next: next?.name || "" }; +} + +// A race is done when every session has been run, or its date has passed. +export function groupEventsForList(events = [], getSessions = () => [], today = "") { + const groups = { today: [], upcoming: [], done: [] }; + events.forEach((event) => { + const progress = getEventProgress(event, getSessions(event.id)); + const allRun = progress.total > 0 && progress.done === progress.total; + const date = String(event.date || ""); + const key = progress.live || date === today ? "today" : allRun || (date && date < today) ? "done" : "upcoming"; + groups[key].push({ event, progress }); + }); + const byDay = (items, newestFirst) => { + const days = new Map(); + items.forEach((item) => { + const date = String(item.event.date || ""); + if (!days.has(date)) days.set(date, []); + days.get(date).push(item); + }); + return [...days.entries()] + .sort(([a], [b]) => (newestFirst ? b.localeCompare(a) : (a || "9999").localeCompare(b || "9999"))) + .map(([date, list]) => ({ date, items: list.sort((a, b) => String(a.event.name || "").localeCompare(String(b.event.name || ""), undefined, { numeric: true })) })); + }; + return { today: byDay(groups.today, false), upcoming: byDay(groups.upcoming, false), done: byDay(groups.done, true) }; +} diff --git a/src/styles.css b/src/styles.css index b254d1a..c390b30 100644 --- a/src/styles.css +++ b/src/styles.css @@ -4806,3 +4806,22 @@ tr.is-removed td.lap-actions { .day-schedule-table th:nth-child(3), .day-schedule-table td:nth-child(3) { display: none; } .board-time { font-size: 1.6rem; } } + +/* Race Setup: races grouped today / upcoming / done, per date */ +.event-list .panel-header { display: flex; justify-content: space-between; align-items: center; gap: 12px; flex-wrap: wrap; } +.event-list-search { max-width: 260px; } +.event-group + .event-group { margin-top: 18px; } +.event-group-title { margin: 0 0 8px; font-size: 1rem; text-transform: uppercase; letter-spacing: 0.05em; color: var(--muted); } +details.event-group > summary { cursor: pointer; list-style: revert; } +.event-day { margin-bottom: 12px; } +.event-day h4 { margin: 0 0 6px; font-size: 0.95rem; } +.event-row { display: grid; grid-template-columns: minmax(180px, 2fr) minmax(140px, 1.5fr) auto; gap: 12px; align-items: center; padding: 8px 10px; border: 1px solid var(--line); border-radius: 10px; margin-bottom: 6px; background: var(--surface-card); } +.event-row-main { display: grid; gap: 2px; } +.event-row-main small { color: var(--muted); } +.event-progress.is-done { color: var(--ok); font-weight: 600; } +.event-progress.is-live { color: var(--ok); font-weight: 700; } +.event-row-actions { justify-content: flex-end; } +@media (max-width: 700px) { + .event-row { grid-template-columns: 1fr; } + .event-row-actions { justify-content: flex-start; } +} diff --git a/tests/browser_race_setup.js b/tests/browser_race_setup.js index 428ecfc..563878e 100644 --- a/tests/browser_race_setup.js +++ b/tests/browser_race_setup.js @@ -107,4 +107,17 @@ export async function runRaceSetupSmoke({ evaluate, navigate, fill, savedState, return order.includes(q12.id) && order.indexOf(q12.id) < order.indexOf(q11.id); }, "the order is saved on the race"); console.log("PASS Race Setup lists sessions in running order and ▲▼ change it"); + + // The race list: races from past dates are folded away under Done; search finds them. + await navigate("race_setup", "raceWizardStepForm"); + const raceId = (await raceState()).id; + assert.equal(await evaluate(`document.querySelector('[data-event-row="${raceId}"]').closest("details")?.id || ""`), "eventListDone", "a race from a past date is under Done"); + assert.equal(await evaluate(`document.getElementById("eventListDone").open`), false, "Done is folded by default"); + if (await evaluate(`Boolean(document.getElementById("eventListSearch"))`)) { + await evaluate(`(() => { const box = document.getElementById("eventListSearch"); box.value = "endurance"; box.dispatchEvent(new Event("input")); })()`); + assert.equal(await evaluate(`document.getElementById("eventListDone").open`), true, "search opens Done"); + assert.equal(await evaluate(`document.querySelector('[data-event-row="${raceId}"]').hidden`), false); + assert.ok(await evaluate(`[...document.querySelectorAll("[data-event-row]")].some((row) => row.hidden)`), "other races are filtered out"); + } + console.log("PASS Race Setup groups races into today, upcoming and a folded Done list, with search"); } diff --git a/tests/race_list.test.js b/tests/race_list.test.js new file mode 100644 index 0000000..eb2d1ea --- /dev/null +++ b/tests/race_list.test.js @@ -0,0 +1,32 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { groupEventsForList, getEventProgress } from "../src/race_list_logic.js"; + +const s = (id, eventId, name, status = "ready", type = "qualification") => ({ id, eventId, name, status, type }); +const sessions = [ + s("a1", "a", "Q1 H1", "finished"), s("a2", "a", "Q1 H2"), + s("b1", "b", "Q1 H1", "finished"), + s("c1", "c", "Q1 H1"), + s("d1", "d", "Q1 H1", "running"), +]; +const events = [ + { id: "a", name: "Cup #2 2WD", date: "2026-11-08" }, + { id: "b", name: "Cup #1 2WD", date: "2026-11-01" }, + { id: "c", name: "Old unfinished", date: "2026-10-01" }, + { id: "d", name: "Live", date: "2026-10-30" }, + { id: "e", name: "Cup #2 4WD", date: "2026-11-08" }, + { id: "f", name: "Today", date: "2026-11-02" }, +]; +const getSessions = (id) => sessions.filter((item) => item.eventId === id); + +test("races are grouped today / upcoming / done, per date", () => { + const groups = groupEventsForList(events, getSessions, "2026-11-02"); + assert.deepEqual(groups.today.flatMap((day) => day.items.map((item) => item.event.id)), ["d", "f"], "today's date and anything running"); + assert.deepEqual(groups.upcoming.map((day) => [day.date, day.items.map((item) => item.event.id)]), [["2026-11-08", ["a", "e"]]], "same day together"); + assert.deepEqual(groups.done.map((day) => day.date), ["2026-11-01", "2026-10-01"], "newest done first"); +}); + +test("progress says what is running or next and how many are run", () => { + assert.deepEqual(getEventProgress(events[0], getSessions("a")), { total: 2, done: 1, live: "", next: "Q1 H2" }); + assert.equal(getEventProgress(events[3], getSessions("d")).live, "Q1 H1"); +}); diff --git a/tests/run.js b/tests/run.js index 671bff4..1638e9d 100644 --- a/tests/run.js +++ b/tests/run.js @@ -1,4 +1,5 @@ import "./auth.test.js"; +import "./race_list.test.js"; import "./day_schedule.test.js"; import "./race_day_live.test.js"; import "./series_next_step.test.js";