From d0a5df699270ed7018943ca37963a7fc389ddd6e Mon Sep 17 00:00:00 2001 From: larssand Date: Thu, 5 Nov 2026 18:31:57 +0100 Subject: [PATCH] feat(sponsor): quick setup with guest drivers, shared rental cars, rotating heats and A/B finals (1.63.0) --- CHANGELOG.md | 16 ++++ package-lock.json | 4 +- package.json | 2 +- src/app.js | 98 +++++++++++++++++---- src/core_views.js | 6 +- src/day_schedule_logic.js | 6 +- src/decoder_runtime.js | 18 ++++ src/driver_profile_logic.js | 2 +- src/event_manager_controller.js | 12 ++- src/event_manager_view.js | 24 ++--- src/event_race_logic.js | 6 +- src/event_workspace_controller.js | 3 + src/race_day_logic.js | 13 ++- src/sponsor_event_logic.js | 132 ++++++++++++++++++++++++++++ src/sponsor_event_view.js | 141 ++++++++++++++++++++++++++++++ src/timing_logic.js | 3 +- tests/browser_race_setup.js | 29 ++++++ tests/run.js | 1 + tests/sponsor_event.test.js | 49 +++++++++++ 19 files changed, 511 insertions(+), 54 deletions(-) create mode 100644 src/sponsor_event_logic.js create mode 100644 src/sponsor_event_view.js create mode 100644 tests/sponsor_event.test.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f3a42a..938f6d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,22 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.63.0 - 2026-11-05 + +### Added + +- Sponsor events get a quick setup in Events → Manage, rental-kart style: + 1. Type the drivers' names, one per line. They become guests of that event only: not in the club driver list, race setups, practice, profiles or the driver CSV, and deleted with the event. + 2. Tick the club cars taking part, or add a car with name and transponder. + 3. Choose practice per group, qualifying rounds, qualifying start and lengths. Defaults: groups no bigger than the number of cars (8 drivers, 4 cars = 2 groups), 1 practice per group, 2 qualifying rounds, A/B finals. + "Create heats" builds practice and Q1 H1 ... heats in which drivers swap cars every round; "Create finals from qualifying" makes the A/B finals with the cars drawn by lot. +- The same car and transponder count for whichever driver has that car in the heat, so results, qualifying ranking and finals are per driver. +- Sponsor heats run on Race Day like a race: ▶ Next, Start, Pause and Stop, count-down, start signal, "finish the lap", leader calls in qualifying and finals, and practice hype calls. + +### Changed + +- The old "Sponsor Event Tools" rounds form is replaced by the quick setup; the manual driver/car assignment panel is only shown for events that still have old-style heats. + ## 1.62.0 - 2026-11-05 ### Added diff --git a/package-lock.json b/package-lock.json index 1b4a27d..b3dfb52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.62.0", + "version": "1.63.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.62.0", + "version": "1.63.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 9e30e65..f7b782b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.62.0", + "version": "1.63.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 6ca5c20..8ced3c9 100644 --- a/src/app.js +++ b/src/app.js @@ -395,7 +395,7 @@ function buildDayRows(date, now = Date.now()) { const getRaceDayDate = () => { const session = buildRaceDayQueue(state).current; const event = session ? state.events.find((item) => item.id === session.eventId) : null; - return event?.mode === "race" && event.date ? event.date : todayKey(); + return (event?.mode === "race" || event?.sponsor) && event.date ? event.date : todayKey(); }; const usesCountDown = (session) => Boolean(session && session.mode !== "track" && session.type !== "team_race" && !isPracticeSessionType(session.type)); function setAutopilot(date, on) { @@ -631,7 +631,11 @@ function getRaceDayWarmupCheck(session) { return { prologue, remainingMs: prologue ? getPrologueRemainingMs(prologue) : 0, - ...buildWarmupCheck({ entrants: ordered.map((id) => byId.get(id)).filter(Boolean), drivers: state.drivers, sightings: transponderSightings, since: prologue ? prologue.startedAt : Number.POSITIVE_INFINITY }), + // Sponsor event heats: the car's transponder, not the guest's (they have none). + ...buildWarmupCheck({ entrants: ordered.map((id) => byId.get(id)).filter(Boolean).map((driver) => { + const car = session.carAssignments?.[driver.id] ? state.cars.find((item) => item.id === session.carAssignments[driver.id]) : null; + return car ? { ...driver, name: `${driver.name} (${car.name})`, transponder: car.transponder } : driver; + }), drivers: state.drivers, sightings: transponderSightings, since: prologue ? prologue.startedAt : Number.POSITIVE_INFINITY }), }; } // Quick fix from the warm-up panel: warns (like the Drivers page) if another person @@ -2275,6 +2279,37 @@ const TRANSLATIONS = { "events.step_count": "{done}/{total} körda", "events.assignments": "Tilldelningar", "events.na": "ej relevant", + "sponsor.title": "Sponsor event - enkel setup", + "sponsor.step_drivers": "1. Förare (ett namn per rad)", + "sponsor.guests_placeholder": "Anna\nBosse\nCissi", + "sponsor.guests_hint": "Gästförare finns bara i det här eventet. De syns inte bland klubbens förare, i race eller practice, och tas bort med eventet.", + "sponsor.step_cars": "2. Bilar som är med", + "sponsor.no_cars": "Inga bilar ännu. Lägg till en nedan.", + "sponsor.new_car_name": "Bilnamn, t.ex. Bil 1", + "sponsor.new_car_tp": "Transponder", + "sponsor.add_car": "Lägg till bil", + "sponsor.car_needs_name_tp": "Bilen behöver namn och transponder.", + "sponsor.car_tp_taken": "Transponder {tp} används redan av en annan bil.", + "sponsor.step_format": "3. Format", + "sponsor.format": "Format", + "sponsor.format_race": "Race: practice, kval, finaler", + "sponsor.practice_per_group": "Practice per grupp", + "sponsor.practice_min": "Practice (min)", + "sponsor.qual_rounds": "Kvalomgångar", + "sponsor.qual_min": "Kval (min)", + "sponsor.final_min": "Final (min)", + "sponsor.qual_start": "Start i kval", + "sponsor.groups_hint": "{drivers} förare och {cars} bilar ger {groups} grupper och {finals} finaler (A, B ...). Förarna byter bil varje omgång. I finalerna lottas bilarna.", + "sponsor.create_heats": "Skapa heat", + "sponsor.rebuild_heats": "Skapa om heat", + "sponsor.create_finals": "Skapa finaler från kvalet", + "sponsor.recreate_finals": "Skapa om finaler", + "sponsor.flow_hint": "Kör sedan heaten på Race Day med ▶ Nästa, Start, Paus och Stopp. När kvalet är kört: Skapa finaler.", + "sponsor.started_hint": "Heaten har börjat köras, så förare, bilar och format är låsta. Finalerna kan skapas när kvalet är kört.", + "sponsor.need_drivers": "Skriv in minst en förare.", + "sponsor.need_cars": "Välj minst en bil.", + "sponsor.need_results": "Inga kvalresultat än. Kör kvalet först.", + "sponsor.car_pending": "lottas", "events.sponsor_tools": "Sponsorverktyg", "events.qual_rounds": "Kvalrundor", "events.heat_rounds": "Heat-rundor", @@ -2790,12 +2825,12 @@ const TRANSLATIONS = { "guide.audio_9": "9. Staggered start i ett kvalheat läser upp varje bils transpondernummer i startordning, cirka 3 sekunder mellan varje bil, direkt efter den vanliga starten - mass/position-start läser aldrig upp enskilda bilar.", "guide.audio_10": "10. Bättre röst utan internet: under Inställningar -> Ljud -> Röstmotor, klicka Installera en gång (hämtar Piper och svenska + engelska röster, kräver internet just då) och välj Lokal röst. Välj manlig eller kvinnlig röst per språk under Svensk röst / Engelsk röst och lyssna med Testa rösten. Klicka sedan Förgenerera fraser och förarnamn före racedagen. Allt körs sedan lokalt; saknas Piper eller dröjer den används webbläsarens röst automatiskt.", "guide.sponsor_title": "Skapa Sponsor Event: 10 personer, 4 bilar", - "guide.sponsor_1": "1. Lägg upp 4 bilar i sidan Bilar med unikt transponder-ID. Lägg gärna också in märke/modell i brandfältet.", - "guide.sponsor_2": "2. Lägg upp 10 förare i sidan Förare. Du kan också spara team/märke i brandfältet och filtrera listan på det senare.", - "guide.sponsor_3": "3. Skapa event med läge Sponsor Event.", - "guide.sponsor_4": "4. Klicka Hantera på eventet och skapa rundor (kval/heat/final).", - "guide.sponsor_5": "5. Tilldela 4 förare till 4 bilar i Heat 1, byt förare till Heat 2/3 osv.", - "guide.sponsor_6": "6. På Race Day: välj session och tryck Start, Pausa och Avsluta. Tidtagning visar tiderna.", + "guide.sponsor_1": "1. Skapa eventet under Event (Sponsor Event) och klicka Hantera.", + "guide.sponsor_2": "2. Skriv in förarnas namn, ett per rad. De blir gäster som bara finns i det här eventet och tas bort med det.", + "guide.sponsor_3": "3. Bocka i bilarna som är med, eller lägg till dem med namn och transponder. Samma bil körs av olika förare i olika heat.", + "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.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.", @@ -4268,6 +4303,37 @@ const TRANSLATIONS = { "events.step_count": "{done}/{total} run", "events.assignments": "Assignments", "events.na": "n/a", + "sponsor.title": "Sponsor event - quick setup", + "sponsor.step_drivers": "1. Drivers (one name per line)", + "sponsor.guests_placeholder": "Anna\nBob\nCarla", + "sponsor.guests_hint": "Guest drivers only exist in this event. They are not shown among the club drivers, in races or practice, and are deleted with the event.", + "sponsor.step_cars": "2. Cars taking part", + "sponsor.no_cars": "No cars yet. Add one below.", + "sponsor.new_car_name": "Car name, e.g. Car 1", + "sponsor.new_car_tp": "Transponder", + "sponsor.add_car": "Add car", + "sponsor.car_needs_name_tp": "The car needs a name and a transponder.", + "sponsor.car_tp_taken": "Transponder {tp} is already used by another car.", + "sponsor.step_format": "3. Format", + "sponsor.format": "Format", + "sponsor.format_race": "Race: practice, qualifying, finals", + "sponsor.practice_per_group": "Practice per group", + "sponsor.practice_min": "Practice (min)", + "sponsor.qual_rounds": "Qualifying rounds", + "sponsor.qual_min": "Qualifying (min)", + "sponsor.final_min": "Final (min)", + "sponsor.qual_start": "Qualifying start", + "sponsor.groups_hint": "{drivers} drivers and {cars} cars make {groups} groups and {finals} finals (A, B ...). Drivers swap cars every round. Cars are drawn for the finals.", + "sponsor.create_heats": "Create heats", + "sponsor.rebuild_heats": "Recreate heats", + "sponsor.create_finals": "Create finals from qualifying", + "sponsor.recreate_finals": "Recreate finals", + "sponsor.flow_hint": "Then run the heats on Race Day with ▶ Next, Start, Pause and Stop. When qualifying is done: Create finals.", + "sponsor.started_hint": "Heats have started, so drivers, cars and format are locked. Finals can be created once qualifying is done.", + "sponsor.need_drivers": "Enter at least one driver.", + "sponsor.need_cars": "Choose at least one car.", + "sponsor.need_results": "No qualifying results yet. Run qualifying first.", + "sponsor.car_pending": "drawn", "events.sponsor_tools": "Sponsor Event Tools", "events.qual_rounds": "Qualification rounds", "events.heat_rounds": "Heat rounds", @@ -4783,12 +4849,12 @@ const TRANSLATIONS = { "guide.audio_9": "9. A staggered start in a qualifying heat calls out each car's transponder number in grid order, about 3 seconds apart, right after the official start - a mass/position start never calls out individual cars.", "guide.audio_10": "10. Better voice without internet: under Settings -> Audio -> Voice engine, click Install once (downloads Piper plus Swedish and English voices, needs internet just then) and choose Local voice. Pick a male or female voice per language under Swedish voice / English voice and listen with Test the voice. Then click Pre-generate phrases and driver names before race day. Everything then runs locally; if Piper is missing or slow the browser voice is used automatically.", "guide.sponsor_title": "Create Sponsor Event: 10 drivers, 4 cars", - "guide.sponsor_1": "1. Add 4 cars in Cars with unique transponder IDs. You can also store brand/model in the brand field.", - "guide.sponsor_2": "2. Add 10 drivers in Drivers. You can also store team/brand in the brand field and filter by it later.", - "guide.sponsor_3": "3. Create event in Track Event mode.", - "guide.sponsor_4": "4. Click Manage and create rounds (qualification/heat/final).", - "guide.sponsor_5": "5. Assign 4 drivers to 4 cars in Heat 1, rotate drivers for Heat 2/3, then finals.", - "guide.sponsor_6": "6. On Race Day: pick the session and press Start, Pause and Finish. Timing shows the times.", + "guide.sponsor_1": "1. Create the event under Events (Sponsor Event) and click Manage.", + "guide.sponsor_2": "2. Enter the drivers' names, one per line. They become guests that only exist in this event and are deleted with it.", + "guide.sponsor_3": "3. Tick the cars taking part, or add them with name and transponder. The same car is driven by different drivers in different heats.", + "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.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.", @@ -5161,6 +5227,8 @@ function normalizeDriver(driver = {}) { club: String(driver?.club || "").trim(), country: String(driver?.country || "").trim(), passSound: String(driver?.passSound || "").trim(), + // Sponsor event guest: only shown inside that event, deleted with it. + ...(driver?.guestEventId ? { guestEventId: String(driver.guestEventId) } : {}), }; } @@ -6009,7 +6077,7 @@ function buildDirectoryExportPayload() { function buildDriversCsvRows() { return [ ["id", "name", "class", "brand", "transponder", "spoken_name", "club", "country", "profile_id"], - ...state.drivers.map((driver) => [driver.id, driver.name, getClassName(driver.classId), driver.brand || "", driver.transponder || "", driver.speechName || "", driver.club || "", driver.country || "", driver.profileId || ""]), + ...state.drivers.filter((driver) => !driver.guestEventId).map((driver) => [driver.id, driver.name, getClassName(driver.classId), driver.brand || "", driver.transponder || "", driver.speechName || "", driver.club || "", driver.country || "", driver.profileId || ""]), ]; } diff --git a/src/core_views.js b/src/core_views.js index 1de4adb..98d121f 100644 --- a/src/core_views.js +++ b/src/core_views.js @@ -121,7 +121,7 @@ export function renderDashboardView(deps) {
${statCard(t("dashboard.events"), String(state.events.length), t("dashboard.created"))} - ${statCard(t("dashboard.drivers"), String(state.drivers.length), t("dashboard.registered"))} + ${statCard(t("dashboard.drivers"), String(state.drivers.filter((driver) => !driver.guestEventId).length), t("dashboard.registered"))} ${statCard(t("dashboard.cars"), String(state.cars.length), t("dashboard.track_fleet"))} ${statCard(t("dashboard.passings"), String(totalPassings), t("dashboard.captured"))}
@@ -392,9 +392,9 @@ export function renderDriversView(deps) { } = deps; const classOptions = state.classes.map((c) => ``).join(""); const driverSearch = driverBrandFilter().trim().toLowerCase(); - const filteredDrivers = state.drivers.filter((driver) => + const filteredDrivers = state.drivers.filter((driver) => !driver.guestEventId && ( !driverSearch || [driver.name, driver.speechName, driver.transponder, driver.brand, driver.club, driver.country].map((value) => String(value || "").toLowerCase()).some((value) => value.includes(driverSearch)) - ); + )); const editingDriver = state.drivers.find((driver) => driver.id === selectedDriverEditId()) || null; const profileGroups = getDriverProfileGroups(state); const profileOptions = profileGroups diff --git a/src/day_schedule_logic.js b/src/day_schedule_logic.js index a7160b8..78d3940 100644 --- a/src/day_schedule_logic.js +++ b/src/day_schedule_logic.js @@ -54,7 +54,7 @@ const compareKeys = (a, b) => a.reduce((diff, value, i) => diff || value - b[i], // The race events of a date (one per class) and their race sessions, in the day's running order. export function orderDaySessions({ events = [], sessions = [], date, manualOrder = [] }) { - const dayEvents = events.filter((event) => event.mode === "race" && event.date === date) + const dayEvents = events.filter((event) => (event.mode === "race" || Boolean(event.sponsor)) && event.date === date) .sort((a, b) => String(a.name || "").localeCompare(String(b.name || ""), undefined, { numeric: true })); const items = dayEvents.flatMap((event, eventIndex) => { const own = orderSessionsForRunning(sessions.filter((session) => session.eventId === event.id && session.mode === "race"), event.sessionOrder); @@ -136,10 +136,10 @@ export function getAutopilotAction(rows, { day, now = Date.now(), busy = false, // The date the drivers' board shows: today if anything is raced today, else the next date with // a session still to run, else today. export function pickBoardDate({ events = [], sessions = [], today }) { - const raceDates = new Set(events.filter((event) => event.mode === "race" && event.date).map((event) => event.date)); + const raceDates = new Set(events.filter((event) => (event.mode === "race" || Boolean(event.sponsor)) && event.date).map((event) => event.date)); if (raceDates.has(today)) return today; const pending = events - .filter((event) => event.mode === "race" && event.date >= today && sessions.some((session) => session.eventId === event.id && !isDone(session))) + .filter((event) => (event.mode === "race" || Boolean(event.sponsor)) && event.date >= today && sessions.some((session) => session.eventId === event.id && !isDone(session))) .map((event) => event.date) .sort(); return pending[0] || today; diff --git a/src/decoder_runtime.js b/src/decoder_runtime.js index a96d65c..5da1681 100644 --- a/src/decoder_runtime.js +++ b/src/decoder_runtime.js @@ -4,6 +4,7 @@ import { usesPersonalClock, getLatestClockStartTs } from "./prologue_logic.js"; import { isSuspectLap, getSuspectReferenceLaps, releaseSettledSuspectLaps } from "./suspect_laps_logic.js"; import { shouldCallPracticePersonalBest } from "./practice_callouts_logic.js"; import { normalizeRaceAudioSettings, formatSpokenLapTime, formatShortLapCall, LEADER_UPDATE_INTERVAL_MS } from "./race_audio.js"; +import { findDriverByCarTransponder } from "./sponsor_event_logic.js"; import { pickPracticeHype, getDriverLapTimes, getClassRank, getLastTimeBestMs, findDuelRival } from "./practice_hype_logic.js"; import { decoderClockCheck, describeDecoderClockSkew } from "./decoder_clock_check.js"; import { getCompetitorEndTs } from "./timing_logic.js"; @@ -151,6 +152,23 @@ function resolveCompetitor(session, transponder, deps) { }; } + // Sponsor event heats: shared club cars, the car's transponder counts for whoever drives it + // in this heat (session.carAssignments). + const carDriver = findDriverByCarTransponder(session, state.cars, transponder); + if (carDriver) { + const guest = state.drivers.find((d) => d.id === carDriver.driverId); + return { + key: `driver_${carDriver.driverId}`, + driverId: carDriver.driverId, + driverName: guest?.name || t("common.unknown_driver"), + speechName: guest?.speechName || guest?.name || "", + displayName: guest?.name || t("common.unknown_driver"), + subLabel: carDriver.car.name || transponder, + carId: carDriver.car.id, + carName: carDriver.car.name || t("common.unknown_car"), + }; + } + const driver = state.drivers.find((d) => d.transponder === transponder); if (driver) { if (!isOpenMonitoringSession && Array.isArray(session.driverIds) && session.driverIds.length && !session.driverIds.includes(driver.id)) { diff --git a/src/driver_profile_logic.js b/src/driver_profile_logic.js index 7184cd5..f25caa6 100644 --- a/src/driver_profile_logic.js +++ b/src/driver_profile_logic.js @@ -11,7 +11,7 @@ export function getDriverProfileId(driver) { export function getDriverProfileGroups(state) { const groups = new Map(); - (Array.isArray(state?.drivers) ? state.drivers : []).forEach((driver) => { + (Array.isArray(state?.drivers) ? state.drivers : []).filter((driver) => !driver.guestEventId).forEach((driver) => { const profileId = getDriverProfileId(driver); const group = groups.get(profileId) || { id: profileId, drivers: [] }; group.drivers.push(driver); diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js index 7cbb3c4..fcb41ea 100644 --- a/src/event_manager_controller.js +++ b/src/event_manager_controller.js @@ -1,3 +1,4 @@ +import { mountSponsorSetup } from "./sponsor_event_view.js"; import { orderSessionsForRunning, moveSessionInRunningOrder, applyFormatToPendingSessions, syncParticipantsToSessions } from "./event_race_logic.js"; import { setSessionGroupOpen } from "./event_manager_view.js"; let activeManageTab = "setup"; @@ -126,7 +127,8 @@ export function renderEventManagerView(context) { return; } - const driverOptions = state.drivers + const clubDrivers = state.drivers.filter((driver) => !driver.guestEventId || driver.guestEventId === event.id); + const driverOptions = clubDrivers .map((d) => ``) .join(""); const raceDrivers = event.mode === "race" ? getEventDrivers(event) : []; @@ -134,10 +136,10 @@ export function renderEventManagerView(context) { // the chosen ones from other classes, and the rest of the club folded away. const chosenIds = event.raceConfig?.participantsConfigured ? (event.raceConfig.driverIds || []) : null; const participantChoices = event.mode === "race" - ? state.drivers.filter((driver) => !event.classId || driver.classId === event.classId || (chosenIds || []).includes(driver.id)) + ? clubDrivers.filter((driver) => (!event.classId && !driver.guestEventId) || (event.classId && driver.classId === event.classId) || (chosenIds || []).includes(driver.id)) : []; const otherClassChoices = event.mode === "race" && event.classId - ? state.drivers.filter((driver) => !participantChoices.includes(driver)).sort((a, b) => String(a.name || "").localeCompare(String(b.name || ""))) + ? clubDrivers.filter((driver) => !driver.guestEventId && !participantChoices.includes(driver)).sort((a, b) => String(a.name || "").localeCompare(String(b.name || ""))) : []; const teamDriverPool = event.mode === "race" ? getTeamDriverPool(event) : { drivers: [], fallback: false }; const raceTeams = event.mode === "race" ? getEventTeams(event) : []; @@ -485,6 +487,10 @@ export function renderEventManagerView(context) { }); if (event.mode === "track") { + mountSponsorSetup(document.getElementById("sponsorSetup"), { + event, state, t, escapeHtml, uid, normalizeSession, saveState, refresh: refreshManager, getSessionsForEvent, getStatusLabel, + generateFinalsForRace, buildQualifyingStandings, buildPracticeStandings, + }); document.getElementById("sponsorRoundsForm")?.addEventListener("submit", (e) => { e.preventDefault(); const form = new FormData(e.currentTarget); diff --git a/src/event_manager_view.js b/src/event_manager_view.js index fedb1f2..ca3ddf0 100644 --- a/src/event_manager_view.js +++ b/src/event_manager_view.js @@ -198,7 +198,7 @@ export function renderEventManagerMarkup(context) { [t("table.session"), t("table.type"), t("table.duration"), t("table.start_mode"), t("table.seeding"), t("table.status"), t(event.mode === "track" ? "events.assignments" : "events.participants"), t("events.actions")], group.items.map(({ session: s, index: sessionIndex }) => { const assignCount = - event.mode === "track" + s.mode === "track" ? (s.assignments || []).length : s.type === "team_race" ? raceTeams.length @@ -211,7 +211,7 @@ export function renderEventManagerMarkup(context) { ${escapeHtml(getStartModeLabel(s.startMode))} ${s.seedBestLapCount > 0 ? `${s.seedBestLapCount}` : "-"} ${escapeHtml(getStatusLabel(s.status))} - ${assignCount || (event.mode === "track" ? t("events.na") : "-")} + ${assignCount || (s.mode === "track" ? t("events.na") : "-")} @@ -275,22 +275,10 @@ export function renderEventManagerMarkup(context) { ${ event.mode === "track" ? ` -
-

${t("events.sponsor_tools")}

-
-
- - - - - -
-

- ${t("events.tp_rule")} -

-
-
+
+ + ${sessions.some((item) => item.mode === "track") ? `

${t("events.assign_title")}

@@ -308,7 +296,7 @@ export function renderEventManagerMarkup(context) {
-
+ ` : ""} ` : "" } diff --git a/src/event_race_logic.js b/src/event_race_logic.js index 7015cf0..fd5da69 100644 --- a/src/event_race_logic.js +++ b/src/event_race_logic.js @@ -434,7 +434,7 @@ export function ensureRaceParticipantsConfigured(event, { state }) { if (event.raceConfig?.participantsConfigured) { return; } - const classDrivers = state.drivers.filter((driver) => !event.classId || driver.classId === event.classId); + const classDrivers = state.drivers.filter((driver) => !driver.guestEventId && (!event.classId || driver.classId === event.classId)); event.raceConfig.driverIds = classDrivers.map((driver) => driver.id); event.raceConfig.participantsConfigured = true; } @@ -575,7 +575,7 @@ export function getRaceWizardSessionPlan(draft, { t }) { export function getEventDrivers(event, { state }) { - const classDrivers = state.drivers.filter((driver) => !event?.classId || driver.classId === event.classId); + const classDrivers = state.drivers.filter((driver) => !driver.guestEventId && (!event?.classId || driver.classId === event.classId)); if (!event?.raceConfig?.participantsConfigured) { return classDrivers; } @@ -637,7 +637,7 @@ export function getTeamDriverPool(event, { getEventDrivers, state }) { // No driver matched the event's class or configured participant list (e.g. a team is // being set up before drivers/participants exist yet) - fall back to every driver in // the club rather than leaving the admin with zero checkboxes and no way to proceed. - const allDrivers = Array.isArray(state?.drivers) ? [...state.drivers] : []; + const allDrivers = Array.isArray(state?.drivers) ? state.drivers.filter((driver) => !driver.guestEventId) : []; return { drivers: allDrivers, fallback: allDrivers.length > 0 }; } diff --git a/src/event_workspace_controller.js b/src/event_workspace_controller.js index b4653f6..c603955 100644 --- a/src/event_workspace_controller.js +++ b/src/event_workspace_controller.js @@ -283,6 +283,8 @@ export function renderEventWorkspaceView(context) { date: String(form.get("date")), classId: String(form.get("classId")), mode, + // Events tab = sponsor events (guests in the club's shared cars, sponsor_event_logic.js). + ...(mode === "track" ? { sponsor: { type: "race", carIds: [], format: null } } : {}), }; state.events.push(normalizeEvent(event)); saveState(); @@ -303,6 +305,7 @@ export function renderEventWorkspaceView(context) { if (!window.confirm(t("events.delete_race_confirm", { name: e.name, sessions: sessionIds.length, run }))) return; state.events = state.events.filter((x) => x.id !== e.id); state.sessions = state.sessions.filter((x) => x.eventId !== e.id); + state.drivers = state.drivers.filter((x) => x.guestEventId !== e.id); sessionIds.forEach((id) => delete state.resultsBySession[id]); if (state.activeSessionId && sessionIds.includes(state.activeSessionId)) { state.activeSessionId = null; diff --git a/src/race_day_logic.js b/src/race_day_logic.js index d2d74bc..26cc3f6 100644 --- a/src/race_day_logic.js +++ b/src/race_day_logic.js @@ -23,7 +23,7 @@ export function getRaceDriverIds(state, session, event = getEvent(state, session return unique(event.raceConfig.driverIds || []); } return state.drivers - .filter((driver) => !event?.classId || driver.classId === event.classId) + .filter((driver) => !driver.guestEventId && (!event?.classId || driver.classId === event.classId)) .map((driver) => driver.id); } @@ -127,9 +127,14 @@ export function buildRaceDayPreflight(state, session, { backendAvailable = false } else { entrantIds = getRaceDriverIds(state, session, event); checks.push(check("participants", entrantIds.length ? "ok" : "error", { count: entrantIds.length })); - const drivers = entrantIds.map((id) => state.drivers.find((driver) => driver.id === id)).filter(Boolean); - const missingCount = entrantIds.length - drivers.filter((driver) => String(driver.transponder || "").trim()).length; - transponders = drivers.map((driver) => String(driver.transponder || "").trim()).filter(Boolean); + // Sponsor event heats: the transponder is on the car the driver has in this heat. + const transponderOf = (id) => { + const carId = session.carAssignments?.[id]; + if (carId) return String(state.cars.find((car) => car.id === carId)?.transponder || "").trim(); + return String(state.drivers.find((driver) => driver.id === id)?.transponder || "").trim(); + }; + const missingCount = entrantIds.filter((id) => !transponderOf(id)).length; + transponders = entrantIds.map(transponderOf).filter(Boolean); checks.push(check("transponders", missingCount ? "error" : "ok", { count: transponders.length, missingCount })); } diff --git a/src/sponsor_event_logic.js b/src/sponsor_event_logic.js new file mode 100644 index 0000000..325b6f3 --- /dev/null +++ b/src/sponsor_event_logic.js @@ -0,0 +1,132 @@ +// Sponsor events (rental-kart style): guests drive the club's cars, several drivers share one +// car (and its transponder) across the day. The event stays a "track" event (its own tab), but +// its heats are ordinary race sessions plus carAssignments { driverId: carId }, so Race Day, +// qualifying standings, A/B finals and Start / Pause / Stop work as in a race. +// Guests are drivers with guestEventId: they are only shown inside their event. +import { splitIntoBalancedGroups } from "./event_race_logic.js"; + +export const isGuestDriver = (driver) => Boolean(driver?.guestEventId); +export const isSponsorEvent = (event) => event?.mode === "track" && Boolean(event?.sponsor); + +// One name per line (or comma separated), duplicates and blanks dropped. +export function parseGuestNames(text) { + const seen = new Set(); + return String(text || "").split(/[\n,;]+/).map((name) => name.trim().replace(/\s+/g, " ")).filter((name) => { + const key = name.toLowerCase(); + if (!name || seen.has(key)) return false; + seen.add(key); + return true; + }); +} + +// 8 drivers, 4 cars -> 2 groups, 1 practice per group, 2 qualifying rounds, A and B finals. +export function defaultSponsorFormat(driverCount = 0, carCount = 0) { + const cars = Math.max(1, carCount); + return { + groups: Math.max(1, Math.ceil(Math.max(1, driverCount) / cars)), + practicePerGroup: 1, qualRounds: 2, + practiceMin: 3, qualMin: 4, finalMin: 5, + }; +} + +export function normalizeSponsorFormat(value = {}, driverCount = 0, carCount = 0) { + const base = defaultSponsorFormat(driverCount, carCount); + const int = (raw, fallback, min, max) => { + const number = Math.round(Number(raw)); + return Number.isFinite(number) ? Math.max(min, Math.min(max, number)) : fallback; + }; + return { + practicePerGroup: int(value.practicePerGroup, base.practicePerGroup, 0, 5), + qualRounds: int(value.qualRounds, base.qualRounds, 0, 6), + practiceMin: int(value.practiceMin, base.practiceMin, 1, 60), + qualMin: int(value.qualMin, base.qualMin, 1, 60), + finalMin: int(value.finalMin, base.finalMin, 1, 120), + groups: base.groups, + }; +} + +// Groups no bigger than the number of cars, as even as possible (9 drivers, 4 cars -> 3/3/3). +export function splitSponsorGroups(driverIds, carCount) { + return splitIntoBalancedGroups(driverIds, Math.max(1, carCount)); +} + +// Round r: driver i of the group gets car (i + r) mod cars, so everyone tries other cars. +export function rotateCars(driverIds, carIds, round) { + const map = {}; + if (!carIds.length) return map; + driverIds.forEach((driverId, index) => { map[driverId] = carIds[(index + round) % carIds.length]; }); + return map; +} + +// Finals: cars drawn by lot. +export function drawCars(driverIds, carIds, random = Math.random) { + const pool = [...carIds]; + for (let index = pool.length - 1; index > 0; index -= 1) { + const other = Math.floor(random() * (index + 1)); + [pool[index], pool[other]] = [pool[other], pool[index]]; + } + const map = {}; + driverIds.forEach((driverId, index) => { if (pool[index]) map[driverId] = pool[index]; }); + return map; +} + +// The practice and qualifying heats as plain specs; the caller turns them into sessions. +// Names follow the race ones (Q1 H1 ...) so qualifying standings and Race Day order work. +export function planSponsorHeats(driverIds, carIds, format, { practiceLabel = "Practice" } = {}) { + const groups = splitSponsorGroups(driverIds, carIds.length); + const heats = []; + let round = 0; + for (let practice = 1; practice <= format.practicePerGroup; practice += 1, round += 1) { + groups.forEach((group, index) => heats.push({ + name: `${practiceLabel} ${format.practicePerGroup > 1 ? `${practice} ` : ""}G${index + 1}`.trim(), + type: "practice", durationMin: format.practiceMin, driverIds: group, carAssignments: rotateCars(group, carIds, round), + })); + } + for (let qual = 1; qual <= format.qualRounds; qual += 1, round += 1) { + groups.forEach((group, index) => heats.push({ + name: `Q${qual} H${index + 1}`, type: "qualification", durationMin: format.qualMin, driverIds: group, carAssignments: rotateCars(group, carIds, round), + })); + } + return heats; +} + +// The race config the shared race code reads (heat and final size = number of cars). +export function sponsorRaceConfig(raceConfig, { driverIds, carIds, format }) { + return { + ...raceConfig, + driverIds: [...driverIds], + participantsConfigured: true, + carsPerHeat: Math.max(2, carIds.length), + carsPerFinal: Math.max(2, carIds.length), + qualifyingRounds: Math.max(1, format.qualRounds), + qualDurationMin: format.qualMin, + finalDurationMin: format.finalMin, + qualifyingScoring: "best", + finalsSource: format.qualRounds > 0 ? "qualifying" : "practice", + finalLegs: 1, + bumpCount: 0, + reserveBumpSlots: false, + }; +} + +// Gives every session of the event without cars a draw (used after the finals are made). +export function drawCarsForSessions(sessions, carIds, random = Math.random) { + let count = 0; + sessions.forEach((session) => { + if (session.status !== "ready" || !Array.isArray(session.driverIds) || !session.driverIds.length) return; + if (session.carAssignments && Object.keys(session.carAssignments).length) return; + session.carAssignments = drawCars(session.driverIds, carIds, random); + count += 1; + }); + return count; +} + +// The driver a transponder belongs to in this heat: the one who drives the car with it. +export function findDriverByCarTransponder(session, cars, transponder) { + const assignments = session?.carAssignments; + if (!assignments || typeof assignments !== "object") return null; + const car = (cars || []).find((item) => String(item.transponder || "") === String(transponder || "") && Object.values(assignments).includes(item.id)); + if (!car) return null; + const driverId = Object.keys(assignments).find((id) => assignments[id] === car.id); + return driverId ? { driverId, car } : null; +} diff --git a/src/sponsor_event_view.js b/src/sponsor_event_view.js new file mode 100644 index 0000000..20a34ef --- /dev/null +++ b/src/sponsor_event_view.js @@ -0,0 +1,141 @@ +// Sponsor event setup (Events → Manage): 1 guests, 2 cars, 3 format → heats; then the finals. +// Logic in sponsor_event_logic.js; this file only renders and binds. +import { parseGuestNames, normalizeSponsorFormat, planSponsorHeats, sponsorRaceConfig, drawCarsForSessions } from "./sponsor_event_logic.js"; + +export function mountSponsorSetup(root, deps) { + if (!root) return; + const { event, state, t, escapeHtml, uid, normalizeSession, saveState, refresh, getSessionsForEvent, getStatusLabel, generateFinalsForRace, buildQualifyingStandings, buildPracticeStandings } = deps; + const guests = state.drivers.filter((driver) => driver.guestEventId === event.id); + const sponsor = event.sponsor || {}; + const carIds = Array.isArray(sponsor.carIds) ? sponsor.carIds : []; + const format = normalizeSponsorFormat(sponsor.format || {}, guests.length, carIds.length); + const sessions = getSessionsForEvent(event.id).filter((session) => session.mode === "race"); + const started = sessions.some((session) => session.status !== "ready"); + const hasQual = sessions.some((session) => ["qualification", "practice"].includes(session.type) && session.status === "finished"); + const finals = sessions.filter((session) => session.type === "final"); + const carName = (id) => state.cars.find((car) => car.id === id)?.name || "?"; + const driverName = (id) => state.drivers.find((driver) => driver.id === id)?.name || "?"; + const num = (name, value, min, max) => ``; + + root.innerHTML = ` +
+

${t("sponsor.title")}

+
+
+
+ +
${t("sponsor.step_cars")} + +
+ + + +
+
+
${t("sponsor.step_format")} +
+ + + + + + + +
+

+
+
+
+ + +
+

${started ? t("sponsor.started_hint") : t("sponsor.flow_hint")}

+ +
+ ${sessions.length ? `` : ""} +
+
`; + + const form = root.querySelector("#sponsorSetupForm"); + const error = root.querySelector("#sponsorError"); + const hint = root.querySelector("#sponsorGroupsHint"); + const updateHint = () => { + const names = parseGuestNames(form.elements.guests.value); + const cars = form.querySelectorAll('input[name="car"]:checked').length; + const groups = cars ? Math.ceil(names.length / cars) : 0; + hint.textContent = t("sponsor.groups_hint", { drivers: names.length, cars, groups, finals: groups }); + }; + form.addEventListener("input", updateHint); + updateHint(); + + root.querySelector("#sponsorAddCar")?.addEventListener("click", () => { + const name = String(form.elements.newCarName.value || "").trim(); + const transponder = String(form.elements.newCarTp.value || "").trim(); + if (!name || !transponder) { error.textContent = t("sponsor.car_needs_name_tp"); return; } + if (state.cars.some((car) => String(car.transponder) === transponder)) { error.textContent = t("sponsor.car_tp_taken", { tp: transponder }); return; } + const car = { id: uid("car"), name, transponder, brand: "", passSound: "" }; + state.cars.push(car); + event.sponsor = { ...sponsor, carIds: [...new Set([...carIds, ...[...form.querySelectorAll('input[name="car"]:checked')].map((node) => node.value), car.id])] }; + saveState(); + refresh(); + }); + + form.addEventListener("submit", (submitEvent) => { + submitEvent.preventDefault(); + error.textContent = ""; + if (started) return; + const names = parseGuestNames(form.elements.guests.value); + const chosenCars = [...form.querySelectorAll('input[name="car"]:checked')].map((node) => node.value); + if (names.length < 1) { error.textContent = t("sponsor.need_drivers"); return; } + if (!chosenCars.length) { error.textContent = t("sponsor.need_cars"); return; } + // Guests keep their id when the name stays (a fixed typo is a new guest); the rest go. + const byName = new Map(guests.map((driver) => [driver.name.toLowerCase(), driver])); + const keptIds = new Set(); + const driverIds = names.map((name) => { + const existing = byName.get(name.toLowerCase()); + if (existing) { keptIds.add(existing.id); return existing.id; } + const driver = { id: uid("driver"), name, classId: "", transponder: "", brand: "", speechName: "", profileId: "", club: "", country: "", passSound: "", guestEventId: event.id }; + state.drivers.push(driver); + return driver.id; + }); + state.drivers = state.drivers.filter((driver) => driver.guestEventId !== event.id || keptIds.has(driver.id) || driverIds.includes(driver.id)); + const chosenFormat = normalizeSponsorFormat({ + practicePerGroup: form.elements.practicePerGroup.value, qualRounds: form.elements.qualRounds.value, + practiceMin: form.elements.practiceMin.value, qualMin: form.elements.qualMin.value, finalMin: form.elements.finalMin.value, + }, driverIds.length, chosenCars.length); + event.sponsor = { type: "race", carIds: chosenCars, format: chosenFormat }; + event.raceConfig = { ...sponsorRaceConfig(event.raceConfig || {}, { driverIds, carIds: chosenCars, format: chosenFormat }), qualStartMode: String(form.elements.qualStartMode.value || "staggered") }; + const oldIds = new Set(sessions.map((session) => session.id)); + state.sessions = state.sessions.filter((session) => !oldIds.has(session.id)); + oldIds.forEach((id) => delete state.resultsBySession[id]); + planSponsorHeats(driverIds, chosenCars, chosenFormat, { practiceLabel: t("session.practice").replace(/^./, (letter) => letter.toUpperCase()) }).forEach((heat) => { + state.sessions.push(normalizeSession({ + id: uid("session"), eventId: event.id, name: heat.name, type: heat.type, durationMin: heat.durationMin, + // Same start as a race: practice mass start, qualifying as set in the race format. + maxCars: chosenCars.length, mode: "race", status: "ready", startMode: heat.type === "qualification" ? (event.raceConfig.qualStartMode || "staggered") : "mass", + followUpSec: event.raceConfig.followUpSec || 0, driverIds: heat.driverIds, manualGridIds: [...heat.driverIds], + carAssignments: heat.carAssignments, generated: true, assignments: [], + })); + }); + saveState(); + refresh(); + }); + + root.querySelector("#sponsorCreateFinals")?.addEventListener("click", () => { + error.textContent = ""; + const rows = event.raceConfig?.finalsSource === "practice" ? buildPracticeStandings(event) : buildQualifyingStandings(event); + if (!rows.length) { error.textContent = t("sponsor.need_results"); return; } + if (!generateFinalsForRace(event)) { error.textContent = t("sponsor.need_results"); return; } + drawCarsForSessions(getSessionsForEvent(event.id).filter((session) => session.type === "final"), carIds); + saveState(); + refresh(); + }); +} diff --git a/src/timing_logic.js b/src/timing_logic.js index 02c46bf..ce13cfa 100644 --- a/src/timing_logic.js +++ b/src/timing_logic.js @@ -930,10 +930,11 @@ export function getSessionGridEntries(session, { state, t, getEventTeams, getDri return getSessionGridOrder(session).map((driverId, index) => { const driver = state.drivers.find((item) => item.id === driverId); + const car = session.carAssignments?.[driverId] ? state.cars.find((item) => item.id === session.carAssignments[driverId]) : null; return { slot: index + 1, name: driver?.name || t("common.unknown_driver"), - meta: driver?.transponder || "-", + meta: car ? `${car.name} (${car.transponder || "-"})` : driver?.transponder || "-", }; }); } diff --git a/tests/browser_race_setup.js b/tests/browser_race_setup.js index 0f711ed..ed3c85b 100644 --- a/tests/browser_race_setup.js +++ b/tests/browser_race_setup.js @@ -27,6 +27,35 @@ export async function runRaceSetupSmoke({ evaluate, navigate, fill, savedState, await waitFor(async () => (await savedState()).sessions.some(session => session.name === "Sponsor Heat" && session.eventId === sponsor.id), "sponsor session"); console.log("PASS sponsor-event create/edit/reload and session creation"); + // Quick setup: two rental cars, three guests -> 2 groups, practice + 2 qualifying rounds, + // drivers swap cars; guests stay out of the club driver list. + for (const [name, tp] of [["Hyrbil 1", "990001"], ["Hyrbil 2", "990002"]]) { + await waitFor(async () => Boolean(await evaluate('Boolean(document.getElementById("sponsorAddCar"))')), "sponsor setup panel"); + await fill("sponsorSetupForm", { newCarName: name, newCarTp: tp }); + await click("sponsorAddCar"); + await waitFor(async () => (await savedState()).cars.some((car) => car.transponder === tp), "rental car " + name); + } + await waitFor(async () => Boolean(await evaluate('document.querySelectorAll("#sponsorSetupForm input[name=car]:checked").length === 2')), "both cars ticked"); + await evaluate('document.querySelector("#sponsorSetupForm textarea[name=guests]").value = \"Gäst Anna\\nGäst Bosse\\nGäst Cissi\"'); + await submit("sponsorSetupForm"); + await waitFor(async () => (await savedState()).sessions.filter((session) => session.eventId === sponsor.id && session.carAssignments).length === 6, "sponsor heats"); + { + const saved = await savedState(); + const guests = saved.drivers.filter((driver) => driver.guestEventId === sponsor.id); + assert.equal(guests.length, 3); + const heats = saved.sessions.filter((session) => session.eventId === sponsor.id && session.carAssignments); + assert.deepEqual(heats.map((session) => session.name).slice(2), ["Q1 H1", "Q1 H2", "Q2 H1", "Q2 H2"]); + assert.ok(heats[0].name.endsWith(" G1") && heats[1].name.endsWith(" G2") && heats[0].type === "practice", "one practice per group"); + const q1 = heats.find((session) => session.name === "Q1 H1"); + const q2 = heats.find((session) => session.name === "Q2 H1"); + assert.notEqual(q1.carAssignments[q1.driverIds[0]], q2.carAssignments[q2.driverIds[0]], "drivers swap cars between rounds"); + await navigate("drivers", "driverForm"); + assert.equal(await evaluate('document.getElementById("view").textContent.includes("Gäst Anna")'), false, "guests not in the driver list"); + await navigate("events", "eventForm"); + await click("event-manage-" + sponsor.id); + } + console.log("PASS sponsor quick setup: guests, rental cars, rotating heats"); + await navigate("race_setup", "raceWizardStepForm"); await fill("raceWizardStepForm", { name: "Browser Endurance", date: "2026-09-08", classId: "test_class", presetId: "endurance" }); await click("raceWizardNext"); diff --git a/tests/run.js b/tests/run.js index 838c96b..6a3d463 100644 --- a/tests/run.js +++ b/tests/run.js @@ -1,4 +1,5 @@ import "./auth.test.js"; +import "./sponsor_event.test.js"; import "./practice_hype.test.js"; import "./race_day_fixes.test.js"; import "./race_list.test.js"; diff --git a/tests/sponsor_event.test.js b/tests/sponsor_event.test.js new file mode 100644 index 0000000..6176d74 --- /dev/null +++ b/tests/sponsor_event.test.js @@ -0,0 +1,49 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { parseGuestNames, defaultSponsorFormat, planSponsorHeats, rotateCars, drawCars, findDriverByCarTransponder, sponsorRaceConfig, normalizeSponsorFormat } from "../src/sponsor_event_logic.js"; + +test("guest names: one per line or comma separated, duplicates dropped", () => { + assert.deepEqual(parseGuestNames(" Anna \nBosse, anna\n\nCissi; Dan Ek "), ["Anna", "Bosse", "Cissi", "Dan Ek"]); +}); + +test("8 drivers and 4 cars: 2 groups, 1 practice each, 2 qualifying rounds", () => { + const drivers = ["d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8"]; + const cars = ["c1", "c2", "c3", "c4"]; + const format = defaultSponsorFormat(drivers.length, cars.length); + assert.equal(format.groups, 2); + const heats = planSponsorHeats(drivers, cars, format, { practiceLabel: "Träning" }); + assert.deepEqual(heats.map((heat) => heat.name), ["Träning G1", "Träning G2", "Q1 H1", "Q1 H2", "Q2 H1", "Q2 H2"]); + assert.deepEqual(heats[0].driverIds, ["d1", "d2", "d3", "d4"]); + heats.forEach((heat) => assert.equal(new Set(Object.values(heat.carAssignments)).size, heat.driverIds.length, "one car per driver")); + assert.notEqual(heats[0].carAssignments.d1, heats[2].carAssignments.d1, "a new car each round"); + assert.equal(heats[2].durationMin, 4); +}); + +test("9 drivers and 4 cars make even groups of 3", () => { + const heats = planSponsorHeats(["a", "b", "c", "d", "e", "f", "g", "h", "i"], ["1", "2", "3", "4"], normalizeSponsorFormat({}, 9, 4)); + assert.deepEqual(heats.filter((heat) => heat.type === "practice").map((heat) => heat.driverIds.length), [3, 3, 3]); +}); + +test("car rotation and draw", () => { + assert.deepEqual(rotateCars(["a", "b", "c"], ["1", "2", "3"], 1), { a: "2", b: "3", c: "1" }); + const drawn = drawCars(["a", "b"], ["1", "2", "3"], () => 0); + assert.equal(new Set(Object.values(drawn)).size, 2); +}); + +test("a shared car's transponder counts for the driver who has it in this heat", () => { + const cars = [{ id: "c1", name: "Bil 1", transponder: "111" }, { id: "c2", name: "Bil 2", transponder: "222" }]; + const heatA = { carAssignments: { anna: "c1", bosse: "c2" } }; + const heatB = { carAssignments: { anna: "c2", bosse: "c1" } }; + assert.equal(findDriverByCarTransponder(heatA, cars, "111").driverId, "anna"); + assert.equal(findDriverByCarTransponder(heatB, cars, "111").driverId, "bosse"); + assert.equal(findDriverByCarTransponder({}, cars, "111"), null); + assert.equal(findDriverByCarTransponder(heatA, cars, "999"), null); +}); + +test("race config: heat and final size = number of cars, finals from qualifying", () => { + const config = sponsorRaceConfig({ followUpSec: 10 }, { driverIds: ["a", "b"], carIds: ["1", "2", "3", "4"], format: normalizeSponsorFormat({}, 8, 4) }); + assert.equal(config.carsPerFinal, 4); + assert.equal(config.finalsSource, "qualifying"); + assert.equal(config.participantsConfigured, true); + assert.equal(config.followUpSec, 10); +});