From c4375daa939dcccebc6bf1697b9702b32d3fcf98 Mon Sep 17 00:00:00 2001 From: larssand Date: Fri, 6 Nov 2026 19:04:17 +0100 Subject: [PATCH] feat(sponsor): show each driver's car for the heat on overlays and Race Day (1.71.0) --- CHANGELOG.md | 5 +++++ README.md | 2 +- README.sv.md | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/app.js | 4 ++-- src/overlays.js | 5 +++-- src/race_day_view.js | 2 +- src/styles.css | 4 ++++ src/timing_logic.js | 2 ++ tests/overlay_leaderboard.test.js | 5 +++++ tests/race_timing_logic.test.js | 16 ++++++++++++++++ 12 files changed, 43 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a62c84..d5e0134 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.71.0 + +### Added +- Sponsor events: the car each driver has in the heat is shown next to the name (🚗 Rental 2) on the overlay, the OBS overlay (lower third and tower) and Race Day's live list. + ## 1.70.4 ### Changed diff --git a/README.md b/README.md index 9f3ee78..9ffbaf6 100644 --- a/README.md +++ b/README.md @@ -276,7 +276,7 @@ The **Overlay** menu has leaderboard, speaker, results, TV and team modes, plus 1. **Drivers:** type the names, one per line. They become guests of this event only (never in normal races or practice) and are deleted with it. 2. **Cars:** tick the cars, or add one with name and transponder. 3. **Format:** practice per group, qualifying rounds, qualifying start (staggered, flying, mass) and lengths. 8 drivers and 4 cars give 2 groups, 1 practice per group, 2 qualifying rounds and A/B finals. **Create heats**: drivers rotate cars every round. -4. Run the heats on **Race Day** like a race (▶ Next, Start, Pause, Stop, count-down, start signal and calls). The car's transponder counts for whoever drives it in that heat. +4. Run the heats on **Race Day** like a race (▶ Next, Start, Pause, Stop, count-down, start signal and calls). The car's transponder counts for whoever drives it in that heat, and the car is shown next to the driver's name (🚗 Rental 2) on the overlay, the OBS overlay and Race Day's live list. 5. **Create finals** from qualifying; cars are drawn for the finals. The race overview and the results archive show the car per driver and heat. ### Data, backups and import/export diff --git a/README.sv.md b/README.sv.md index b013e59..ef7c5d9 100644 --- a/README.sv.md +++ b/README.sv.md @@ -289,7 +289,7 @@ Menyn **Overlay** har lĂ€gena leaderboard, speaker, resultat, TV och lag, plus e 1. **Förare:** skriv namnen, ett per rad. De blir gĂ€ster i bara det hĂ€r eventet (aldrig i vanliga race eller trĂ€ning) och tas bort med det. 2. **Bilar:** bocka i bilarna, eller lĂ€gg till en med namn och transponder. 3. **Format:** trĂ€ning per grupp, kvalomgĂ„ngar, kvalstart (staggered, flygande, mass) och lĂ€ngder. 8 förare och 4 bilar ger 2 grupper, 1 trĂ€ning per grupp, 2 kvalomgĂ„ngar och A/B-final. **Skapa heat**: förarna byter bil varje omgĂ„ng. -4. Kör heaten pĂ„ **Race Day** som ett race (▶ NĂ€sta, Start, Paus, Stopp, nedrĂ€kning, startsignal och utrop). Bilens transponder rĂ€knas för den som kör den i heatet. +4. Kör heaten pĂ„ **Race Day** som ett race (▶ NĂ€sta, Start, Paus, Stopp, nedrĂ€kning, startsignal och utrop). Bilens transponder rĂ€knas för den som kör den i heatet, och bilen visas bredvid förarens namn (🚗 Hyrbil 2) i overlayn, OBS-overlayn och Race Days live-lista. 5. **Skapa finaler** frĂ„n kvalet; bilarna lottas i finalerna. Race-översikten och resultatarkivet visar bilen per förare och heat. ### Data, backup och export/import diff --git a/package-lock.json b/package-lock.json index 1351d05..637c139 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.70.4", + "version": "1.71.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.70.4", + "version": "1.71.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index ef06a1d..3a0d097 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.70.4", + "version": "1.71.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 63a4a32..3c72d97 100644 --- a/src/app.js +++ b/src/app.js @@ -3010,7 +3010,7 @@ const TRANSLATIONS = { "guide.sponsor_4": "4. VĂ€lj format: practice per grupp, kvalomgĂ„ngar, starttyp i kvalet och lĂ€ngder. 8 förare och 4 bilar ger 2 grupper, A- och B-final. Klicka Skapa heat. Förarna byter bil varje omgĂ„ng.", "guide.sponsor_5": "5. Kör heaten pĂ„ Race Day med ▶ NĂ€sta, Start, Paus och Stopp, med nedrĂ€kning, startljud och utrop som i ett race.", "guide.sponsor_6": "6. NĂ€r kvalet Ă€r kört: Skapa finaler frĂ„n kvalet. Bilarna lottas i finalerna.", - "guide.sponsor_7": "7. I Hantera ligger sponsor-setupen överst och heatlistan under. LĂ€gg till heat manuellt finns hopfĂ€llt lĂ€ngre ner. Testa utan klubbregister: test-data/ i RaceCore har förare, bilar och gĂ€stnamn att importera.", + "guide.sponsor_7": "7. I Hantera ligger sponsor-setupen överst och heatlistan under. LĂ€gg till heat manuellt finns hopfĂ€llt lĂ€ngre ner. Testa utan klubbregister: test-data/ i RaceCore har förare, bilar och gĂ€stnamn att importera. Under heatet visas bilen bredvid varje förare (🚗) i overlayn och pĂ„ Race Day.", "guide.race_title": "Skapa vanligt race (förare har egna transpondrar)", "guide.race_1": "1. LĂ€gg in förare med personlig transponder. BrandfĂ€ltet kan anvĂ€ndas för team, sponsor eller bilmĂ€rke.", "guide.race_2": "2. Skapa event med lĂ€ge Race.", @@ -5136,7 +5136,7 @@ const TRANSLATIONS = { "guide.sponsor_4": "4. Choose the format: practice per group, qualifying rounds, qualifying start and lengths. 8 drivers and 4 cars make 2 groups, A and B finals. Click Create heats. Drivers swap cars every round.", "guide.sponsor_5": "5. Run the heats on Race Day with ▶ Next, Start, Pause and Stop, with count-down, start signal and calls as in a race.", "guide.sponsor_6": "6. When qualifying is done: Create finals from qualifying. Cars are drawn for the finals.", - "guide.sponsor_7": "7. In Manage the sponsor setup comes first and the list of heats below. Adding a heat by hand is folded further down. To try it without a club register: test-data/ in RaceCore has drivers, cars and guest names to import.", + "guide.sponsor_7": "7. In Manage the sponsor setup comes first and the list of heats below. Adding a heat by hand is folded further down. To try it without a club register: test-data/ in RaceCore has drivers, cars and guest names to import. During the heat the car is shown next to each driver (🚗) on the overlay and on Race Day.", "guide.race_title": "Create regular race (driver transponders)", "guide.race_1": "1. Add drivers with personal transponder IDs. The brand field can be used for team, sponsor or car brand.", "guide.race_2": "2. Create event in Race mode.", diff --git a/src/overlays.js b/src/overlays.js index 4303b07..dddd902 100644 --- a/src/overlays.js +++ b/src/overlays.js @@ -83,7 +83,7 @@ export function renderOverlayLeaderboard(rows, { t, escapeHtml, formatTeamActive
${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? ` 🏁 ${t("timing.personal_time_up")}` : ""}${row.suspectPending ? ` ⚠` : ""} - ${escapeHtml(row.teamId ? `${t("overlay.active_member")}: ${formatTeamActiveMemberLabel(row)}` : row.subLabel || row.transponder || "-")} + ${row.heatCarName ? `🚗 ${escapeHtml(row.heatCarName)}` : `${escapeHtml(row.teamId ? `${t("overlay.active_member")}: ${formatTeamActiveMemberLabel(row)}` : row.subLabel || row.transponder || "-")}`} ${row.lastSplitMs || row.pitActive || row.pitStops ? `${row.lastSplitMs ? `${t("table.split")}: ${formatLap(row.lastSplitMs)}` : ""}${row.lastSplitMs && (row.pitActive || row.pitStops) ? " ‱ " : ""}${row.pitActive ? t("timing.pit_active") : row.pitStops ? `${t("table.pit")}: ${row.pitStops} / ${formatLap(row.totalPitMs)}` : ""}` : ""} ${row.invalidPending ? `${escapeHtml(row.invalidLabel)}${row.invalidLapMs ? ` ‱ ${formatLap(row.invalidLapMs)}` : ""}` : ""}
@@ -295,6 +295,7 @@ export function renderObsOverlay(active, leaderboard, result, sessionTiming, bra
${idx + 1} ${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? " 🏁" : ""}${row.suspectPending ? ` ⚠` : ""} + ${row.heatCarName ? `🚗 ${escapeHtml(row.heatCarName)}` : ""} ${obsConfig.showLaps ? `${t("table.laps")}: ${row.laps ?? 0}` : ""} ${obsShowsResult(active, obsConfig) ? `${t("table.result")}: ${escapeHtml(row.resultDisplay)}` : ""} ${obsConfig.showGap ? `${t("table.gap")}: ${escapeHtml(row.gapDisplay || row.gapAhead || "-")}` : ""} @@ -343,7 +344,7 @@ export function renderObsOverlay(active, leaderboard, result, sessionTiming, bra ${idx + 1}
${escapeHtml(row.displayName || row.driverName)}${row.personalTimeUp ? " 🏁" : ""}${row.suspectPending ? ` ⚠` : ""} - ${row.teamId ? `${escapeHtml(formatTeamActiveMemberLabel(row))}` : ""} + ${row.teamId ? `${escapeHtml(formatTeamActiveMemberLabel(row))}` : row.heatCarName ? `🚗 ${escapeHtml(row.heatCarName)}` : ""}
${trail ? `
${trail}
` : ""}
diff --git a/src/race_day_view.js b/src/race_day_view.js index 1c27d20..b6579fc 100644 --- a/src/race_day_view.js +++ b/src/race_day_view.js @@ -193,7 +193,7 @@ function renderLivePanelInner({ t, escapeHtml, formatLap, formatRaceClock, build const progress = Math.round(Math.min(1, row.predictedProgress || 0) * 100); return ` ${index + 1} - ${escapeHtml(row.displayName || row.driverName || row.transponder || "-")}${flag}${row.invalidPending ? ` ⚠` : ""} + ${escapeHtml(row.displayName || row.driverName || row.transponder || "-")}${flag}${row.heatCarName ? ` 🚗 ${escapeHtml(row.heatCarName)}` : ""}${row.invalidPending ? ` ⚠` : ""} ${done ? "" : ``} ${row.laps} ${lap(row.lastLapMs)} diff --git a/src/styles.css b/src/styles.css index d8facdb..1585379 100644 --- a/src/styles.css +++ b/src/styles.css @@ -4879,3 +4879,7 @@ details.event-group > summary { cursor: pointer; list-style: revert; } .judge-custom-sec input { width: 80px; } .judge-reason { display: grid; gap: 4px; } .pill-red { background: var(--danger, #c0392b); color: #fff; } + +/* Sponsor event heats: the car each driver has in this heat, next to the name. */ +.overlay-heat-car, .live-heat-car { color: var(--accent-2, #0ea5e9); font-weight: 600; white-space: nowrap; } +.live-heat-car { font-size: 0.85em; margin-left: 6px; } diff --git a/src/timing_logic.js b/src/timing_logic.js index 2e61385..1aad899 100644 --- a/src/timing_logic.js +++ b/src/timing_logic.js @@ -298,6 +298,8 @@ export function buildLeaderboard(session, { ensureSessionResult, getSessionTarge ); return { ...row, + // Sponsor event heats (drivers share club cars): which car the driver has in this heat. + heatCarName: session.carAssignments && row.carId && Object.values(session.carAssignments).includes(row.carId) ? String(row.carName || "") : "", personalTimeUp, // Practice laps far quicker than the driver's pace, still waiting for approve/remove. suspectPending: passings.filter((passing) => passing.suspect).length, diff --git a/tests/overlay_leaderboard.test.js b/tests/overlay_leaderboard.test.js index a72387e..157815f 100644 --- a/tests/overlay_leaderboard.test.js +++ b/tests/overlay_leaderboard.test.js @@ -17,3 +17,8 @@ test("the overlay page passes the whole leaderboard (OBS cuts to its own rows se const source = readFileSync(new URL("../src/misc_views.js", import.meta.url), "utf8"); assert.doesNotMatch(source, /buildLeaderboard\(active\)\.slice\(0, 12\)/); }); + +test("sponsor heats: the overlay shows the driver's car for this heat", () => { + const html = renderOverlayLeaderboard([{ key: "a", driverId: "a", displayName: "Anna", heatCarName: "Rental 2", laps: 3, resultDisplay: "-", bestLapMs: 17500 }], deps); + assert.match(html, /overlay-heat-car[^>]*>🚗 Rental 2/); +}); diff --git a/tests/race_timing_logic.test.js b/tests/race_timing_logic.test.js index 8254b6d..b053ac7 100644 --- a/tests/race_timing_logic.test.js +++ b/tests/race_timing_logic.test.js @@ -1110,3 +1110,19 @@ test("buildLeaderboard: same laps in a finished heat - the lower total time wins assert.equal(rows[1].gap, "+1.000s"); } }); + +test("sponsor heats: each row carries the car the driver has in this heat, other races none", () => { + const competitors = { + a: { key: "a", driverId: "a", driverName: "Anna", carId: "c2", carName: "Rental 2", laps: 3, lastLapMs: 18000, bestLapMs: 17500, startTimestamp: 1, lastTimestamp: 60000 }, + b: { key: "b", driverId: "b", driverName: "Bosse", carId: "own", carName: "Own car", laps: 2, lastLapMs: 19000, bestLapMs: 18500, startTimestamp: 1, lastTimestamp: 50000 }, + }; + const deps = { + ensureSessionResult: () => ({ competitors }), getSessionTargetMs: () => null, getCompetitorPassings: () => [], isCountedPassing: () => true, + getCompetitorElapsedMs, getCompetitorSeedMetric: () => null, getSessionLapWindow: () => ({ minLapMs: 0, maxLapMs: Infinity }), + getPassingValidationLabel: () => "", formatSeedMetric: () => "", formatRaceClock: String, formatLeaderboardGap: () => "", formatLapDelta: () => "", formatLap: String, t: (key) => key, + }; + const sponsor = buildLeaderboard({ id: "sp", type: "heat", startMode: "mass", carAssignments: { a: "c2" } }, deps); + assert.equal(sponsor.find((row) => row.key === "a").heatCarName, "Rental 2"); + assert.equal(sponsor.find((row) => row.key === "b").heatCarName, "", "a car not handed out in this heat is not shown"); + assert.ok(buildLeaderboard({ id: "club", type: "heat", startMode: "mass" }, deps).every((row) => row.heatCarName === "")); +});