diff --git a/CHANGELOG.md b/CHANGELOG.md index 40e61a2..b69c3b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.89.26 - 2026-11-14 + +### Added + +- **Several fixed breaks a day** in Race Day's schedule (e.g. Lunch 12:00–13:00 and Prize-giving 16:00–16:30): **+ Add break** for more, ✕ removes one. A heat that would start or run into any of them starts when it ends, and the schedule, printed running order and drivers' board show which break it waits for. A day saved with the single break keeps it as its first break. + ## 1.89.25 - 2026-11-14 ### Added diff --git a/README.md b/README.md index 1765c3c..9f47409 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,7 @@ The menu follows how a race day works: **Start** (Dashboard, Race Day), **Create - **A session picker** and the buttons that apply right now: Start, Pause, Resume, Finish, **↻ Run again** for a stopped or finished heat, qualifier or final (laps, results and clock reset), and for practice **Reset – new practice day**. Practice uses plain words and has no start lights. The picker lists today's races grouped per race (plus anything running); older races and other days' rounds are under **Show all sessions**. - **Live race** for the race controller, right under the clock while a heat, qualifier or final runs: the running order with laps, last lap, best lap, gap to the car ahead and to the leader, and the estimated finish (laps and time when the time is up). The heat's fastest lap is purple, a personal best on the last lap green, and a bar shows how far into the lap each car is (red = late). After the heat it shows the result. - The **heat queue** shows the current, next and after-next heat in running order: practice, qualifying round by round (Q1 H1, Q1 H2, Q2 H1 …), then finals from the lowest (C, B, A). When a heat is done, **▶ Next** selects the next one in one click. The session lists in Race Setup and on Race Day follow the same order, so a heat deleted and made again lands in its right place; **▲▼** on a session in Race Setup moves it earlier or later. -- **Today's schedule** (at the bottom) puts every class raced that day in one running order with times: practice, then each qualifying round with the classes taking turns, then the finals. Set the first start, the break between heats, a longer **break between rounds** (practice → qualifying, round 1 → round 2) and a **break before the finals** (lunch, counted from the end of qualifying, so the finals don't start the moment they are created). **☕** on a heat adds an extra break before it. A **fixed break** at clock times (e.g. Lunch 12:00–13:00) keeps every heat out of that time: a heat that would start or run into it starts when it ends, and the printed running order and the drivers' board show it. Empty round/finals breaks use the heat break. **▲▼** change the order. A heat that starts late, runs long or is paused moves the rest of the day. Heats already run fold into one line (✓ 6 heats run – show), and the next heat is marked. +- **Today's schedule** (at the bottom) puts every class raced that day in one running order with times: practice, then each qualifying round with the classes taking turns, then the finals. Set the first start, the break between heats, a longer **break between rounds** (practice → qualifying, round 1 → round 2) and a **break before the finals** (lunch, counted from the end of qualifying, so the finals don't start the moment they are created). **☕** on a heat adds an extra break before it. **Fixed breaks** at clock times (e.g. Lunch 12:00–13:00 and Prize-giving 16:00–16:30; **+ Add break** for more, ✕ removes one) keep every heat out of those times: a heat that would start or run into a break starts when it ends, and the printed running order and the drivers' board show the break. Empty round/finals breaks use the heat break. **▲▼** change the order. A heat that starts late, runs long or is paused moves the rest of the day. Heats already run fold into one line (✓ 6 heats run – show), and the next heat is marked. - **🖨 Print running order** gives times, classes, heats and drivers for the board in the pits. - **📺 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. diff --git a/README.sv.md b/README.sv.md index 7e60883..206709e 100644 --- a/README.sv.md +++ b/README.sv.md @@ -120,7 +120,7 @@ Gränssnittet finns på svenska och engelska. - **Snabbval** överst: **Starta träning** (fortsätt eller starta en Open Practice), **Ny banlayout** (under träning) och **Skapa race**. Översikten har samma tre vanliga uppgifter. - **En sessionsväljare** och de knappar som gäller just nu: Start, Pausa, Fortsätt, Avsluta, **↻ Kör om** för ett avbrutet eller klart heat, kval eller final (varv, resultat och klocka nollställs), och för träning **Nollställ – ny träningsdag**. Träning använder vanliga ord och har inga startljus. Väljaren visar dagens race grupperade per race (plus det som pågår); äldre race och andra dagars deltävlingar finns under **Visa alla sessioner**. - **Live-race** för race controllern, direkt under klockan medan ett heat, kval eller final pågår: ordningen med varv, senaste varv, bästa varv, avstånd till bilen före och till ledaren, och beräknat slut (varv och tid när tiden går ut). Heatets snabbaste varv är lila, personbästa på senaste varvet grönt, och en stapel visar hur långt in på varvet varje bil är (röd = sen). Efter heatet visas resultatet. -- **Dagens schema** (längst ned) lägger alla klasser som körs den dagen i en körordning med tider: träning, sedan varje kvalomgång där klasserna turas om, sist finalerna. Ange första start, paus mellan heaten, en längre **paus mellan omgångar** (träning → kval, omgång 1 → omgång 2) och **paus före finaler** (lunch, räknas från att kvalet tog slut, så finalerna inte startar direkt när de skapas). **☕** på ett heat lägger in en extra paus före det. En **fast paus** med klockslag (t.ex. Lunch 12:00–13:00) håller alla heat utanför den tiden: ett heat som skulle starta i eller gå in i pausen startar när den är slut, och utskriften av körordningen och förartavlan visar den. Tomma fält för omgångar/finaler använder pausen mellan heat. **▲▼** ändrar ordningen. Ett heat som startar sent, drar ut på tiden eller pausas flyttar resten av dagen. Körda heat fälls ihop till en rad (✓ 6 heat körda – visa), och nästa heat är markerat. +- **Dagens schema** (längst ned) lägger alla klasser som körs den dagen i en körordning med tider: träning, sedan varje kvalomgång där klasserna turas om, sist finalerna. Ange första start, paus mellan heaten, en längre **paus mellan omgångar** (träning → kval, omgång 1 → omgång 2) och **paus före finaler** (lunch, räknas från att kvalet tog slut, så finalerna inte startar direkt när de skapas). **☕** på ett heat lägger in en extra paus före det. **Fasta pauser** med klockslag (t.ex. Lunch 12:00–13:00 och Prisutdelning 16:00–16:30; **+ Lägg till paus** för fler, ✕ tar bort) håller alla heat utanför de tiderna: ett heat som skulle starta i eller gå in i en paus startar när den är slut, och utskriften av körordningen och förartavlan visar pausen. Tomma fält för omgångar/finaler använder pausen mellan heat. **▲▼** ändrar ordningen. Ett heat som startar sent, drar ut på tiden eller pausas flyttar resten av dagen. Körda heat fälls ihop till en rad (✓ 6 heat körda – visa), och nästa heat är markerat. - **🖨 Skriv ut körordning** ger tider, klasser, heat och förare att sätta upp på tavlan i depån. - **📺 Förarvy** (`/public-overlay/schedule`, finns även under Overlay) visar vad som körs, de tre nästa heaten med förare, sedan resten av dagen. Ett uppropat heat markeras "Uppropad – gör dig redo". Den fungerar på mobilen eller en TV i depån. - **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. diff --git a/package-lock.json b/package-lock.json index 179df16..fb8254e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.89.25", + "version": "1.89.26", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.89.25", + "version": "1.89.26", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index bca1dc7..baf9deb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.89.25", + "version": "1.89.26", "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 b470c47..e471ff8 100644 --- a/src/app.js +++ b/src/app.js @@ -3391,7 +3391,7 @@ const TRANSLATIONS = { "guide.race_day_8": "8. Redan när du registrerar eller ändrar en förare under Förare varnar systemet om transpondern redan används av en annan förare (t.ex. i fel klass) och namnger vem - ett komplement till förkontrollens kontroll av dubbla transpondrar inom samma heat. Samma person som kör flera klasser med sin egen transponder flaggas aldrig.", "guide.race_day_9": "9. Kör ni på ett nät där fler har åtkomst (t.ex. arenans WiFi)? Slå på Admin-PIN under Inställningar -> System & backup. Då kräver alla ändringar PIN - resultat, inställningar och uppdatering - medan visning och publika overlay-/träningslänkar fungerar som vanligt. Varje webbläsare loggar in en gång och kommer ihåg det i 30 dagar.", "guide.race_day_10": "10. Start med nedräkning (som EFRA/IFMAR): välj längd (Go, 30 s, 1, 1:30, 2, 3 eller 5 min - standard per tävling under Race Setup) och tryck Starta. Banan är öppen, speakern ropar ut tiden (varje minut, 30 s, 10 s; vid gridstart även \"bilarna till startplatsen\" vid 30 s och 10, 9 … 3). Pausa medan bilarna ställs upp, +1 min, Till 30 s (omstart av gridet), Till 10 s, Go nu eller Avbryt. När tiden går ut startar heatet av sig själv: gridstart får tystnad efter \"3\", startljus och tutan 1-3 s senare, flygande start ger signalen och \"Klockan går\". Transponderkontrollen visar grön bock för alla som passerat sedan nedräkningen började - saknas någon, byt transponder direkt i panelen eller välj en okänd transponder som passerat. Go nu varnar om någon inte setts.", - "guide.race_day_11": "11. Dagens schema (längst ned på Race Day) visar alla klasser den dagen i en körordning med tider. Ange första start, paus mellan heaten, paus mellan omgångar (träning → kval, omgång → omgång) och paus före finaler (t.ex. lunch, räknas från att kvalet tog slut). ☕ på ett heat lägger in en extra paus före just det. Fast paus med klockslag (t.ex. Lunch 12:00–13:00): inget heat startar eller körs inom den, och den syns i utskriften och på förartavlan. ▲▼ ändrar ordningen. Ett heat som startar sent eller pausas flyttar resten av dagen. 🖨 Skriv ut körordning ger en lista med tider och förare att sätta upp på tavlan, och 📺 Förarvy (/public-overlay/schedule) visar förarna nästa heat och vilka som kör. Upprop: när ett heat har 10 minuter kvar (ändras under Upprop) frågar Race Day om du vill ropa upp det – 📢 Ropa ut läser upp heatet och förarna i högtalarna och markerar det Uppropad i förarvyn; Senare frågar igen om 2 minuter. ▶ Kör dagen automatiskt startar varje heats nedräkning själv när det är dags och ropar då upp heaten själv (den här webbläsaren måste vara öppen). Alla klasser samma dag körs i samma ordning: träning, kvalomgång för kvalomgång, sist finalerna. När kvalet är klart i en klass väntar den tills du har tryckt 🏁 Skapa finaler; ■ Stoppa automatiken låter dig köra för hand och sedan slå på den igen; ⏸ Pausa dagen pausar heatet på banan och automatiken tills du fortsätter.", + "guide.race_day_11": "11. Dagens schema (längst ned på Race Day) visar alla klasser den dagen i en körordning med tider. Ange första start, paus mellan heaten, paus mellan omgångar (träning → kval, omgång → omgång) och paus före finaler (t.ex. lunch, räknas från att kvalet tog slut). ☕ på ett heat lägger in en extra paus före just det. Fasta pauser med klockslag (t.ex. Lunch 12:00–13:00 och Prisutdelning 16:00–16:30, + Lägg till paus för fler): inget heat startar eller körs inom dem, och de syns i utskriften och på förartavlan. ▲▼ ändrar ordningen. Ett heat som startar sent eller pausas flyttar resten av dagen. 🖨 Skriv ut körordning ger en lista med tider och förare att sätta upp på tavlan, och 📺 Förarvy (/public-overlay/schedule) visar förarna nästa heat och vilka som kör. Upprop: när ett heat har 10 minuter kvar (ändras under Upprop) frågar Race Day om du vill ropa upp det – 📢 Ropa ut läser upp heatet och förarna i högtalarna och markerar det Uppropad i förarvyn; Senare frågar igen om 2 minuter. ▶ Kör dagen automatiskt startar varje heats nedräkning själv när det är dags och ropar då upp heaten själv (den här webbläsaren måste vara öppen). Alla klasser samma dag körs i samma ordning: träning, kvalomgång för kvalomgång, sist finalerna. När kvalet är klart i en klass väntar den tills du har tryckt 🏁 Skapa finaler; ■ Stoppa automatiken låter dig köra för hand och sedan slå på den igen; ⏸ Pausa dagen pausar heatet på banan och automatiken tills du fortsätter.", "guide.race_day_12": "12. Race-översikt (under heatkön): hela racet på ett ställe – pallen från A-finalen, sedan träning, kval och finaler med ställning och varje heats resultat (i sponsorheat även bilen). Skriv ut, PDF och CSV exporterar hela racet med 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. Samma översikt finns i Resultatarkivet.", "guide.dashboard_title": "Schemaavvikelse på Översikt", "guide.dashboard_1": "Översikt visar nu skillnaden mellan planerad tid och faktisk körtid för alla startade sessioner.", @@ -3464,6 +3464,10 @@ const TRANSLATIONS = { "day.fixed_break_label": "Namn, t.ex. Lunch", "day.fixed_break_from": "Paus från", "day.fixed_break_to": "Paus till", + "day.fixed_breaks": "Fasta pauser (klockslag)", + "day.fixed_break_default": "Paus", + "day.fixed_break_add": "Lägg till paus", + "day.fixed_break_remove": "Ta bort pausen", "day.show_done": "✓ {count} heat körda – visa", "day.hide_done": "Dölj körda heat ({count})", "day.next": "Nästa", @@ -5704,7 +5708,7 @@ const TRANSLATIONS = { "guide.race_day_8": "8. Already when you register or edit a driver under Drivers, the system warns if the transponder is already used by a different driver (e.g. in the wrong class) and names who - a complement to the preflight's duplicate-transponder check within a single heat. The same person racing multiple classes on their own transponder is never flagged.", "guide.race_day_9": "9. Running on a network others can reach (e.g. the venue WiFi)? Turn on the Admin PIN under Settings -> System & backup. Every change then needs the PIN - results, settings and updates - while viewing and public overlay/training links work as usual. Each browser logs in once and is remembered for 30 days.", "guide.race_day_10": "10. Start with a count-down (as EFRA/IFMAR): pick a length (Go, 30 s, 1, 1:30, 2, 3 or 5 min - the default per event is set in Race Setup) and press Start. The track is open and the announcer calls the time (every minute, 30 s, 10 s; for a grid start also \"cars to the grid\" at 30 s and 10, 9 … 3). Hold while cars are placed on the grid, +1 min, To 30 s (grid restart), To 10 s, Go now or Cancel. When the time runs out the heat starts by itself: a grid start gets quiet after \"3\", the start lights and the horn 1-3 s later, a flying start gets the signal and \"Clock is running\". The transponder check shows a green tick for everyone who has crossed since the count-down began - if someone is missing, change their transponder right in the panel or pick an unknown transponder that crossed. Go now warns if someone wasn't seen.", - "guide.race_day_11": "11. Today's schedule (at the bottom of Race Day) shows every class that day in one running order with times. Set the first start, the break between heats, the break between rounds (practice → qualifying, round → round) and the break before the finals (e.g. lunch, counted from the end of qualifying). ☕ on a heat adds an extra break before just that heat. Fixed break at clock times (e.g. Lunch 12:00–13:00): no heat starts or runs inside it, and it shows in the printout and on the drivers' board. ▲▼ change the order. A heat that starts late or is paused moves the rest of the day. 🖨 Print running order gives a list with times and drivers for the board in the pits, and 📺 Drivers' board (/public-overlay/schedule) shows drivers the next heats and who drives them. Calls: when a heat is 10 minutes away (set under Call), Race Day asks whether to call it – 📢 Call now reads the heat and its drivers over the speakers and marks it Called on the drivers' board; Later asks again in 2 minutes. ▶ Run the day automatically starts each heat's count-down on its own when it is due and then calls the heats itself (keep this browser open). Every class on the day runs in the same order: practice, qualifying round by round, finals last. When a class's qualifying is done it waits until you press 🏁 Create finals; ■ Stop autopilot lets you run heats by hand and turn it back on later; ⏸ Pause the day pauses the heat on track and the autopilot until you resume.", + "guide.race_day_11": "11. Today's schedule (at the bottom of Race Day) shows every class that day in one running order with times. Set the first start, the break between heats, the break between rounds (practice → qualifying, round → round) and the break before the finals (e.g. lunch, counted from the end of qualifying). ☕ on a heat adds an extra break before just that heat. Fixed breaks at clock times (e.g. Lunch 12:00–13:00 and Prize-giving 16:00–16:30, + Add break for more): no heat starts or runs inside them, and they show in the printout and on the drivers' board. ▲▼ change the order. A heat that starts late or is paused moves the rest of the day. 🖨 Print running order gives a list with times and drivers for the board in the pits, and 📺 Drivers' board (/public-overlay/schedule) shows drivers the next heats and who drives them. Calls: when a heat is 10 minutes away (set under Call), Race Day asks whether to call it – 📢 Call now reads the heat and its drivers over the speakers and marks it Called on the drivers' board; Later asks again in 2 minutes. ▶ Run the day automatically starts each heat's count-down on its own when it is due and then calls the heats itself (keep this browser open). Every class on the day runs in the same order: practice, qualifying round by round, finals last. When a class's qualifying is done it waits until you press 🏁 Create finals; ■ Stop autopilot lets you run heats by hand and turn it back on later; ⏸ Pause the day pauses the heat on track and the autopilot until you resume.", "guide.race_day_12": "12. Race overview (under the heat queue): the whole race in one place - the podium from the A final, then practice, qualifying and finals with the standings and every heat's result (with the car in sponsor heats). Print, PDF and CSV export the whole race with the 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. The same overview is in the Results archive.", "guide.dashboard_title": "Schedule drift on overview", "guide.dashboard_1": "Overview now shows the difference between planned time and actual elapsed time for all started sessions.", @@ -5777,6 +5781,10 @@ const TRANSLATIONS = { "day.fixed_break_label": "Name, e.g. Lunch", "day.fixed_break_from": "Break from", "day.fixed_break_to": "Break to", + "day.fixed_breaks": "Fixed breaks (clock time)", + "day.fixed_break_default": "Break", + "day.fixed_break_add": "Add break", + "day.fixed_break_remove": "Remove the break", "day.show_done": "✓ {count} heats run – show", "day.hide_done": "Hide run heats ({count})", "day.next": "Next", diff --git a/src/day_schedule_logic.js b/src/day_schedule_logic.js index 4327186..a9047f4 100644 --- a/src/day_schedule_logic.js +++ b/src/day_schedule_logic.js @@ -11,16 +11,28 @@ export const DEFAULT_CALL_MIN = 10; // gapMin = break between heats of one round; roundGapMin = between rounds (practice -> qualifying, // round 1 -> round 2, final leg 1 -> leg 2); finalsGapMin = before the finals (lunch). Empty // round / finals gaps fall back to the one before. breaks = { sessionId: minutes } of extra -// break before that heat. breakFrom / breakTo = a break at fixed clock times ("12:00"-"13:00", -// lunch): no heat starts or runs inside it. callMin = how long before its start a heat is called. +// break before that heat. fixedBreaks = breaks at fixed clock times ([{ from: "12:00", to: "13:00", +// label: "Lunch" }, ...]): no heat starts or runs inside one. callMin = how long before its start a heat is called. const clockTime = (value) => { const match = String(value || "").trim().match(/^(\d{1,2}):(\d{2})$/); return match && Number(match[1]) < 24 && Number(match[2]) < 60 ? `${match[1].padStart(2, "0")}:${match[2]}` : null; }; -// The fixed-time break of a day as timestamps, or null. -export function fixedBreakWindow(day) { +// The fixed-time breaks of a day (lunch, prize-giving ...) as timestamps, in time order. +export function fixedBreakWindows(day) { const plan = normalizeRaceDay(day || {}); - if (!plan.breakFrom || !/^\d{4}-\d{2}-\d{2}$/.test(plan.date)) return null; - const start = new Date(`${plan.date}T${plan.breakFrom}:00`).getTime(); - const end = new Date(`${plan.date}T${plan.breakTo}:00`).getTime(); - return Number.isFinite(start) && Number.isFinite(end) && end > start ? { start, end, from: plan.breakFrom, to: plan.breakTo, label: plan.breakLabel } : null; + if (!/^\d{4}-\d{2}-\d{2}$/.test(plan.date)) return []; + return plan.fixedBreaks.map((item) => ({ ...item, start: new Date(`${plan.date}T${item.from}:00`).getTime(), end: new Date(`${plan.date}T${item.to}:00`).getTime() })) + .filter((item) => Number.isFinite(item.start) && Number.isFinite(item.end) && item.end > item.start); +} +// The first fixed break (the single break of older versions), or null. +export function fixedBreakWindow(day) { + return fixedBreakWindows(day)[0] || null; +} +// fixedBreaks: [{ from: "12:00", to: "12:30", label }] sorted, overlaps merged away by dropping the +// later one. A day saved before the list (breakFrom / breakTo / breakLabel) becomes one entry. +function normalizeFixedBreaks(day) { + const source = Array.isArray(day.fixedBreaks) ? day.fixedBreaks : [{ from: day.breakFrom, to: day.breakTo, label: day.breakLabel }]; + const list = source.slice(0, 10).map((item) => ({ from: clockTime(item?.from), to: clockTime(item?.to), label: String(item?.label || "").trim().slice(0, 40) })) + .filter((item) => item.from && item.to && item.to > item.from) + .sort((a, b) => a.from.localeCompare(b.from)); + return list.reduce((kept, item) => (kept.length && item.from < kept[kept.length - 1].to ? kept : [...kept, item]), []); } const optionalMin = (value) => (value === null || value === undefined || value === "" || !Number.isFinite(Number(value)) ? null : Math.max(0, Number(value))); export function normalizeRaceDay(day = {}) { @@ -34,9 +46,10 @@ export function normalizeRaceDay(day = {}) { finalsGapMin: optionalMin(day.finalsGapMin), breaks, ...(() => { - const from = clockTime(day.breakFrom); - const to = clockTime(day.breakTo); - return from && to && to > from ? { breakFrom: from, breakTo: to, breakLabel: String(day.breakLabel || "").trim().slice(0, 40) } : { breakFrom: null, breakTo: null, breakLabel: "" }; + const fixedBreaks = normalizeFixedBreaks(day); + const first = fixedBreaks[0]; + // breakFrom / breakTo / breakLabel mirror the first break for older readers. + return { fixedBreaks, breakFrom: first?.from || null, breakTo: first?.to || null, breakLabel: first?.label || "" }; })(), callMin: Number(day.callMin) > 0 ? Math.min(60, Number(day.callMin)) : DEFAULT_CALL_MIN, sessionOrder: [...new Set((Array.isArray(day.sessionOrder) ? day.sessionOrder : []).map(String).filter(Boolean))], @@ -152,8 +165,13 @@ export function buildDaySchedule(ordered, day, now = Date.now()) { let cursor = dayStartAt || firstStart || now; let upcomingIndex = 0; let previous = null; - const fixed = fixedBreakWindow(day); - const overlapsFixed = (start, durationMs) => Boolean(fixed && start < fixed.end && start + durationMs > fixed.start); + const fixed = fixedBreakWindows(day); + // A start that would begin or run into a fixed break moves to its end (again for a later break). + const pastBreaks = (start, durationMs) => { + let breakHit = null; + fixed.forEach((window) => { if (start < window.end && start + durationMs > window.start) { start = window.end; breakHit = window; } }); + return { start, breakHit }; + }; return ordered.map((session) => { const durationMs = sessionDurationMs(session); const actualStart = Number(session.startedAt || 0) || null; @@ -161,7 +179,7 @@ export function buildDaySchedule(ordered, day, now = Date.now()) { // The first heat starts at the day's start time; an extra break before it still counts. const breakMin = breakBeforeMin(previous, session, day); let planned = cursor + breakMin * 60000; - let afterFixedBreak = false; + let afterBreak = null; previous = session; let state = "upcoming"; let start = planned; @@ -177,10 +195,12 @@ export function buildDaySchedule(ordered, day, now = Date.now()) { end = Math.max(now, actualStart + durationMs + pausedMs); } else { // A heat that would start or run into the fixed break (lunch) waits until it is over. - if (overlapsFixed(planned, durationMs)) { planned = fixed.end; afterFixedBreak = true; } + const plannedMove = pastBreaks(planned, durationMs); + planned = plannedMove.start; // Not before the day's first start, nor before now. - start = Math.max(planned, now, dayStartAt); - if (overlapsFixed(start, durationMs)) { start = fixed.end; afterFixedBreak = true; } + const startMove = pastBreaks(Math.max(planned, now, dayStartAt), durationMs); + start = startMove.start; + afterBreak = startMove.breakHit || plannedMove.breakHit; end = start + durationMs; } // A heat already run that comes after one still waiting (classes take turns, so a done @@ -190,7 +210,9 @@ export function buildDaySchedule(ordered, day, now = Date.now()) { return { session, breakMin, - afterFixedBreak, + // The fixed break this heat waits for ({ from, to, label }), or null. + afterBreak: afterBreak ? { from: afterBreak.from, to: afterBreak.to, label: afterBreak.label } : null, + afterFixedBreak: Boolean(afterBreak), state, plannedStart: planned, start, diff --git a/src/day_schedule_view.js b/src/day_schedule_view.js index 2d8f2e2..666a806 100644 --- a/src/day_schedule_view.js +++ b/src/day_schedule_view.js @@ -39,12 +39,10 @@ export function renderDaySchedulePanel({ t, escapeHtml, date, day, rows, autopil -
- ${escapeHtml(t("day.fixed_break"))} - - - – - +
+ ${escapeHtml(t("day.fixed_breaks"))} + ${[...(day.fixedBreaks || []), { from: "", to: "", label: "" }].map((item) => fixedBreakRow(item, { t, escapeHtml })).join("")} +
@@ -64,7 +62,7 @@ export function renderDaySchedulePanel({ t, escapeHtml, date, day, rows, autopil ${doneCount ? `` : ""} ${rows.map((row, index) => row.state === "done" && !showDone ? "" : ` - ${formatClockTime(row.start)}${row.delayed && row.state !== "done" ? ` (${formatClockTime(row.plannedStart)})` : ""}${row.afterFixedBreak ? `
🍽 ${escapeHtml(day.breakLabel || t("day.fixed_break"))} ${escapeHtml(day.breakFrom)}–${escapeHtml(day.breakTo)}` : row.breakMin > day.gapMin && index > 0 ? `
☕ ${escapeHtml(t("day.break_before", { min: row.breakMin }))}` : ""} + ${formatClockTime(row.start)}${row.delayed && row.state !== "done" ? ` (${formatClockTime(row.plannedStart)})` : ""}${row.afterBreak ? `
${escapeHtml(fixedBreakText(row.afterBreak, t))}` : row.breakMin > day.gapMin && index > 0 ? `
☕ ${escapeHtml(t("day.break_before", { min: row.breakMin }))}` : ""} ${row.session.id === nextId ? `${escapeHtml(t("day.next"))} ` : ""}${escapeHtml(rowLabel(row, getClassLabel))} ${row.driverCount ?? ""} ${escapeHtml(stateLabel(row, t, now))} @@ -97,6 +95,17 @@ export function renderDayCallBanner({ t, escapeHtml, row, getClassLabel, driverN `; } +// One fixed break in the plan form (name, from, to, remove). An empty row is offered last. +function fixedBreakRow(item, { t, escapeHtml }) { + return `
+ + + – + + +
`; +} + export function bindDayCallBanner(root, { onCall, onLater }) { const banner = root.querySelector("#dayCallBanner"); if (!banner) return; @@ -113,7 +122,23 @@ export function bindDaySchedulePanel(root, { date, onSavePlan, onBreak = () => { const time = String(form.get("startTime") || "").trim(); const startAt = time ? new Date(`${date}T${time}`).getTime() : null; const optional = (name) => (String(form.get(name) ?? "").trim() === "" ? null : Math.max(0, Number(form.get(name)) || 0)); - onSavePlan({ startAt: Number.isFinite(startAt) ? startAt : null, gapMin: Math.max(0, Number(form.get("gapMin")) || 0), roundGapMin: optional("roundGapMin"), finalsGapMin: optional("finalsGapMin"), breakFrom: String(form.get("breakFrom") || ""), breakTo: String(form.get("breakTo") || ""), breakLabel: String(form.get("breakLabel") || ""), callMin: Math.max(1, Number(form.get("callMin")) || 10) }); + onSavePlan({ startAt: Number.isFinite(startAt) ? startAt : null, gapMin: Math.max(0, Number(form.get("gapMin")) || 0), roundGapMin: optional("roundGapMin"), finalsGapMin: optional("finalsGapMin"), fixedBreaks: [...event.currentTarget.querySelectorAll("[data-fixed-break]")].map((row) => ({ label: row.querySelector('[name="breakLabel"]').value, from: row.querySelector('[name="breakFrom"]').value, to: row.querySelector('[name="breakTo"]').value })).filter((item) => item.from && item.to), callMin: Math.max(1, Number(form.get("callMin")) || 10) }); + }); + // Add / remove break rows in place (saved with the form). + root.querySelector("[data-fixed-breaks]")?.addEventListener("click", (event) => { + const target = event.target instanceof Element ? event.target : null; + if (target?.closest("[data-fixed-break-remove]")) { + const row = target.closest("[data-fixed-break]"); + if (row.parentElement.querySelectorAll("[data-fixed-break]").length > 1) row.remove(); + else row.querySelectorAll("input").forEach((input) => { input.value = ""; }); + } + if (target?.closest("[data-fixed-break-add]")) { + const rows = target.parentElement.querySelectorAll("[data-fixed-break]"); + const copy = rows[rows.length - 1].cloneNode(true); + copy.querySelectorAll("input").forEach((input) => { input.value = ""; }); + target.before(copy); + copy.querySelector("input")?.focus(); + } }); root.querySelectorAll("[data-day-break]").forEach((button) => button.addEventListener("click", () => onBreak(button.dataset.dayBreak))); root.querySelectorAll("[data-day-move]").forEach((button) => button.addEventListener("click", () => onMove(button.dataset.dayMove, Number(button.dataset.step)))); @@ -126,15 +151,12 @@ export function bindDaySchedulePanel(root, { date, onSavePlan, onBreak = () => { } // For the board in the pits: time, class, session and the drivers in grid order. -// "🍽 Lunch 12:00–13:00" for the heat right after the fixed break. -const fixedBreakText = (day, t) => `🍽 ${day?.breakLabel || t("day.fixed_break")} ${day?.breakFrom}–${day?.breakTo}`; +// "🍽 Lunch 12:00–13:00" for the heat right after a fixed break (item = row.afterBreak). +const fixedBreakText = (item, t) => `🍽 ${item?.label || t("day.fixed_break_default")} ${item?.from}–${item?.to}`; -const inFixedBreak = (day, date, now) => { - if (!day?.breakFrom || !day?.breakTo) return false; - const start = new Date(`${date}T${day.breakFrom}:00`).getTime(); - const end = new Date(`${date}T${day.breakTo}:00`).getTime(); - return now >= start && now < end; -}; +// The fixed break going on right now, or null. +const currentFixedBreak = (day, date, now) => (day?.fixedBreaks || (day?.breakFrom ? [{ from: day.breakFrom, to: day.breakTo, label: day.breakLabel }] : [])) + .find((item) => now >= new Date(`${date}T${item.from}:00`).getTime() && now < new Date(`${date}T${item.to}:00`).getTime()) || null; export function buildDaySchedulePrintHtml({ t, escapeHtml, date, rows, getClassLabel, getSessionGridEntries, day = null }) { return ` @@ -153,7 +175,7 @@ export function buildDaySchedulePrintHtml({ t, escapeHtml, date, rows, getClassL - ${rows.map((row) => `${row.afterFixedBreak ? `` : ""} + ${rows.map((row) => `${row.afterBreak ? `` : ""} @@ -179,7 +201,7 @@ export function renderDriverBoard({ t, escapeHtml, date, rows, getClassLabel, ge ${formatClockTime(row.start)}${escapeHtml(minutes <= 0 ? t("day.board_now") : t("day.in_min", { min: minutes }))} - ${row.afterFixedBreak ? `

${escapeHtml(fixedBreakText(day, t))}

` : ""} + ${row.afterBreak ? `

${escapeHtml(fixedBreakText(row.afterBreak, t))}

` : ""}

${escapeHtml(rowLabel(row, getClassLabel))}

${called ? `

📢 ${escapeHtml(t("day.board_heads_up"))}

` : ""}
    ${getSessionGridEntries(row.session).map((entry) => `
  1. ${rowFlag(entry)}${escapeHtml(entry.name)}
  2. `).join("") || `
  3. ${escapeHtml(t("race_day.no_start_list"))}
  4. `}
@@ -191,9 +213,9 @@ export function renderDriverBoard({ t, escapeHtml, date, rows, getClassLabel, ge

${escapeHtml(t("day.board_title", { date }))}

${formatClockTime(now)} - ${!live && inFixedBreak(day, date, now) ? `
${escapeHtml(fixedBreakText(day, t))}
` : ""} + ${!live && currentFixedBreak(day, date, now) ? `
${escapeHtml(fixedBreakText(currentFixedBreak(day, date, now), t))}
` : ""} ${live ? `
${escapeHtml(t("day.board_on_track"))}: ${escapeHtml(rowLabel(live, getClassLabel))} ${escapeHtml(getRemainingLabel(live.session))}
` : ""} ${next.length ? `
${next.map(card).join("")}
` : `

${escapeHtml(t(rows.length ? "day.board_all_done" : "day.board_none"))}

`} - ${later.length ? `
${escapeHtml(t("day.col_time"))}${escapeHtml(t("day.col_session"))}${escapeHtml(t("day.col_drivers"))}
${escapeHtml(fixedBreakText(day, t))}
${escapeHtml(fixedBreakText(row.afterBreak, t))}
${formatClockTime(row.start)} ${escapeHtml(rowLabel(row, getClassLabel))}
    ${getSessionGridEntries(row.session).map((entry) => `
  1. ${rowFlag(entry)}${escapeHtml(entry.name)}
  2. `).join("")}
${later.map((row) => `${row.afterFixedBreak ? `` : ""}`).join("")}
${escapeHtml(fixedBreakText(day, t))}
${formatClockTime(row.start)}${escapeHtml(rowLabel(row, getClassLabel))}
` : ""} + ${later.length ? `${later.map((row) => `${row.afterBreak ? `` : ""}`).join("")}
${escapeHtml(fixedBreakText(row.afterBreak, t))}
${formatClockTime(row.start)}${escapeHtml(rowLabel(row, getClassLabel))}
` : ""} `; } diff --git a/src/styles.css b/src/styles.css index 6164f9d..f10314b 100644 --- a/src/styles.css +++ b/src/styles.css @@ -5066,9 +5066,12 @@ body[data-theme="light"] .overlay-pit-badge.is-done { color: #7a4a00; } tr.is-selected td { background: color-mix(in srgb, var(--danger) 12%, transparent); } .driver-list-toolbar label.toggle, .driver-list-bulk label.toggle { display: inline-flex; align-items: center; gap: 8px; white-space: nowrap; width: auto; } .driver-list-toolbar label.toggle input, .driver-list-bulk label.toggle input { width: auto; margin: 0; } -.day-fixed-break { display: flex; align-items: center; gap: 6px; border: 1px solid var(--line, rgba(255,255,255,0.15)); border-radius: 8px; padding: 4px 8px 6px; margin: 0; } +.day-fixed-break { display: flex; flex-direction: column; align-items: flex-start; gap: 6px; border: 1px solid var(--line, rgba(255,255,255,0.15)); border-radius: 8px; padding: 4px 8px 6px; margin: 0; } .day-fixed-break legend { font-size: 0.85rem; color: var(--muted); padding: 0 4px; } -.day-fixed-break input[name="breakLabel"] { width: 9em; } +.day-fixed-break-row { display: flex; flex-wrap: wrap; align-items: center; gap: 6px; } +.day-fixed-break input[name="breakLabel"] { width: 10em; flex: 0 1 10em; min-width: 6em; } +.day-fixed-break input[type="time"] { width: 7.5em; flex: 0 0 7.5em; } +.day-fixed-break-row .btn, .day-fixed-break > .btn { width: auto; flex: 0 0 auto; } .board-break, .board-break-note, .board-break-row td { color: var(--gold, #d9a441); font-weight: 700; } /* A driver's country flag before the name (src/flags, local SVG). */ diff --git a/tests/browser_day_schedule.js b/tests/browser_day_schedule.js index db04d44..08af754 100644 --- a/tests/browser_day_schedule.js +++ b/tests/browser_day_schedule.js @@ -50,6 +50,27 @@ export async function runDayScheduleSmoke({ evaluate, navigate, savedState, wait } console.log("PASS the day gets a first start time and gap, and every heat its planned time"); + // Several fixed breaks: fill the empty row, + Add break for a second, save; ✕ removes one. + // Early-morning times so they never move the heats the rest of this test plans. + const savedBreaks = async () => ((await savedState()).raceDays || []).find((day) => day.date === today)?.fixedBreaks || []; + await evaluate(`(() => { + const form = document.getElementById("dayPlanForm"); + const fill = (row, label, from, to) => { row.querySelector('[name="breakLabel"]').value = label; row.querySelector('[name="breakFrom"]').value = from; row.querySelector('[name="breakTo"]').value = to; }; + fill(form.querySelector("[data-fixed-break]"), "Prisutdelning", "04:00", "04:10"); + form.querySelector("[data-fixed-break-add]").click(); + const rows = form.querySelectorAll("[data-fixed-break]"); + fill(rows[rows.length - 1], "Lunch", "03:00", "03:10"); + form.requestSubmit(); + })()`); + await waitFor(async () => (await savedBreaks()).length === 2, "two breaks saved"); + assert.deepEqual((await savedBreaks()).map((item) => item.label), ["Lunch", "Prisutdelning"], "saved in time order"); + await waitFor(async () => (await evaluate(`document.querySelectorAll("#dayPlanForm [data-fixed-break]").length`)) === 3, "two breaks and an empty row after saving"); + await evaluate(`(() => { const form = document.getElementById("dayPlanForm"); form.querySelector("[data-fixed-break] [data-fixed-break-remove]").click(); form.requestSubmit(); })()`); + await waitFor(async () => (await savedBreaks()).map((item) => item.label).join() === "Prisutdelning", "✕ removed the lunch"); + await evaluate(`(() => { const form = document.getElementById("dayPlanForm"); form.querySelector("[data-fixed-break] [data-fixed-break-remove]").click(); form.requestSubmit(); })()`); + await waitFor(async () => (await savedBreaks()).length === 0, "no breaks left"); + console.log("PASS several fixed breaks a day: add, save in time order, remove"); + await evaluate(`document.getElementById("dayAutopilotOn").click()`); await waitFor(async () => ((await savedState()).raceDays || []).find((day) => day.date === today)?.autopilot === true, "autopilot on"); await waitFor(async () => (await evaluate(`document.querySelector("[data-autopilot-status]").textContent`)).startsWith("Next: 4WD") || (await evaluate(`document.querySelector("[data-autopilot-status]").textContent`)).includes("DS"), "the autopilot says what is next"); diff --git a/tests/day_schedule.test.js b/tests/day_schedule.test.js index c0acff5..2361b17 100644 --- a/tests/day_schedule.test.js +++ b/tests/day_schedule.test.js @@ -145,6 +145,24 @@ test("a break at fixed clock times (lunch 12-13): no heat starts or runs inside assert.equal(fixedBreakWindow(day).label, "Lunch"); }); +test("several fixed breaks a day: each moves the heat that would hit it, the old single break carries over", () => { + const at = (hhmm) => new Date(`2026-11-08T${hhmm}:00`).getTime(); + const list = ["a", "b", "c", "d"].map((id, i) => s(id, "e2", "qualification", `Q1 H${i + 1}`)); + const day = { date: "2026-11-08", startAt: at("11:50"), gapMin: 2, fixedBreaks: [{ from: "15:00", to: "15:20", label: "Prisutdelning" }, { from: "12:00", to: "13:00", label: "Lunch" }, { from: "13:05", to: "13:15", label: "Banunderhåll" }] }; + const plan = buildDaySchedule(list, day, at("08:00")); + // a 11:50-11:55; b 11:57 runs into lunch -> 13:00, but 13:00-13:05 ends as the track break starts: ok; + // c 13:07 runs into the track break -> 13:15; d 13:22. + assert.deepEqual(plan.map((row) => new Date(row.start).toTimeString().slice(0, 5)), ["11:50", "13:00", "13:15", "13:22"]); + assert.deepEqual(plan.map((row) => row.afterBreak?.label || ""), ["", "Lunch", "Banunderhåll", ""]); + // Sorted, and an overlapping or backwards break is dropped. + const normalized = normalizeRaceDays([{ date: "2026-11-08", fixedBreaks: [{ from: "13:00", to: "14:00" }, { from: "12:00", to: "13:30" }, { from: "16:00", to: "15:00" }] }])[0]; + assert.deepEqual(normalized.fixedBreaks.map((item) => item.from), ["12:00"]); + // A day saved with the single break keeps it as the first entry. + const old = normalizeRaceDays([{ date: "2026-11-08", breakFrom: "12:00", breakTo: "12:45", breakLabel: "Lunch" }])[0]; + assert.deepEqual(old.fixedBreaks, [{ from: "12:00", to: "12:45", label: "Lunch" }]); + assert.equal(normalizeRaceDays([{ date: "2026-11-08", breakFrom: "12:00", breakTo: "12:45", fixedBreaks: [] }])[0].breakFrom, null, "an emptied list wins over the old fields"); +}); + test("the drivers' board shows the lunch while it is on, and before the heat after it", async () => { const { renderDriverBoard } = await import("../src/day_schedule_view.js"); const at = (hhmm) => new Date(`2026-11-08T${hhmm}:00`).getTime();