feat(results): race overview on Race Day and an event-grouped results archive (1.66.0)
This commit is contained in:
1 parent
31ac04616a
commit
69a65748ce
12 files changed
+321
-30
No files matched your search
+60
-4
@@ -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 }) => `
|
||||
<section class="print-block">
|
||||
<h2>${escapeHtml(raceOverviewPhaseLabel(phase.type))} • ${escapeHtml(session.name)}</h2>
|
||||
${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) => `<tr><td>${row.pos}</td><td>${escapeHtml(row.name)}</td>${rows.some((item) => item.car) ? `<td>${escapeHtml(row.car || "-")}</td>` : ""}<td>${row.laps}</td><td>${escapeHtml(row.result)}</td><td>${row.bestLapMs ? escapeHtml(formatLap(row.bestLapMs)) : "-"}</td></tr>`))}
|
||||
</section>`)).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}`,
|
||||
|
||||
@@ -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)}
|
||||
</div>
|
||||
</section>
|
||||
${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();
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
@@ -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) => `<tr><td>${row.pos}</td><td>${escapeHtml(row.name)}</td>${rows.some((item) => item.car) ? `<td>${escapeHtml(row.car || "-")}</td>` : ""}<td>${row.laps}</td><td>${escapeHtml(row.result)}</td><td>${row.bestLapMs ? escapeHtml(formatLap(row.bestLapMs)) : "-"}</td></tr>`)
|
||||
);
|
||||
return `
|
||||
<section class="panel mt-16 race-overview" id="raceDayOverview">
|
||||
<div class="panel-header">
|
||||
<div><h3>${escapeHtml(t("race_overview.title", { name: event.name }))}</h3><p class="hint">${t("race_overview.hint")}</p></div>
|
||||
<div class="actions">
|
||||
<button class="btn" type="button" data-race-overview="print">${t("race_overview.print")}</button>
|
||||
<button class="btn" type="button" data-race-overview="pdf">PDF</button>
|
||||
<button class="btn" type="button" data-race-overview="csv">CSV</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
${podium.length ? `<ol class="race-overview-podium">${podium.map((row, index) => `<li class="podium-${index + 1}"><span>${index + 1}</span><strong>${escapeHtml(row.driverName || "-")}</strong></li>`).join("")}</ol>` : ""}
|
||||
${phases.map((phase) => `
|
||||
<details class="race-overview-phase" data-phase="${phase.type}" ${openPhases.has(phase.type) ? "open" : ""}>
|
||||
<summary><strong>${escapeHtml(phaseLabel(phase.type))}</strong> <small>${t("race_overview.heats_done", { done: phase.heats.filter(({ session }) => session.status === "finished").length, total: phase.planned })}</small></summary>
|
||||
${phase.heats.length ? `
|
||||
<h4>${t("race_overview.standings")}</h4>
|
||||
${renderRaceStandingsTableView(phase.standings, t("race_overview.no_results"))}
|
||||
${phase.heats.map(({ session, rows }) => `
|
||||
<h4>${escapeHtml(session.name)} <small>${escapeHtml(getStatusLabel(session.status))}</small></h4>
|
||||
${rows.length ? heatTable(rows) : `<p class="hint">${t("race_overview.no_results")}</p>`}`).join("")}`
|
||||
: `<p class="hint">${t("race_overview.not_run")}</p>`}
|
||||
</details>`).join("")}
|
||||
</div>
|
||||
</section>`;
|
||||
}
|
||||
|
||||
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)));
|
||||
}
|
||||
@@ -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
|
||||
<h2>${t("events.team_standings")}</h2>
|
||||
${renderTeamRaceStandings(event)}
|
||||
</section>
|
||||
${renderHeatResults(event)}
|
||||
${channelSections.map(({ session, markup }) => `
|
||||
<section class="print-block">
|
||||
<h2>${t("timing.channel_analysis")} • ${escapeHtml(session.name)}</h2>
|
||||
|
||||
+85
-22
@@ -26,6 +26,24 @@ export function buildArchiveRows(state, { getEventName, getClassName, getTrackLa
|
||||
.sort((left, right) => Number(right.session.endedAt || 0) - Number(left.session.endedAt || 0));
|
||||
}
|
||||
|
||||
// One row per event (a race, a sponsor event, a practice day); heats without an event stand alone.
|
||||
// Newest first. The winner is the A final's, else the latest heat's.
|
||||
export function groupArchiveRowsByEvent(rows) {
|
||||
const groups = new Map();
|
||||
rows.forEach((row) => {
|
||||
const key = row.event ? row.event.id : `session:${row.session.id}`;
|
||||
if (!groups.has(key)) groups.set(key, { key, event: row.event, eventName: row.eventName, className: row.className, date: row.date, rows: [], driverIds: new Set() });
|
||||
const group = groups.get(key);
|
||||
group.rows.push(row);
|
||||
if (row.date > group.date) group.date = row.date;
|
||||
row.competitors.forEach((competitor) => group.driverIds.add(String(competitor.driverId || competitor.transponder || "")));
|
||||
});
|
||||
return [...groups.values()].map((group) => {
|
||||
const aFinal = group.rows.find((row) => row.session.type === "final" && /^A/i.test(row.session.name || ""));
|
||||
return { ...group, driverCount: group.driverIds.size, winnerName: (aFinal || group.rows[0])?.winnerName || "", endedAt: Math.max(...group.rows.map((row) => Number(row.session.endedAt || 0))) };
|
||||
}).sort((left, right) => right.endedAt - left.endedAt);
|
||||
}
|
||||
|
||||
function matchesArchiveFilters(row, filters) {
|
||||
const search = filters.search.trim().toLowerCase();
|
||||
if (search && !`${row.eventName} ${row.session.name}`.toLowerCase().includes(search)) return false;
|
||||
@@ -117,7 +135,8 @@ export function renderResultsArchiveView(deps) {
|
||||
getClassName, getEventName, buildLeaderboard, getCompetitorPassings,
|
||||
exportRaceResultsPdf, buildRacePackagePayload, downloadJsonFile, sanitizeFilenameSegment,
|
||||
getArchiveFilters, setArchiveFilters, getSelectedSessionId, setSelectedSessionId,
|
||||
getTrackLayoutLabel,
|
||||
getSelectedEventKey = () => "", setSelectedEventKey = () => {},
|
||||
getTrackLayoutLabel, renderRaceOverview = () => "", bindRaceOverview = () => {},
|
||||
} = deps;
|
||||
|
||||
const filters = getArchiveFilters();
|
||||
@@ -129,26 +148,43 @@ export function renderResultsArchiveView(deps) {
|
||||
const classOptions = state.classes.map((c) => `<option value="${escapeHtml(c.id)}" ${c.id === filters.classId ? "selected" : ""}>${escapeHtml(c.name)}</option>`).join("");
|
||||
const driverOptions = state.drivers.map((d) => `<option value="${escapeHtml(d.id)}" ${d.id === filters.driverId ? "selected" : ""}>${escapeHtml(d.name)}</option>`).join("");
|
||||
|
||||
const groups = groupArchiveRowsByEvent(filteredRows);
|
||||
const selectedGroup = groupArchiveRowsByEvent(allRows).find((group) => group.key === (getSelectedEventKey()
|
||||
// A heat opened from elsewhere (driver profile) shows with its event.
|
||||
|| (selectedRow ? (selectedRow.event ? selectedRow.event.id : `session:${selectedRow.session.id}`) : ""))) || null;
|
||||
const table = sortableTable(
|
||||
renderTable(
|
||||
[t("archive.date"), t("archive.event"), t("archive.session"), t("archive.class"), t("archive.layout"), t("archive.drivers"), t("archive.winner"), t("archive.penalties_short"), ""],
|
||||
filteredRows.map((row) => `
|
||||
<tr data-sort-values="${sortValuesAttribute([row.date, row.eventName, row.session.name, row.className, row.trackLayoutLabel, row.competitors.length, row.winnerName, row.adjustmentCount, null])}">
|
||||
<td>${escapeHtml(row.date || "-")}</td>
|
||||
<td>${escapeHtml(row.eventName)}</td>
|
||||
<td>${escapeHtml(row.session.name)}</td>
|
||||
<td>${escapeHtml(row.className || "-")}</td>
|
||||
<td>${escapeHtml(row.trackLayoutLabel || "-")}</td>
|
||||
<td>${row.competitors.length}</td>
|
||||
<td>${escapeHtml(row.winnerName || "-")}</td>
|
||||
<td>${row.adjustmentCount || "-"}</td>
|
||||
<td><button class="btn btn-mini" data-archive-open="${escapeHtml(row.session.id)}" type="button">${t("archive.view")}</button></td>
|
||||
[t("archive.date"), t("archive.event"), t("archive.class"), t("archive.heats"), t("archive.drivers"), t("archive.winner"), ""],
|
||||
groups.map((group) => `
|
||||
<tr class="${selectedGroup?.key === group.key ? "is-selected" : ""}" data-sort-values="${sortValuesAttribute([group.date, group.eventName, group.className, group.rows.length, group.driverCount, group.winnerName, null])}">
|
||||
<td>${escapeHtml(group.date || "-")}</td>
|
||||
<td>${escapeHtml(group.eventName)}</td>
|
||||
<td>${escapeHtml(group.className || "-")}</td>
|
||||
<td>${group.rows.length}</td>
|
||||
<td>${group.driverCount}</td>
|
||||
<td>${escapeHtml(group.winnerName || "-")}</td>
|
||||
<td><button class="btn btn-mini" data-archive-event="${escapeHtml(group.key)}" type="button">${t("archive.view")}</button></td>
|
||||
</tr>
|
||||
`)
|
||||
),
|
||||
"archive-sessions",
|
||||
[1, 2, 3, 4, 6]
|
||||
"archive-events",
|
||||
[1, 2, 3, 4, 5]
|
||||
);
|
||||
// The chosen event: its race overview (with print / PDF / CSV) and its heats.
|
||||
const heatList = selectedGroup ? renderTable(
|
||||
[t("archive.date"), t("archive.session"), t("archive.layout"), t("archive.drivers"), t("archive.winner"), t("archive.penalties_short"), ""],
|
||||
selectedGroup.rows.slice().sort((left, right) => Number(left.session.startedAt || left.session.endedAt || 0) - Number(right.session.startedAt || right.session.endedAt || 0)).map((row) => `
|
||||
<tr class="${row.session.id === selectedSessionId ? "is-selected" : ""}">
|
||||
<td>${escapeHtml(row.date || "-")}</td>
|
||||
<td>${escapeHtml(row.session.name)}</td>
|
||||
<td>${escapeHtml(row.trackLayoutLabel || "-")}</td>
|
||||
<td>${row.competitors.length}</td>
|
||||
<td>${escapeHtml(row.winnerName || "-")}</td>
|
||||
<td>${row.adjustmentCount || "-"}</td>
|
||||
<td><button class="btn btn-mini" data-archive-open="${escapeHtml(row.session.id)}" type="button">${t("archive.view")}</button></td>
|
||||
</tr>`)
|
||||
) : "";
|
||||
const shownRow = selectedRow && (!selectedGroup || selectedGroup.rows.includes(selectedRow)) ? selectedRow : null;
|
||||
|
||||
dom.view.innerHTML = `
|
||||
<section class="panel">
|
||||
@@ -164,10 +200,22 @@ export function renderResultsArchiveView(deps) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body" id="archiveResultsBody">
|
||||
${filteredRows.length ? table : `<p>${t("archive.no_results")}</p>`}
|
||||
${groups.length ? table : `<p>${t("archive.no_results")}</p>`}
|
||||
</div>
|
||||
</section>
|
||||
${selectedRow ? renderArchiveDetail(selectedRow, { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings }) : ""}
|
||||
${selectedGroup ? `
|
||||
<section class="panel mt-16" id="archiveEventPanel">
|
||||
<div class="panel-header">
|
||||
<div><h3>${escapeHtml(selectedGroup.eventName)}</h3><p class="hint">${escapeHtml([selectedGroup.date, selectedGroup.className].filter(Boolean).join(" • "))}</p></div>
|
||||
<div class="actions-inline">
|
||||
${selectedGroup.event ? `<button class="btn" id="archiveExportJson" type="button">${t("archive.export_json")}</button>` : ""}
|
||||
<button class="btn" id="archiveEventClose" type="button">${t("archive.close")}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body"><h4>${t("archive.heats")}</h4>${heatList}</div>
|
||||
</section>
|
||||
${selectedGroup.event ? renderRaceOverview(selectedGroup.event) : ""}` : ""}
|
||||
${shownRow ? renderArchiveDetail(shownRow, { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings }) : ""}
|
||||
`;
|
||||
|
||||
const rerender = () => renderResultsArchiveView(deps);
|
||||
@@ -201,17 +249,32 @@ export function renderResultsArchiveView(deps) {
|
||||
setArchiveFilters({ ...filters, dateTo: event.currentTarget.value });
|
||||
rerender();
|
||||
});
|
||||
document.querySelectorAll("[data-archive-event]").forEach((button) => {
|
||||
button.addEventListener("click", () => {
|
||||
setSelectedEventKey(button.dataset.archiveEvent);
|
||||
setSelectedSessionId("");
|
||||
rerender();
|
||||
document.getElementById("archiveEventPanel")?.scrollIntoView({ behavior: "smooth", block: "start" });
|
||||
});
|
||||
});
|
||||
document.getElementById("archiveEventClose")?.addEventListener("click", () => { setSelectedEventKey(""); setSelectedSessionId(""); rerender(); });
|
||||
document.querySelectorAll("[data-archive-open]").forEach((button) => {
|
||||
button.addEventListener("click", () => { setSelectedSessionId(button.dataset.archiveOpen); rerender(); });
|
||||
button.addEventListener("click", () => {
|
||||
setSelectedSessionId(button.dataset.archiveOpen);
|
||||
rerender();
|
||||
document.querySelector(".archive-detail")?.scrollIntoView({ behavior: "smooth", block: "start" });
|
||||
});
|
||||
});
|
||||
document.getElementById("archiveDetailClose")?.addEventListener("click", () => { setSelectedSessionId(""); rerender(); });
|
||||
if (selectedRow?.event) {
|
||||
if (selectedGroup?.event) bindRaceOverview(dom.view, selectedGroup.event);
|
||||
const detailEvent = shownRow?.event || selectedGroup?.event;
|
||||
if (detailEvent) {
|
||||
document.getElementById("archiveExportPdf")?.addEventListener("click", () => {
|
||||
exportRaceResultsPdf(selectedRow.event);
|
||||
exportRaceResultsPdf(detailEvent);
|
||||
});
|
||||
document.getElementById("archiveExportJson")?.addEventListener("click", () => {
|
||||
const payload = buildRacePackagePayload(selectedRow.event.id);
|
||||
downloadJsonFile(`${sanitizeFilenameSegment(selectedRow.event.name)}_race_package.json`, payload);
|
||||
const payload = buildRacePackagePayload(detailEvent.id);
|
||||
downloadJsonFile(`${sanitizeFilenameSegment(detailEvent.name)}_race_package.json`, payload);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -4843,3 +4843,13 @@ details.event-group > summary { cursor: pointer; list-style: revert; }
|
||||
|
||||
.sound-choice { display: flex; gap: 6px; align-items: center; }
|
||||
.sound-choice select { flex: 1; }
|
||||
|
||||
/* Race overview (Race Day, results archive) */
|
||||
.race-overview-podium { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 10px; list-style: none; margin: 0 0 12px; padding: 0; }
|
||||
.race-overview-podium li { display: grid; gap: 4px; padding: 12px; border: 1px solid var(--line); border-radius: 12px; background: var(--surface-card); text-align: center; }
|
||||
.race-overview-podium li span { font-size: 1.4rem; font-weight: 800; color: var(--muted); }
|
||||
.race-overview-podium .podium-1 span { color: #d4a514; }
|
||||
.race-overview-phase { border-top: 1px solid var(--line); padding: 8px 0; }
|
||||
.race-overview-phase summary { cursor: pointer; padding: 4px 0; }
|
||||
.race-overview-phase h4 { margin: 12px 0 6px; }
|
||||
@media (max-width: 640px) { .race-overview-podium { grid-template-columns: 1fr; } }
|
||||
Reference in new issue
Block a user