feat(results): print or PDF one finished heat; results list finals first (1.89.12)

This commit is contained in:
larssand committed 2026-11-12 21:51:03 +01:00
1 parent 3a0e871ebc
commit 4a1460b480
10 files changed
+111 -35

No files matched your search

+74 -24
View File
@@ -162,15 +162,69 @@ const renderRaceOverviewFor = (event) => (event ? renderRaceOverviewPanel(getRac
const bindRaceOverviewFor = (root, event) => event && bindRaceOverviewPanel(root, getRaceOverview(event), {
print: () => openPrintWindow(`${event.name} - ${t("events.results_overview")}`, buildRaceResultsHtml(event)),
pdf: () => exportRaceResultsPdf(event),
printHeat: (sessionId) => printHeatResult(event, sessionId),
pdfHeat: (sessionId) => exportHeatResultPdf(event, sessionId),
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 }) => `
// Every heat's result, for the printed results overview (or just one heat: onlySessionId).
// Results read from the top: finals (A final first), then qualifying, then practice.
const PHASE_PRINT_ORDER = { final: 0, qualification: 1, practice: 2 };
const finalLetterLeg = (name) => { const match = String(name || "").match(/^([A-Z])\b.*?(\d+)\s*$/); return match ? [match[1].charCodeAt(0), Number(match[2])] : [0, 0]; };
const getOverviewHeats = (event, onlySessionId = "") => [...(getRaceOverview(event)?.phases || [])]
.sort((a, b) => (PHASE_PRINT_ORDER[a.type] ?? 3) - (PHASE_PRINT_ORDER[b.type] ?? 3))
.flatMap((phase) => {
const heats = phase.type === "final"
? [...phase.heats].sort((a, b) => { const [la, ga] = finalLetterLeg(a.session.name); const [lb, gb] = finalLetterLeg(b.session.name); return la - lb || ga - gb; })
: phase.heats;
return heats.map((heat) => ({ ...heat, phase }));
})
.filter(({ session }) => !onlySessionId || session.id === onlySessionId);
const renderRaceOverviewHeatsHtml = (event, onlySessionId = "") => getOverviewHeats(event, onlySessionId).map(({ session, rows, phase }) => `
<section class="print-block">
<h2>${escapeHtml(raceOverviewPhaseLabel(phase.type))} • ${escapeHtml(session.name)}</h2>
${renderTable([t("table.pos"), ...(rows.some((row) => row.qual) ? [t("table.qual")] : []), 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>${medal(row.pos)}</td>${rows.some((item) => item.qual) ? qualCell(row.qual, escapeHtml) : ""}<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("");
</section>`).join("");
const buildHeatPdfSection = ({ session, rows, phase }) => {
const withCar = rows.some((row) => row.car);
const withQual = rows.some((row) => row.qual);
return buildPdfSection(
`${raceOverviewPhaseLabel(phase.type)} • ${session.name}`,
[t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), ...(withCar ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")],
rows.map((row) => [String(row.pos), ...(withQual ? [row.qual || "-"] : []), row.name, ...(withCar ? [row.car || "-"] : []), String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "-"])
);
};
// One finished heat or final on its own page: for the board in the pits right after it.
const printHeatResult = (event, sessionId) => {
const heat = getOverviewHeats(event, sessionId)[0];
if (!heat) return;
openPrintWindow(`${event.name} - ${heat.session.name}`, `
<header class="print-header">
<div>
<p class="print-kicker">${escapeHtml(getClassName(event.classId))}</p>
<h1>${escapeHtml(event.name)}</h1>
<p>${escapeHtml(event.date || "-")}</p>
</div>
<div class="print-meta">${buildPrintBrandBlock(resolveEventBranding(event))}</div>
</header>
${renderRaceOverviewHeatsHtml(event, sessionId)}`);
};
async function exportHeatResultPdf(event, sessionId) {
const heat = getOverviewHeats(event, sessionId)[0];
if (!heat) return;
const branding = resolveEventBranding(event);
await requestPdfExport({
filename: `${event.name.replaceAll(/\s+/g, "_")}_${heat.session.name.replaceAll(/\s+/g, "_")}.pdf`,
title: event.name,
subtitle: `${getClassName(event.classId)} • ${event.date || "-"}`,
brandName: branding.brandName,
brandTagline: branding.brandTagline,
footer: branding.pdfFooter,
theme: branding.pdfTheme,
logoDataUrl: await ensurePdfLogoDataUrl(branding.logoDataUrl),
sections: [buildHeatPdfSection(heat)],
});
}
const getSessionsForEvent = (eventId) => getSessionsForEventHelper(state, eventId);
const getModeLabel = (mode) => getModeLabelHelper(mode, { t });
const normalizeStartMode = (mode) => normalizeStartModeHelper(mode);
@@ -3121,6 +3175,8 @@ const TRANSLATIONS = {
"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.print_heat": "Skriv ut bara detta heat",
"race_overview.pdf_heat": "PDF för bara detta heat",
"race_overview.car": "Bil",
"race_overview.total": "Total",
"race_overview.standings": "Ställning",
@@ -5396,6 +5452,8 @@ const TRANSLATIONS = {
"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.print_heat": "Print just this heat",
"race_overview.pdf_heat": "PDF of just this heat",
"race_overview.car": "Car",
"race_overview.total": "Total",
"race_overview.standings": "Standings",
@@ -8116,9 +8174,15 @@ async function exportRaceResultsPdf(event) {
logoDataUrl: await ensurePdfLogoDataUrl(branding.logoDataUrl),
sections: [
buildPdfSection(
t("events.practice_standings"),
[t("table.pos"), t("table.driver"), t("table.score")],
buildPracticeStandings(event).map((row) => [String(row.rank), row.driverName || "-", row.score || "-"])
t("events.final_standings"),
...(() => {
const rows = buildFinalStandings(event);
const withQual = rows.some((row) => row.qual);
return [
[t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), t("table.score")],
rows.map((row) => [String(row.rank), ...(withQual ? [row.qual || "-"] : []), row.driverName || "-", row.score || "-"]),
];
})()
),
buildPdfSection(
t("events.qualifying_standings"),
@@ -8130,25 +8194,11 @@ async function exportRaceResultsPdf(event) {
])
),
buildPdfSection(
t("events.final_standings"),
...(() => {
const rows = buildFinalStandings(event);
const withQual = rows.some((row) => row.qual);
return [
[t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), t("table.score")],
rows.map((row) => [String(row.rank), ...(withQual ? [row.qual || "-"] : []), row.driverName || "-", row.score || "-"]),
];
})()
t("events.practice_standings"),
[t("table.pos"), t("table.driver"), t("table.score")],
buildPracticeStandings(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);
const withQual = rows.some((row) => row.qual);
return buildPdfSection(
`${raceOverviewPhaseLabel(phase.type)} • ${session.name}`,
[t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), ...(withCar ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")],
rows.map((row) => [String(row.pos), ...(withQual ? [row.qual || "-"] : []), row.name, ...(withCar ? [row.car || "-"] : []), String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "-"])
);
})),
...getOverviewHeats(event).map(buildHeatPdfSection),
...buildTeamRaceStandings(event).map(({ session, rows }) =>
buildPdfSection(
`${t("events.team_standings")} • ${session.name}`,
+4 -2
View File
@@ -29,7 +29,7 @@ export function renderRaceOverviewPanel(overview, { t, escapeHtml, formatLap, re
<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>
<h4>${escapeHtml(session.name)} <small>${escapeHtml(getStatusLabel(session.status))}</small>${session.status === "finished" && rows.length ? ` <span class="race-overview-heat-actions"><button class="btn btn-mini" type="button" data-heat-print="${escapeHtml(session.id)}" title="${escapeHtml(t("race_overview.print_heat"))}">🖨</button><button class="btn btn-mini" type="button" data-heat-pdf="${escapeHtml(session.id)}" title="${escapeHtml(t("race_overview.pdf_heat"))}">PDF</button></span>` : ""}</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("")}
@@ -37,11 +37,13 @@ export function renderRaceOverviewPanel(overview, { t, escapeHtml, formatLap, re
</section>`;
}
export function bindRaceOverviewPanel(root, overview, { print, pdf, csv }) {
export function bindRaceOverviewPanel(root, overview, { print, pdf, csv, printHeat = () => {}, pdfHeat = () => {} }) {
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);
}));
root.querySelectorAll("[data-heat-print]").forEach((button) => button.addEventListener("click", () => printHeat(button.dataset.heatPrint)));
root.querySelectorAll("[data-heat-pdf]").forEach((button) => button.addEventListener("click", () => pdfHeat(button.dataset.heatPdf)));
const actions = { print, pdf, csv };
root.querySelectorAll("[data-race-overview]").forEach((button) => button.addEventListener("click", () => actions[button.dataset.raceOverview]?.(overview)));
}
+4 -4
View File
@@ -441,16 +441,16 @@ export function buildRaceResultsHtml(event, { t, escapeHtml, resolveEventBrandin
</div>
</header>
<section class="print-block">
<h2>${t("events.practice_standings")}</h2>
${renderRaceStandingsTableView(buildPracticeStandings(event), t("events.no_practice_results"))}
<h2>${t("events.final_standings")}</h2>
${renderRaceStandingsTableView(buildFinalStandings(event), t("events.no_final_results"))}
</section>
<section class="print-block">
<h2>${t("events.qualifying_standings")}</h2>
${renderRaceStandingsTableView(buildQualifyingStandings(event), t("events.no_qualifying_results"))}
</section>
<section class="print-block">
<h2>${t("events.final_standings")}</h2>
${renderRaceStandingsTableView(buildFinalStandings(event), t("events.no_final_results"))}
<h2>${t("events.practice_standings")}</h2>
${renderRaceStandingsTableView(buildPracticeStandings(event), t("events.no_practice_results"))}
</section>
<section class="print-block">
<h2>${t("events.team_standings")}</h2>
+1
View File
@@ -5040,3 +5040,4 @@ body[data-theme="light"] .overlay-race-driver .overlay-pit-badge.is-done { color
.obs-tv-cell .overlay-split-chip { background: #0b4a6b; }
body[data-theme="light"] .overlay-split-chip { color: #075985; }
body[data-theme="light"] .overlay-pit-badge.is-done { color: #7a4a00; }
.race-overview-heat-actions { display: inline-flex; gap: 4px; margin-left: 8px; vertical-align: middle; }