diff --git a/CHANGELOG.md b/CHANGELOG.md index 0059bb2..928f6b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.89.12 + +### Added + +- Race overview: a finished heat or final has its own 🖹 and PDF buttons that print just that heat. + +### Changed + +- Printed and PDF results start with the finals (A final first), then qualifying, then practice. + ## 1.89.11 ### Added diff --git a/README.md b/README.md index 023c616..1fc2522 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ The menu follows how a race day works: **Start** (Dashboard, Race Day), **Create - **đŸ“ș Drivers' board** (`/public-overlay/schedule`, also under Overlay) shows what is on track, the next three heats with their drivers, then the rest of the day. A heat that has been called is highlighted "Called – get ready". It works on a phone or a TV in the pits. - **Calling a heat:** when a heat is 10 minutes away (set under **Call**), Race Day asks the race controller: **📱 Call now** reads the heat and its drivers over the speakers and highlights it on the drivers' board; **Later** asks again in 2 minutes. With the autopilot on, heats are called on their own. - **▶ Run the day automatically** starts each heat's count-down on its own when the schedule says so, and waits (saying why) while a heat runs, the decoder is offline or a heat is not ready. With several classes on one day, every class's heats run in the same order. Finals are never created automatically: when a class's qualifying is done it says "Waiting: check qualifying and press 🏁 Create finals for 
" with the class names, so qualifying can be corrected first. Then the autopilot runs the finals. It runs only in the browser where it was turned on. **■ Stop autopilot** to run heats by hand; turning it on again carries on with the next heat not yet run. **⏞ Pause the day** pauses the heat on track (or holds the count-down) and the autopilot until **Resume the day**. -- **Race overview** (under the heat queue): the whole race of the current event in one place - the podium from the A final, then practice, qualifying and finals that open and close, each with the standings and every heat's result (laps, result, best lap, and the car in sponsor heats). **Print**, **PDF** and **CSV** export the whole race with every heat. +- **Race overview** (under the heat queue): the whole race of the current event in one place - the podium from the A final, then practice, qualifying and finals that open and close, each with the standings and every heat's result (laps, result, best lap, and the car in sponsor heats). **Print**, **PDF** and **CSV** export the whole race with every heat, finals on top (A final first), then qualifying, then practice. A finished heat or final has its own **🖹** and **PDF** buttons for just that heat, e.g. for the board in the pits. - **Speaker panel** (under the start buttons): track call, track clear, red flag, pause, resume, false start and marshal warning. Under **Sound and calls** are quick switches that save at once: mute all, lap time calls, race leader calls, practice hype and the speaker cues. - **Preflight** checks the decoder, participants, transponders (missing or duplicated), the lap window, the grid and audio. Blockers come first, each with a shortcut to the right setting. The min/max lap time can be edited right there. - **An automatic SQLite backup** is taken before every start. diff --git a/README.sv.md b/README.sv.md index 47673fa..3010374 100644 --- a/README.sv.md +++ b/README.sv.md @@ -125,7 +125,7 @@ GrĂ€nssnittet finns pĂ„ svenska och engelska. - **Upprop:** nĂ€r ett heat har 10 minuter kvar (Ă€ndras under **Upprop**) frĂ„gar Race Day race controllern: **📱 Ropa ut** lĂ€ser upp heatet och förarna i högtalarna och markerar det i förarvyn; **Senare** frĂ„gar igen om 2 minuter. NĂ€r automatiken Ă€r pĂ„ ropas heaten upp av sig sjĂ€lva. - **▶ Kör dagen automatiskt** startar varje heats nedrĂ€kning sjĂ€lv nĂ€r schemat sĂ€ger det, och vĂ€ntar (och sĂ€ger varför) medan ett heat körs, decodern Ă€r frĂ„nkopplad eller ett heat inte Ă€r redo. Med flera klasser samma dag körs alla klassernas heat i samma ordning. Finaler skapas aldrig automatiskt: nĂ€r kvalet Ă€r klart i en klass stĂ„r det "VĂ€ntar: kontrollera kvalet och tryck 🏁 Skapa finaler för 
" med klassernas namn, sĂ„ att kvalet kan korrigeras först. Sedan kör automatiken finalerna. Den körs bara i webblĂ€saren dĂ€r den slogs pĂ„. **■ Stoppa automatiken** för att köra för hand; slĂ„r du pĂ„ den igen fortsĂ€tter den med nĂ€sta heat som inte Ă€r kört. **⏞ Pausa dagen** pausar heatet pĂ„ banan (eller hĂ„ller nedrĂ€kningen) och automatiken tills **FortsĂ€tt dagen**. - **Heat-kön** visar aktuellt, nĂ€sta och dĂ€rpĂ„ följande heat i körordning: trĂ€ning, kval omgĂ„ng för omgĂ„ng (Q1 H1, Q1 H2, Q2 H1 
), sedan finaler frĂ„n lĂ€gsta (C, B, A). NĂ€r ett heat Ă€r klart vĂ€ljer **▶ NĂ€sta** nĂ€sta heat med ett klick. Sessionslistorna i Race Setup och pĂ„ Race Day följer samma ordning, sĂ„ ett heat som tagits bort och skapats om hamnar pĂ„ rĂ€tt plats; **â–Čâ–Œ** pĂ„ en session i Race Setup flyttar den tidigare eller senare. -- **Race-översikt** (under heatkön): hela racet för det aktuella eventet pĂ„ ett stĂ€lle – pallen frĂ„n A-finalen, sedan trĂ€ning, kval och finaler som kan fĂ€llas ut, var och en med stĂ€llning och varje heats resultat (varv, resultat, bĂ€sta varv, och bilen i sponsorheat). **Skriv ut**, **PDF** och **CSV** exporterar hela racet med alla heat. +- **Race-översikt** (under heatkön): hela racet för det aktuella eventet pĂ„ ett stĂ€lle – pallen frĂ„n A-finalen, sedan trĂ€ning, kval och finaler som kan fĂ€llas ut, var och en med stĂ€llning och varje heats resultat (varv, resultat, bĂ€sta varv, och bilen i sponsorheat). **Skriv ut**, **PDF** och **CSV** exporterar hela racet med alla heat, finalerna överst (A-finalen först), sedan kval och sist trĂ€ning. Ett avslutat heat eller en final har egna knappar **🖹** och **PDF** för bara det heatet, t.ex. till tavlan i depĂ„n. - **Speakerpanel** (under startknapparna): stopp pĂ„ banan, banan fri, röd flagg, paus, fortsĂ€tt, tjuvstart och banvaktsvarning. Under **Ljud och utrop** finns snabbval som sparas direkt: tysta allt, varvtidsutrop, ledarutrop, pepp under trĂ€ning och speaker-utropen. - **Förkontrollen** kontrollerar decoder, deltagare, transpondrar (saknade eller dubbletter), varvtidsgrĂ€nser, grid och ljud. Blockerare visas först, var och en med en genvĂ€g till rĂ€tt instĂ€llning. Min/max-varvtid kan Ă€ndras direkt dĂ€r. - **En automatisk SQLite-backup** tas före varje start. diff --git a/package-lock.json b/package-lock.json index b47ca18..269c15a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.89.11", + "version": "1.89.12", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.89.11", + "version": "1.89.12", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 6e5f8b2..a540bec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.89.11", + "version": "1.89.12", "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 e209f56..6ac6c2e 100644 --- a/src/app.js +++ b/src/app.js @@ -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 }) => ` `)).join(""); + `).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}`, ` + + ${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}`, diff --git a/src/race_overview_view.js b/src/race_overview_view.js index 3fac39b..0a625ee 100644 --- a/src/race_overview_view.js +++ b/src/race_overview_view.js @@ -29,7 +29,7 @@ export function renderRaceOverviewPanel(overview, { t, escapeHtml, formatLap, re

${t("race_overview.standings")}

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

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

+

${escapeHtml(session.name)} ${escapeHtml(getStatusLabel(session.status))}${session.status === "finished" && rows.length ? ` ` : ""}

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

${t("race_overview.no_results")}

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

${t("race_overview.not_run")}

`} `).join("")} @@ -37,11 +37,13 @@ export function renderRaceOverviewPanel(overview, { t, escapeHtml, formatLap, re `; } -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))); } diff --git a/src/race_render_helpers.js b/src/race_render_helpers.js index 4f499f8..4f2bc98 100644 --- a/src/race_render_helpers.js +++ b/src/race_render_helpers.js @@ -441,16 +441,16 @@ export function buildRaceResultsHtml(event, { t, escapeHtml, resolveEventBrandin