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 }) => `
${escapeHtml(getClassName(event.classId))} ${escapeHtml(event.date || "-")}${escapeHtml(raceOverviewPhaseLabel(phase.type))} âą ${escapeHtml(session.name)}
${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) => ` `))}
- ${medal(row.pos)} ${rows.some((item) => item.qual) ? qualCell(row.qual, escapeHtml) : ""}${escapeHtml(row.name)} ${rows.some((item) => item.car) ? `${escapeHtml(row.car || "-")} ` : ""}${row.laps} ${escapeHtml(row.result)} ${row.bestLapMs ? escapeHtml(formatLap(row.bestLapMs)) : "-"} ${escapeHtml(event.name)}
+
${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