From 69a65748ce5956710c3a12562d1fe878a10c1035 Mon Sep 17 00:00:00 2001 From: larssand Date: Thu, 5 Nov 2026 21:44:06 +0100 Subject: [PATCH] feat(results): race overview on Race Day and an event-grouped results archive (1.66.0) --- CHANGELOG.md | 5 ++ package-lock.json | 4 +- package.json | 2 +- src/app.js | 64 +++++++++++++++++++-- src/race_day_view.js | 3 + src/race_overview_logic.js | 49 +++++++++++++++++ src/race_overview_view.js | 46 ++++++++++++++++ src/race_render_helpers.js | 3 +- src/results_archive_view.js | 107 ++++++++++++++++++++++++++++-------- src/styles.css | 10 ++++ tests/race_overview.test.js | 57 +++++++++++++++++++ tests/run.js | 1 + 12 files changed, 321 insertions(+), 30 deletions(-) create mode 100644 src/race_overview_logic.js create mode 100644 src/race_overview_view.js create mode 100644 tests/race_overview.test.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a88183..1fcee19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.66.0 + +- Race overview: the whole race in one place, on Race Day (under the heat queue) and in the results archive. A podium from the A final, then practice, qualifying and finals that open and close, each with its standings and every heat's result (laps, result, best lap, and the car in sponsor heats). Print, PDF and CSV export the whole race, every heat included. +- Results archive: one row per race instead of one per heat. Pick a race to see its overview, its heats and the exports; open a heat for its laps and penalties as before. + ## 1.65.6 - 2026-11-05 ### Fixed diff --git a/package-lock.json b/package-lock.json index d3e60b9..93075c3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.65.6", + "version": "1.66.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.65.6", + "version": "1.66.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index a267641..9b0c0b5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.65.6", + "version": "1.66.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 ec333b7..eb798bf 100644 --- a/src/app.js +++ b/src/app.js @@ -9,6 +9,8 @@ import { recordTransponderSighting, buildWarmupCheck, createPrologue, getPrologu import { findTransponderConflict, getDriverProfileId } from "./driver_profile_logic.js"; import { renderRaceDayView, refreshRaceDayWarmup, refreshRaceDayPrologueClock, updateRaceDayStartDisplay, refreshRaceDayLive } from "./race_day_view.js"; import { normalizeRaceDays, getRaceDay, upsertRaceDay, orderDaySessions, buildDaySchedule, getAutopilotAction, moveInDayOrder, pickBoardDate, getDueCall } from "./day_schedule_logic.js"; +import { buildRaceOverview, buildRaceOverviewCsvRows } from "./race_overview_logic.js"; +import { renderRaceOverviewPanel, bindRaceOverviewPanel } from "./race_overview_view.js"; import { renderDaySchedulePanel, bindDaySchedulePanel, buildDaySchedulePrintHtml, renderDriverBoard, formatClockTime, renderDayCallBanner, bindDayCallBanner } from "./day_schedule_view.js"; import { beginSession as beginSessionControl, finishSession as finishSessionControl, pauseSession as pauseSessionControl, resumeSession as resumeSessionControl } from "./session_control.js"; import { normalizeSeries, buildSeriesStandings, getSeriesRoundStatus, getSeriesRoundNextStep, getSeriesDayResult } from "./series_logic.js"; @@ -139,7 +141,23 @@ const getFinalMainLayouts = (event) => getFinalMainLayoutsHelper(event, { getSes const renderFinalMatrix = (event) => renderFinalMatrixHelper(event, { t, escapeHtml, getFinalMainLayouts, getStatusLabel }); const buildPrintBrandBlock = (branding) => buildPrintBrandBlockHelper(branding, { escapeHtml }); const buildRaceStartListsHtml = (event) => buildRaceStartListsHtmlHelper(event, { t, state, escapeHtml, resolveEventBranding, getSessionsForEvent, getSessionSortWeight, getClassName, buildPrintBrandBlock, getSessionGridEntries, getSessionTypeLabel, getStartModeLabel, renderTable, buildEventSchedule }); -const buildRaceResultsHtml = (event) => buildRaceResultsHtmlHelper(event, { t, escapeHtml, resolveEventBranding, getClassName, buildPrintBrandBlock, renderRaceStandingsTableView, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings, renderTeamRaceStandings, getSessionsForEvent, renderSessionChannelAnalysis }); +const buildRaceResultsHtml = (event) => buildRaceResultsHtmlHelper(event, { t, escapeHtml, resolveEventBranding, getClassName, buildPrintBrandBlock, renderRaceStandingsTableView, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings, renderTeamRaceStandings, getSessionsForEvent, renderSessionChannelAnalysis, renderHeatResults: (event) => renderRaceOverviewHeatsHtml(event) }); +// Race overview (Race Day and the results archive): the whole race, with print, PDF and CSV. +const getRaceOverview = (event) => buildRaceOverview(event, { sessions: getSessionsForEvent(event?.id), cars: state.cars, buildLeaderboard, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings }); +const raceOverviewPhaseLabel = (type) => t(`race_overview.phase_${type}`); +const renderRaceOverviewFor = (event) => (event ? renderRaceOverviewPanel(getRaceOverview(event), { t, escapeHtml, formatLap, renderTable, renderRaceStandingsTableView, phaseLabel: raceOverviewPhaseLabel, getStatusLabel }) : ""); +const bindRaceOverviewFor = (root, event) => event && bindRaceOverviewPanel(root, getRaceOverview(event), { + print: () => openPrintWindow(`${event.name} - ${t("events.results_overview")}`, buildRaceResultsHtml(event)), + pdf: () => exportRaceResultsPdf(event), + csv: (overview) => downloadCsvFile(`${sanitizeFilenameSegment(event.name)}_race_overview.csv`, buildRaceOverviewCsvRows(overview, { t, formatLap, phaseLabel: raceOverviewPhaseLabel })), +}); +// Every heat's result, for the printed results overview. +const renderRaceOverviewHeatsHtml = (event) => (getRaceOverview(event)?.phases || []).flatMap((phase) => phase.heats.map(({ session, rows }) => ` + `)).join(""); const getSessionsForEvent = (eventId) => getSessionsForEventHelper(state, eventId); const getModeLabel = (mode) => getModeLabelHelper(mode, { t }); const normalizeStartMode = (mode) => normalizeStartModeHelper(mode); @@ -718,6 +736,8 @@ const renderRaceDay = () => renderRaceDayView({ buildLeaderboard, getSessionTargetMs, formatRaceClock, renderDaySchedule, bindDaySchedule, renderDayCall, bindDayCall, setCompetitorLapStatus, + renderRaceOverview: (session) => renderRaceOverviewFor(state.events.find((event) => event.id === session?.eventId)), + bindRaceOverview: (root, session) => bindRaceOverviewFor(root, state.events.find((event) => event.id === session?.eventId)), addTrackLayout, renderView, state, dom, t, escapeHtml, formatLap, formatCountdown, formatElapsedClock, getEventName, getSessionTypeLabel, getStatusLabel, getStartModeLabel, getSessionTiming, getSessionGridEntries, buildRaceDayQueue, buildRaceDayPreflight, @@ -1015,7 +1035,8 @@ const renderArchive = () => renderResultsArchiveView({ exportRaceResultsPdf, buildRacePackagePayload, downloadJsonFile, sanitizeFilenameSegment, getArchiveFilters: () => archiveFilters, setArchiveFilters: (value) => { archiveFilters = value; }, getSelectedSessionId: () => archiveSelectedSessionId, setSelectedSessionId: (value) => { archiveSelectedSessionId = value; }, - getTrackLayoutLabel, + getSelectedEventKey: () => archiveSelectedEventKey, setSelectedEventKey: (value) => { archiveSelectedEventKey = value; }, + getTrackLayoutLabel, renderRaceOverview: renderRaceOverviewFor, bindRaceOverview: bindRaceOverviewFor, }); const renderTraining = () => renderTrainingView({ addTrackLayout, state, dom, t, escapeHtml, formatLap, formatRaceClock, uid, saveState, syncStateToBackend, renderView, normalizeTrainingState, syncTrainingLedger, buildDriverTrainingStats, buildDriverTimingChannelStats: buildDriverTimingChannelStatsLogic, buildDriverActivePracticeStats, buildEvenLapsProgress, buildStepTrainingProgress, buildTrainingRecommendation, getTrainingGoalProgress, getNextTrainingMilestone, buildTrainingMissions: buildTrainingMissionsLogic, buildTrainingHighlights: buildTrainingHighlightsLogic, getClubTrainingGoalProgress: getClubTrainingGoalProgressLogic, countDriverExerciseSessions: countDriverExerciseSessionsLogic, countExerciseSessions: countExerciseSessionsLogic, buildTrainingPaceBuckets: buildTrainingPaceBucketsLogic, buildTrainingWeekdayStats: buildTrainingWeekdayStatsLogic, buildTrainingStintAnalysis: buildTrainingStintAnalysisLogic, buildTrainingMarkerComparisons: buildTrainingMarkerComparisonsLogic, isInitialLoadDone: () => initialLoadDone, openPublicAddressSettings: () => { openSettingsTab("system", "settingsPublicAddress"); navigateToView("settings"); }, getSelectedDriverId: () => selectedTrainingDriverId, setSelectedDriverId: (value) => { selectedTrainingDriverId = value; updateViewUrl("training", value, selectedTrainingClassId); }, getSelectedClassId: () => selectedTrainingClassId, setSelectedClassId: (value) => { selectedTrainingClassId = value; updateViewUrl("training", selectedTrainingDriverId, value); } }); // Judge corrections are saved as usual and also pushed as this session's result, so the @@ -1352,7 +1373,8 @@ const TRANSLATIONS = { "nav.archive": "Resultatarkiv", "nav.archive_sub": "Sök avslutade race utan att gå via Race Setup", "archive.title": "Resultatarkiv", - "archive.hint": "Sök bland alla avslutade sessioner efter datum, klass eller förare.", + "archive.hint": "Ett race per rad. Välj ett race för att se hela översikten, alla heat och exportera.", + "archive.heats": "Heat", "archive.search": "Sök", "archive.search_placeholder": "Event- eller sessionsnamn", "archive.class": "Klass", @@ -2812,6 +2834,18 @@ const TRANSLATIONS = { "session.qualification": "kval", "session.heat": "heat", "session.final": "final", + "race_overview.title": "Race-översikt – {name}", + "race_overview.hint": "Hela racet på ett ställe: ställning och varje heat för träning, kval och finaler.", + "race_overview.print": "Skriv ut", + "race_overview.car": "Bil", + "race_overview.total": "Total", + "race_overview.standings": "Ställning", + "race_overview.heats_done": "{done} av {total} heat klara", + "race_overview.no_results": "Inga resultat än.", + "race_overview.not_run": "Inte körd än.", + "race_overview.phase_practice": "Träning", + "race_overview.phase_qualification": "Kval", + "race_overview.phase_final": "Finaler", "session.team_race": "lagrace", "validation.no_assignments": "Ingen förar-/biltilldelning i denna session.", "validation.missing_tp": "En eller flera tilldelade bilar saknar transponder-ID.", @@ -3384,7 +3418,8 @@ const TRANSLATIONS = { "nav.archive": "Results archive", "nav.archive_sub": "Search completed races without going through Race Setup", "archive.title": "Results archive", - "archive.hint": "Search all completed sessions by date, class or driver.", + "archive.hint": "One race per row. Pick a race to see the whole overview, every heat and export.", + "archive.heats": "Heats", "archive.search": "Search", "archive.search_placeholder": "Event or session name", "archive.class": "Class", @@ -4844,6 +4879,18 @@ const TRANSLATIONS = { "session.qualification": "qualification", "session.heat": "heat", "session.final": "final", + "race_overview.title": "Race overview – {name}", + "race_overview.hint": "The whole race in one place: standings and every heat for practice, qualifying and finals.", + "race_overview.print": "Print", + "race_overview.car": "Car", + "race_overview.total": "Total", + "race_overview.standings": "Standings", + "race_overview.heats_done": "{done} of {total} heats done", + "race_overview.no_results": "No results yet.", + "race_overview.not_run": "Not run yet.", + "race_overview.phase_practice": "Practice", + "race_overview.phase_qualification": "Qualifying", + "race_overview.phase_final": "Finals", "session.team_race": "team race", "validation.no_assignments": "No driver/car assignments in this session.", "validation.missing_tp": "One or more assigned cars are missing transponder ID.", @@ -5375,6 +5422,7 @@ let raceWizardStep = 1; let raceWizardDraft = null; let archiveFilters = { search: "", classId: "", driverId: "", dateFrom: "", dateTo: "" }; let archiveSelectedSessionId = ""; +let archiveSelectedEventKey = ""; let overlaySyncTimer = null; let overlayRotationTimer = null; let overlayLiveRefreshTimer = null; @@ -7339,6 +7387,14 @@ async function exportRaceResultsPdf(event) { [t("table.pos"), t("table.driver"), t("table.score")], buildFinalStandings(event).map((row) => [String(row.rank), row.driverName || "-", row.score || "-"]) ), + ...(getRaceOverview(event)?.phases || []).flatMap((phase) => phase.heats.map(({ session, rows }) => { + const withCar = rows.some((row) => row.car); + return buildPdfSection( + `${raceOverviewPhaseLabel(phase.type)} • ${session.name}`, + [t("table.pos"), t("table.driver"), ...(withCar ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")], + rows.map((row) => [String(row.pos), row.name, ...(withCar ? [row.car || "-"] : []), String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "-"]) + ); + })), ...buildTeamRaceStandings(event).map(({ session, rows }) => buildPdfSection( `${t("events.team_standings")} • ${session.name}`, diff --git a/src/race_day_view.js b/src/race_day_view.js index 349f905..e5e8b31 100644 --- a/src/race_day_view.js +++ b/src/race_day_view.js @@ -264,6 +264,7 @@ export function renderRaceDayView(deps) { resetSessionData = () => false, startPracticeNow = async () => false, findOpenPracticeToContinue = () => null, buildLeaderboard = () => [], getSessionTargetMs = () => null, formatRaceClock = (ms) => String(ms), renderDaySchedule = () => "", bindDaySchedule = () => {}, renderDayCall = () => "", bindDayCall = () => {}, + renderRaceOverview = () => "", bindRaceOverview = () => {}, } = deps; const queue = buildRaceDayQueue(state); const session = queue.current; @@ -410,6 +411,7 @@ export function renderRaceDayView(deps) { ${renderQueueSession(queue.afterNext, "race_day.after_next", deps)} + ${renderRaceOverview(session)} ${renderDaySchedule()}`; dom.view.querySelectorAll("[data-race-day-fix-view]").forEach((button) => { @@ -443,6 +445,7 @@ export function renderRaceDayView(deps) { }); bindTrackLayoutBar(dom.view, { state, t, addTrackLayout, renderView }); bindDaySchedule(dom.view); + bindRaceOverview(dom.view, session); bindDayCall(dom.view); lastWarmupDeps = { t, escapeHtml, renderView, getRaceDayWarmupCheck, setDriverTransponder, getSession: () => buildRaceDayQueue(state).current }; paintWarmupPanel(); diff --git a/src/race_overview_logic.js b/src/race_overview_logic.js new file mode 100644 index 0000000..0b3b1e2 --- /dev/null +++ b/src/race_overview_logic.js @@ -0,0 +1,49 @@ +// Race overview (Race Day): the whole event in one place - podium, then practice, qualifying +// and finals, each with its standings and every heat's result. Also the rows for one CSV. +// Works for race events and sponsor events (their heats carry carAssignments). +const PHASES = ["practice", "qualification", "final"]; + +export function buildRaceOverview(event, deps) { + const { sessions = [], cars = [], buildLeaderboard, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings } = deps; + if (!event) return null; + const carName = (session, driverId) => { + const carId = session.carAssignments?.[driverId]; + return carId ? cars.find((car) => car.id === carId)?.name || "" : ""; + }; + const standingsOf = { practice: buildPracticeStandings, qualification: buildQualifyingStandings, final: buildFinalStandings }; + const phases = PHASES.map((type) => { + const heats = sessions + .filter((session) => session.type === type && session.status !== "ready") + .map((session) => ({ + session, + rows: buildLeaderboard(session).map((row, index) => ({ + pos: index + 1, + name: row.displayName || row.driverName || row.transponder || "-", + car: carName(session, row.driverId), + laps: Number(row.laps || 0), + result: row.resultDisplay || "-", + bestLapMs: Number(row.bestLapMs || 0) || null, + })), + })); + const planned = sessions.filter((session) => session.type === type).length; + return { type, planned, heats, standings: heats.length ? standingsOf[type](event) || [] : [] }; + }).filter((phase) => phase.planned); + const finals = phases.find((phase) => phase.type === "final"); + const podium = finals ? finals.standings.filter((row) => /^A?[1-3]$/.test(String(row.rank))).slice(0, 3) : []; + return { event, phases, podium, finished: sessions.length > 0 && sessions.every((session) => ["finished", "stopped"].includes(session.status)) }; +} + +// One CSV for the whole race: the standings ("Total") and every heat, one row per driver. +export function buildRaceOverviewCsvRows(overview, { t, formatLap, phaseLabel }) { + const rows = [["event", "phase", "heat", "pos", "driver", "car", "laps", "result", "best_lap"]]; + if (!overview) return rows; + const eventName = overview.event.name || ""; + overview.phases.forEach((phase) => { + const label = phaseLabel(phase.type); + phase.standings.forEach((row) => rows.push([eventName, label, t("race_overview.total"), String(row.rank), row.driverName || "-", "", "", row.score || "-", ""])); + phase.heats.forEach(({ session, rows: heatRows }) => heatRows.forEach((row) => rows.push([ + eventName, label, session.name, String(row.pos), row.name, row.car, String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "", + ]))); + }); + return rows; +} diff --git a/src/race_overview_view.js b/src/race_overview_view.js new file mode 100644 index 0000000..6dd61ae --- /dev/null +++ b/src/race_overview_view.js @@ -0,0 +1,46 @@ +// Race Day → Race overview panel: podium, then practice / qualifying / finals with standings +// and every heat. Logic in race_overview_logic.js; print, PDF and CSV come in as deps. +const openPhases = new Set(); + +export function renderRaceOverviewPanel(overview, { t, escapeHtml, formatLap, renderTable, renderRaceStandingsTableView, phaseLabel, getStatusLabel }) { + if (!overview || !overview.phases.length) return ""; + const { event, phases, podium } = overview; + const heatTable = (rows) => renderTable( + [t("table.pos"), t("table.driver"), ...(rows.some((row) => row.car) ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")], + rows.map((row) => `${row.pos}${escapeHtml(row.name)}${rows.some((item) => item.car) ? `${escapeHtml(row.car || "-")}` : ""}${row.laps}${escapeHtml(row.result)}${row.bestLapMs ? escapeHtml(formatLap(row.bestLapMs)) : "-"}`) + ); + return ` +
+
+

${escapeHtml(t("race_overview.title", { name: event.name }))}

${t("race_overview.hint")}

+
+ + + +
+
+
+ ${podium.length ? `
    ${podium.map((row, index) => `
  1. ${index + 1}${escapeHtml(row.driverName || "-")}
  2. `).join("")}
` : ""} + ${phases.map((phase) => ` +
+ ${escapeHtml(phaseLabel(phase.type))} ${t("race_overview.heats_done", { done: phase.heats.filter(({ session }) => session.status === "finished").length, total: phase.planned })} + ${phase.heats.length ? ` +

${t("race_overview.standings")}

+ ${renderRaceStandingsTableView(phase.standings, t("race_overview.no_results"))} + ${phase.heats.map(({ session, rows }) => ` +

${escapeHtml(session.name)} ${escapeHtml(getStatusLabel(session.status))}

+ ${rows.length ? heatTable(rows) : `

${t("race_overview.no_results")}

`}`).join("")}` + : `

${t("race_overview.not_run")}

`} +
`).join("")} +
+
`; +} + +export function bindRaceOverviewPanel(root, overview, { print, pdf, csv }) { + if (!root || !overview) return; + root.querySelectorAll(".race-overview-phase").forEach((node) => node.addEventListener("toggle", () => { + if (node.open) openPhases.add(node.dataset.phase); else openPhases.delete(node.dataset.phase); + })); + const actions = { print, pdf, csv }; + root.querySelectorAll("[data-race-overview]").forEach((button) => button.addEventListener("click", () => actions[button.dataset.raceOverview]?.(overview))); +} diff --git a/src/race_render_helpers.js b/src/race_render_helpers.js index a4e3067..4f499f8 100644 --- a/src/race_render_helpers.js +++ b/src/race_render_helpers.js @@ -424,7 +424,7 @@ export function buildRaceStartListsHtml(event, { t, state, escapeHtml, resolveEv `; } -export function buildRaceResultsHtml(event, { t, escapeHtml, resolveEventBranding, getClassName, buildPrintBrandBlock, renderRaceStandingsTableView, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings, renderTeamRaceStandings, getSessionsForEvent, renderSessionChannelAnalysis }) { +export function buildRaceResultsHtml(event, { t, escapeHtml, resolveEventBranding, getClassName, buildPrintBrandBlock, renderRaceStandingsTableView, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings, renderTeamRaceStandings, getSessionsForEvent, renderSessionChannelAnalysis, renderHeatResults = () => "" }) { const branding = resolveEventBranding(event); const channelSections = getSessionsForEvent(event.id) .map((session) => ({ session, markup: renderSessionChannelAnalysis(session) })) @@ -456,6 +456,7 @@ export function buildRaceResultsHtml(event, { t, escapeHtml, resolveEventBrandin

${t("events.team_standings")}

${renderTeamRaceStandings(event)} + ${renderHeatResults(event)} ${channelSections.map(({ session, markup }) => `