diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c7b050..e16d38a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,17 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.43.1 - 2026-10-31 + +### Fixed + +- **Series: "Create races" always says what it did.** It reports how many races were made, or that none were because the series' classes already have races on those dates - clicking again used to do nothing at all, with no message. +- **Deleting a series can take its races along.** After confirming the delete, a second question asks whether the series' races (with heats and results) should be removed from Race Setup too, or kept, e.g. for the results archive. Races that also belong to another series are kept. + +### Changed + +- **Race Day: shorter session list.** The session picker shows today's races, plus anything running or selected, grouped per race in the order they were set up. Old races, practices and other series' rounds are hidden behind "Show all sessions". + ## 1.43.0 - 2026-10-31 ### Added diff --git a/package-lock.json b/package-lock.json index c7699e6..199edea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.43.0", + "version": "1.43.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.43.0", + "version": "1.43.1", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index d4caf4b..524936c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.43.0", + "version": "1.43.1", "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 9cea1c5..fda3a26 100644 --- a/src/app.js +++ b/src/app.js @@ -620,6 +620,17 @@ const getSeriesRounds = (series) => state.events finalCount: sessions.filter((session) => session.type === "final").length, }; }); +// Deleting a series can take its rounds along (races in another series are kept). +const deleteSeriesRaces = (series) => { + const inOtherSeries = new Set((state.series || []).filter((item) => item.id !== series.id).flatMap((item) => item.eventIds)); + const eventIds = new Set(series.eventIds.filter((id) => !inOtherSeries.has(id))); + const sessionIds = state.sessions.filter((session) => eventIds.has(session.eventId)).map((session) => session.id); + state.events = state.events.filter((event) => !eventIds.has(event.id)); + state.sessions = state.sessions.filter((session) => !eventIds.has(session.eventId)); + sessionIds.forEach((id) => delete state.resultsBySession[id]); + if (sessionIds.includes(state.activeSessionId)) state.activeSessionId = null; + void purgeSessionPassings(sessionIds); +}; const findSeriesEvent = (eventId) => state.events.find((event) => event.id === eventId) || null; // Format per round (can differ between rounds and classes); locked once qualifying exists. const setSeriesRoundFormat = (eventId, values) => { @@ -713,7 +724,7 @@ const exportSeriesPdf = async (series, tables) => { )), }); }; -const renderSeries = () => renderSeriesView({ state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound }); +const renderSeries = () => renderSeriesView({ state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, deleteSeriesRaces, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound }); const renderArchive = () => renderResultsArchiveView({ state, dom, t, escapeHtml, formatLap, formatRaceClock, renderTable, getClassName, getEventName, buildLeaderboard, getCompetitorPassings, @@ -898,6 +909,8 @@ const TRANSLATIONS = { "race_day.quick_layout": "Ny banlayout", "race_day.quick_race": "Skapa race", "race_day.pick_session": "Session", + "race_day.show_all_sessions": "Visa alla sessioner", + "race_day.hidden_sessions": "({count} från andra dagar dolda)", "race_day.reset_session_hint": "Nollställer sessionens varv och resultat, t.ex. vid omstart. Pausa först om heatet körs.", "race_day.reset_session_confirm": "Nollställ alla varv och resultat i \"{name}\"?\n\nDet går inte att ångra.", "race_day.new_practice_day": "Nollställ – ny träningsdag", @@ -1000,7 +1013,10 @@ const TRANSLATIONS = { "series.counted_of": "{counted} räknas av {completed} körda ({total} planerade)", "series.no_results": "Inga körda deltävlingar ännu.", "series.legend": "Siffra = seriepoäng. (Inom parentes) = struket resultat. – = deltog inte. Lika poäng: flest segrar, sedan andraplatser osv., sedan senaste gemensamma deltävling.", - "series.delete_confirm": "Ta bort serien \"{name}\"? Racen och deras resultat finns kvar.", + "series.delete_confirm": "Ta bort serien \"{name}\"?", + "series.delete_races_confirm": "Ta också bort seriens {count} race från Race Setup, med heat och resultat?\n\nOK = ta bort racen\nAvbryt = behåll racen (t.ex. för resultatarkivet)", + "series.created_rounds": "{count} race skapade. De finns i listan nedan och under Race Setup.", + "series.created_none": "Inga nya race skapades: seriens klasser har redan race på de datumen.", "nav.race_setup": "Race Setup", "nav.race_setup_sub": "Open Practice, klubbrace och endurance", "nav.overlay": "Overlay", @@ -2752,6 +2768,8 @@ const TRANSLATIONS = { "race_day.quick_layout": "New track layout", "race_day.quick_race": "Create race", "race_day.pick_session": "Session", + "race_day.show_all_sessions": "Show all sessions", + "race_day.hidden_sessions": "({count} from other days hidden)", "race_day.reset_session_hint": "Clears the session's laps and results, e.g. for a restart. Pause first if the heat is running.", "race_day.reset_session_confirm": "Clear every lap and result in \"{name}\"?\n\nThis cannot be undone.", "race_day.new_practice_day": "Reset – new practice day", @@ -2854,7 +2872,10 @@ const TRANSLATIONS = { "series.counted_of": "{counted} counted of {completed} run ({total} planned)", "series.no_results": "No rounds run yet.", "series.legend": "Number = series points. (In brackets) = dropped result. – = did not take part. Ties: most wins, then 2nd places etc., then the latest common round.", - "series.delete_confirm": "Delete the series \"{name}\"? The races and their results are kept.", + "series.delete_confirm": "Delete the series \"{name}\"?", + "series.delete_races_confirm": "Also delete the series' {count} races from Race Setup, with heats and results?\n\nOK = delete the races\nCancel = keep the races (e.g. for the results archive)", + "series.created_rounds": "{count} races created. They are listed below and under Race Setup.", + "series.created_none": "No new races were created: the series' classes already have races on those dates.", "nav.race_setup": "Race Setup", "nav.race_setup_sub": "Open Practice, club races and endurance", "nav.overlay": "Overlay", diff --git a/src/race_day_view.js b/src/race_day_view.js index 1ba478b..d984778 100644 --- a/src/race_day_view.js +++ b/src/race_day_view.js @@ -64,6 +64,33 @@ function renderQueueSession(session, positionKey, deps) { // count-down, and the check panel shows who has crossed the line since. The panel re-renders // on its own (refreshRaceDayWarmup) on every passing, without rebuilding the page. let lastWarmupDeps = null; +let showAllSessions = false; + +const localDateKey = (date = new Date()) => `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`; + +// The session picker lists today's races by default (plus whatever is live or selected), +// grouped per race in the order they were set up. Old races, practices and other series' +// rounds stay out of the way until "Show all" is ticked. Undated races show unrun sessions. +export function buildRaceDaySessionGroups({ sessions, events, selectedId = "", showAll = false, today = localDateKey() }) { + const eventById = new Map((events || []).map((event) => [event.id, event])); + const isLive = (session) => ["running", "paused"].includes(session.status); + const visible = (session) => { + if (showAll || isLive(session) || session.id === selectedId) return true; + const date = eventById.get(session.eventId)?.date; + return date ? date === today : session.status === "ready"; + }; + const groups = new Map(); + let hidden = 0; + (sessions || []).forEach((session) => { + if (!visible(session)) { hidden += 1; return; } + if (!groups.has(session.eventId)) groups.set(session.eventId, { event: eventById.get(session.eventId) || null, sessions: [] }); + groups.get(session.eventId).sessions.push(session); + }); + const list = [...groups.values()].sort((a, b) => + Number(b.sessions.some(isLive)) - Number(a.sessions.some(isLive)) + || String(b.event?.date || "").localeCompare(String(a.event?.date || ""))); + return { groups: list, hidden }; +} function showsWarmupPanel(session) { return Boolean(session && session.status === "ready" && session.mode !== "track" && session.type !== "team_race" && !isPracticeSessionType(session.type)); @@ -210,10 +237,7 @@ export function renderRaceDayView(deps) { const practiceLabel = !practice ? t("race_day.quick_practice_new") : practice.status === "running" ? t("race_day.quick_practice_show", { name: practice.name }) : t("race_day.quick_practice_continue", { name: practice.name }); - const sessionChoices = state.sessions.slice().sort((a, b) => { - const rank = (item) => (["running", "paused"].includes(item.status) ? 0 : item.status === "ready" ? 1 : 2); - return rank(a) - rank(b) || Number(b.startedAt || 0) - Number(a.startedAt || 0); - }); + const sessionChoices = buildRaceDaySessionGroups({ sessions: state.sessions, events: state.events, selectedId: session?.id, showAll: showAllSessions }); const isPracticeSession = Boolean(session && (isPracticeSessionType(session.type) || session.type === "practice")); const isLiveSession = ["running", "paused"].includes(session?.status); // Layouts are a practice thing: never offered while a race session is in focus. @@ -248,9 +272,12 @@ export function renderRaceDayView(deps) { + ${sessionChoices.hidden || showAllSessions ? `` : ""} ${session && !isSelected ? `` : ""}
${usesPrologue @@ -377,6 +404,7 @@ export function renderRaceDayView(deps) { }); document.getElementById("raceDayQuickRace")?.addEventListener("click", () => navigateTo("race_setup")); document.getElementById("raceDaySessionSelect")?.addEventListener("change", (event) => { if (event.target.value) selectSession(event.target.value); }); + document.getElementById("raceDayShowAllSessions")?.addEventListener("change", (event) => { showAllSessions = event.target.checked; renderView(); }); // Races: clear a heat's results (e.g. a restart after a false start) - not while it is running. document.getElementById("raceDayResetSession")?.addEventListener("click", () => { if (session && window.confirm(t("race_day.reset_session_confirm", { name: session.name }))) resetSessionData(session); diff --git a/src/series_view.js b/src/series_view.js index ac5c5fd..30d7f54 100644 --- a/src/series_view.js +++ b/src/series_view.js @@ -143,7 +143,7 @@ function renderStandingsTable(table, { t, escapeHtml }) { export function renderSeriesView(deps) { const { state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, - getSeriesRounds, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound, + getSeriesRounds, deleteSeriesRaces, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound, } = deps; const list = state.series || []; if (!list.some((item) => item.id === selectedSeriesId)) selectedSeriesId = list[0]?.id || ""; @@ -241,7 +241,11 @@ export function renderSeriesView(deps) { })); document.getElementById("seriesDelete")?.addEventListener("click", () => { if (!window.confirm(t("series.delete_confirm", { name: series.name }))) return; + // The rounds are ordinary races: ask separately, so results can be kept for the archive. + const raceCount = rounds.length; + const removeRaces = raceCount > 0 && window.confirm(t("series.delete_races_confirm", { count: raceCount })); state.series = list.filter((item) => item.id !== series.id); + if (removeRaces) deleteSeriesRaces(series); saveState(); renderView(); }); @@ -251,7 +255,7 @@ export function renderSeriesView(deps) { const dates = String(data.get("dates") || "").split(/[\s,;]+/).map((value) => value.trim()).filter((value) => /^\d{4}-\d{2}-\d{2}$/.test(value)); if (!dates.length) { window.alert(t("series.create_dates_invalid")); return; } const seedMethod = String(data.get("seedMethod") || "consecutive"); - createSeriesEvents(series, dates, String(data.get("presetId") || "custom"), { + const created = createSeriesEvents(series, dates, String(data.get("presetId") || "custom"), { qualifyingRounds: data.get("qualifyingRounds"), finalLegs: data.get("finalLegs"), carsPerHeat: data.get("carsPerHeat"), }, { heatOrder: String(data.get("heatOrder") || "fastest_last"), @@ -262,6 +266,8 @@ export function renderSeriesView(deps) { seedMethod: seedMethod === "best_lap" ? "best_sum" : seedMethod, }); renderView(); + // Always say what happened: clicking again for dates already in the series creates nothing. + window.alert(created ? t("series.created_rounds", { count: created }) : t("series.created_none")); }); // Picking a format fills the round numbers it defines (they can still be changed before creating). const createForm = document.getElementById("seriesCreateEvents"); diff --git a/src/styles.css b/src/styles.css index 4e09ee9..c60edf0 100644 --- a/src/styles.css +++ b/src/styles.css @@ -4709,6 +4709,7 @@ tr.is-removed td.lap-actions { .race-day-quick { display: flex; flex-wrap: wrap; gap: 10px; margin-bottom: 14px; } .race-day-quick-btn { font-size: 1rem; padding: 12px 18px; min-height: 48px; } .race-day-session-picker { display: grid; gap: 4px; margin-bottom: 12px; max-width: 520px; } +.race-day-show-all { display: flex; align-items: center; gap: 8px; margin: -4px 0 12px; font-size: 0.9rem; } .timing-run-on-race-day { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin-top: 8px; } /* Dashboard: the three common tasks */ diff --git a/tests/browser_series.js b/tests/browser_series.js index a049a6c..1fef521 100644 --- a/tests/browser_series.js +++ b/tests/browser_series.js @@ -62,6 +62,10 @@ export async function runSeriesSmoke({ evaluate, navigate, savedState, waitFor, assert.deepEqual(rounds.map((event) => [event.raceConfig.qualifyingScoring, event.raceConfig.countedQualRounds, event.raceConfig.heatOrder]), [["best", 2, "fastest_last"], ["best", 2, "fastest_last"]], "ÖRC Winter is the default format, fastest heat last"); const seedPractices = state.sessions.filter((session) => rounds.some((event) => event.id === session.eventId) && session.type === "practice"); assert.deepEqual(seedPractices.map((session) => [session.durationMin, session.seedBestLapCount, session.seedMethod, session.driverIds.length]), [[5, 3, "consecutive", 0], [5, 3, "consecutive", 0]], "every round starts with a seeding practice that follows the round's drivers"); + assert.equal(dialogs.at(-1)?.message, "2 races created. They are listed below and under Race Setup.", "creating says how many races were made"); + await evaluate(`(() => { const form = document.getElementById("seriesCreateEvents"); form.elements.dates.value = "2026-11-01"; form.requestSubmit(); })()`); + await waitFor(async () => dialogs.at(-1)?.message.startsWith("No new races were created"), "clicking again for an existing date says so"); + assert.equal((await savedState()).series.find((series) => series.id === saved.id).eventIds.length, 2); console.log("PASS a series is created with club, class and count rule, and its rounds are created from dates"); // The series is the hub for each round: drivers, a late entry, copy to the next round, @@ -138,6 +142,17 @@ export async function runSeriesSmoke({ evaluate, navigate, savedState, waitFor, assert.equal(pdf.title, "SR Winter Cup"); assert.deepEqual(pdf.sections[0].rows[0], ["1", "SR Anna", "100", "", "1", "100"]); console.log("PASS the series PDF export contains the standings"); + + // Deleting the series asks whether its races go too (the test run accepts both questions). + const seriesSessionIds = (await savedState()).sessions.filter((session) => rounds.some((event) => event.id === session.eventId)).map((session) => session.id); + assert.ok(seriesSessionIds.length > 0); + await evaluate(`document.getElementById("seriesDelete").click()`); + await waitFor(async () => !(await savedState()).series.some((series) => series.id === saved.id), "series deleted"); + const afterDelete = await savedState(); + assert.equal(afterDelete.events.filter((event) => rounds.some((round) => round.id === event.id)).length, 0, "its races are gone from Race Setup"); + assert.equal(afterDelete.sessions.filter((session) => seriesSessionIds.includes(session.id)).length, 0, "with their heats"); + assert.ok(dialogs.some((dialog) => dialog.message.startsWith("Also delete the series' 2 races")), "the races are a separate question"); + console.log("PASS deleting a series can take its races along"); } finally { dialogs.splice(dialogsAtStart); const current = await savedState(); diff --git a/tests/race_day_sessions.test.js b/tests/race_day_sessions.test.js new file mode 100644 index 0000000..58cb661 --- /dev/null +++ b/tests/race_day_sessions.test.js @@ -0,0 +1,37 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { buildRaceDaySessionGroups } from "../src/race_day_view.js"; + +const events = [ + { id: "old", name: "Old race", date: "2026-10-01" }, + { id: "today", name: "Winter #1", date: "2026-11-08" }, + { id: "next", name: "Winter #2", date: "2026-11-22" }, + { id: "undated", name: "Undated" }, +]; +const sessions = [ + { id: "old_final", eventId: "old", status: "finished" }, + { id: "old_practice", eventId: "old", status: "running" }, + { id: "t_practice", eventId: "today", status: "finished" }, + { id: "t_q1", eventId: "today", status: "ready" }, + { id: "n_practice", eventId: "next", status: "ready" }, + { id: "u_ready", eventId: "undated", status: "ready" }, + { id: "u_done", eventId: "undated", status: "finished" }, +]; +const ids = (result) => result.groups.map((group) => [group.event.id, group.sessions.map((session) => session.id)]); + +test("Race Day picker: today's races, live and selected sessions, grouped per race", () => { + const result = buildRaceDaySessionGroups({ sessions, events, selectedId: "n_practice", today: "2026-11-08" }); + assert.deepEqual(ids(result), [ + ["old", ["old_practice"]], + ["next", ["n_practice"]], + ["today", ["t_practice", "t_q1"]], + ["undated", ["u_ready"]], + ]); + assert.equal(result.hidden, 2); +}); + +test("Race Day picker: show all lists every session", () => { + const result = buildRaceDaySessionGroups({ sessions, events, showAll: true, today: "2026-11-08" }); + assert.equal(result.hidden, 0); + assert.equal(result.groups.flatMap((group) => group.sessions).length, sessions.length); +}); diff --git a/tests/run.js b/tests/run.js index a2d2830..f1306ff 100644 --- a/tests/run.js +++ b/tests/run.js @@ -1,4 +1,5 @@ import "./auth.test.js"; +import "./race_day_sessions.test.js"; import "./overlay_leaderboard.test.js"; import "./decoder_clock_check.test.js"; import "./practice_callouts_logic.test.js";