From f8080ffaebc9edc3025679bf9ead8c70873666b4 Mon Sep 17 00:00:00 2001 From: larssand Date: Fri, 13 Nov 2026 09:40:48 +0100 Subject: [PATCH] feat(day): one start time - Race setup's start time and gap are Race Day's, with Race Day's times shown (1.89.17) --- CHANGELOG.md | 6 ++++++ README.md | 2 +- README.sv.md | 2 +- package-lock.json | 4 ++-- package.json | 2 +- src/app.js | 20 +++++++++++++------- src/day_schedule_logic.js | 25 +++++++++++++++++++++++++ src/event_manager_controller.js | 15 +++++++++++++++ src/event_manager_view.js | 10 ++++++++-- tests/browser_event_schedule.js | 28 ++++++++++++++++++++++++++-- tests/day_schedule.test.js | 25 ++++++++++++++++++++++++- 11 files changed, 122 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 834bc0b..e5df3fa 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.17 - 2026-11-13 + +### Changed + +- One start time: the start time and gap in Race setup (Schedule & print) are now the same setting as First start and Break between heats in Race Day for the race's date - change one and the other follows. Race setup and the printed start lists show Race Day's times, with breaks and lunch included. A start time set in Race setup before is used for its day until Race Day gets one. + ## 1.89.16 - 2026-11-13 ### Fixed diff --git a/README.md b/README.md index d7a85c1..41c273f 100644 --- a/README.md +++ b/README.md @@ -179,7 +179,7 @@ After creation the race is managed in four tabs (Race Setup → Manage): - practice, qualifying and final standings, and a finals matrix; - print and branded PDF exports; - split and pit summaries. -- **Schedule & print:** the day's running order with planned times, and heat sheets. +- **Schedule & print:** the day's running order with planned times, and heat sheets. The start time and gap here are the same setting as First start and Break between heats in Race Day for the race's date, and the times shown are Race Day's (breaks and lunch included). The **Dashboard** shows schedule drift (planned vs actual). The **Results archive** lists one row per race; pick one to see its race overview, its heats and the exports (print, PDF, CSV, race package), and open a heat for its laps and penalties. diff --git a/README.sv.md b/README.sv.md index 194ad27..42a8446 100644 --- a/README.sv.md +++ b/README.sv.md @@ -192,7 +192,7 @@ Efter det hanteras racet i fyra flikar (Race Setup → Hantera): - ställning för träning, kval och final samt finalmatris; - utskrift och PDF med klubbens profil; - sammanfattning av split- och depåtider. -- **Schema & utskrift:** dagens körordning med planerade tider, och heatlistor. +- **Schema & utskrift:** dagens körordning med planerade tider, och heatlistor. Starttid och paus här är samma inställning som Första start och Paus mellan heat i Race Day för racets datum, och tiderna som visas är Race Days (pauser och lunch inräknade). **Översikt** visar schemaavvikelse (planerad mot faktisk tid). **Resultatarkivet** visar ett race per rad; välj ett för att se race-översikten, dess heat och exporterna (utskrift, PDF, CSV, racepaket), och öppna ett heat för varv och straff. diff --git a/package-lock.json b/package-lock.json index 67acdad..32d3a61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.89.16", + "version": "1.89.17", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.89.16", + "version": "1.89.17", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index d2283df..9400b96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.89.16", + "version": "1.89.17", "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 748b6a5..84a0a01 100644 --- a/src/app.js +++ b/src/app.js @@ -12,7 +12,7 @@ import { sendHouseOfRcResults, renderHouseOfRcSendStatus } from "./houseofrc_vie import { recordTransponderSighting, buildWarmupCheck, createPrologue, getPrologueRemainingMs, holdPrologue, resumePrologue, setPrologueRemaining, takeDuePrologueCall, formatPrologueTime, getPrologueHandoverMs, normalizePrologueSec, getPrologueMarks } from "./prologue_logic.js"; import { findTransponderConflict, getDriverProfileId } from "./driver_profile_logic.js"; import { renderRaceDayView, refreshRaceDayWarmup, refreshRaceDayPrologueClock, updateRaceDayStartDisplay, refreshRaceDayLive } from "./race_day_view.js"; -import { normalizeRaceDays, getRaceDay, upsertRaceDay, orderDaySessions, buildDaySchedule, getAutopilotAction, moveInDayOrder, pickBoardDate, getDueCall } from "./day_schedule_logic.js"; +import { normalizeRaceDays, getRaceDay, upsertRaceDay, orderDaySessions, buildDaySchedule, getAutopilotAction, moveInDayOrder, pickBoardDate, getDueCall, withRaceSetupStart, eventScheduleFromDayRows } from "./day_schedule_logic.js"; import { buildRaceOverview, buildRaceOverviewCsvRows, withQualifyingPlaces, qualifyingPlaces } from "./race_overview_logic.js"; import { renderRaceOverviewPanel, bindRaceOverviewPanel } from "./race_overview_view.js"; import { renderSpeakerPanel, bindSpeakerPanel } from "./speaker_panel_view.js"; @@ -146,7 +146,9 @@ const getManualCorrectionSummary = (row) => getManualCorrectionSummaryLogic(row, const renderTeamStintLog = (session, rows) => renderTeamStintLogHelper(session, rows, { t, escapeHtml, buildTeamStintLog, formatTeamActiveMemberLabel, renderTable, formatRaceClock }); const renderTeamRaceStandings = (event) => renderTeamRaceStandingsHelper(event, { t, escapeHtml, buildTeamRaceStandings, getSessionTypeLabel, renderTable, formatTeamActiveMemberLabel, formatLap, formatRaceClock, renderTeamStintLog, buildSessionChannelStats }); const getSessionSortWeight = (session) => getSessionSortWeightHelper(session); -const buildEventSchedule = (event) => buildEventScheduleLogic(event, getSessionsForEvent(event.id)); +// Race setup and the printed start lists show the times of Today's schedule (Race Day), which +// is what the autopilot runs; a race without a date keeps its own simple plan. +const buildEventSchedule = (event) => (event?.date ? eventScheduleFromDayRows(buildDayRows(event.date), event.id) : buildEventScheduleLogic(event, getSessionsForEvent(event.id))); const getDriverDisplayById = (driverId) => getDriverDisplayByIdHelper(driverId, { state, t }); const renderPositionGrid = (session) => renderPositionGridHelper(session, { t, escapeHtml, getSessionGridEntries }); const renderGridEditor = (session) => renderGridEditorHelper(session, { t, escapeHtml, ensureSessionDriverOrder, state }); @@ -492,7 +494,7 @@ let autopilotStatus = ""; let autopilotLaunchingId = null; let dayShowDone = false; const todayKey = () => { const d = new Date(); return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`; }; -const getDayPlan = (date) => getRaceDay(state.raceDays, date); +const getDayPlan = (date) => withRaceSetupStart(getRaceDay(state.raceDays, date), state.events); const saveDayPlan = (day) => { state.raceDays = upsertRaceDay(state.raceDays, day); saveState(); }; const getDayClassLabel = (session) => { const event = state.events.find((item) => item.id === session.eventId); return event?.classId ? getClassName(event.classId) : event?.name || ""; }; function buildDayRows(date, now = Date.now()) { @@ -2433,8 +2435,8 @@ const TRANSLATIONS = { "auth.cancel": "Avbryt", "auth.wrong_pin": "Fel PIN.", "auth.too_many": "För många felaktiga försök. Vänta några minuter.", - "guide.schedule_1": "1. Öppna Hantera -> fliken Schema & utskrift för ett race-event. Sätt starttid och paus mellan sessioner (standard 3 minuter) och klicka Spara schema.", - "guide.schedule_2": "2. Varje sessions planerade klockslag räknas ut i körordning (practice, sedan kval, sedan finaler) utifrån starttiden, sessionens längd/efterlöp och pausen mellan sessioner.", + "guide.schedule_1": "1. Öppna Hantera -> fliken Schema & utskrift för ett race-event. Sätt starttid och paus mellan sessioner (standard 3 minuter) och klicka Spara schema. Det är samma inställning som Första start och Paus mellan heat i Race Day (Dagens schema) för racets datum - ändrar du på ena stället ändras det andra, och Race Day styr.", + "guide.schedule_2": "2. Tiderna som visas är Race Days: alla klasser som kör samma dag i körordning, med pauser mellan rundor, före finaler och lunch inräknade. Paus mellan rundor, lunch och ordningen ändrar du i Race Day.", "guide.schedule_3": "3. Så fort en session faktiskt startar eller avslutas flyttas resten av schemat automatiskt fram till den verkliga tiden - en sen start eller en session som drar över (inklusive paus) skjuter resten av dagen framåt utan att du behöver räkna om manuellt. En session som startade mer än en minut sent märks \"Försenad\".", "guide.schedule_4": "4. Det planerade klockslaget skrivs också ut på startlistorna (Skriv ut/PDF startlistor) så förare kan se när deras session ungefär börjar.", "guide.day_flow_title": "Racedag steg för steg: practice → kval → finaler", @@ -2558,6 +2560,7 @@ const TRANSLATIONS = { "events.schedule_title": "Tidsschema", "events.schedule_hint": "Sätt en starttid för dagen så räknas varje sessions planerade klockslag ut automatiskt utifrån längd, efterlöp och paus mellan sessioner. Skjuter en session upp sig (körs över tiden eller pausas) flyttas resten av schemat fram automatiskt.", "events.schedule_start_time": "Starttid", + "events.schedule_day_link": "Starttid och paus är samma som Första start i Race Day (Dagens schema) och ändras på båda ställena. Tiderna nedan är Race Days - där lägger du även paus mellan rundor, lunch och flyttar heat.", "events.schedule_gap": "Paus mellan sessioner (min)", "events.schedule_save": "Spara schema", "events.schedule_clear": "Rensa schema", @@ -4733,8 +4736,8 @@ const TRANSLATIONS = { "auth.cancel": "Cancel", "auth.wrong_pin": "Wrong PIN.", "auth.too_many": "Too many failed attempts. Wait a few minutes.", - "guide.schedule_1": "1. Open Manage -> the Schedule & print tab for a race event. Set a start time and the gap between sessions (default 3 minutes) and click Save schedule.", - "guide.schedule_2": "2. Every session's planned clock time is worked out in running order (practice, then qualifying, then finals) from the start time, each session's own duration/follow-up, and the gap between sessions.", + "guide.schedule_1": "1. Open Manage -> the Schedule & print tab for a race event. Set a start time and the gap between sessions (default 3 minutes) and click Save schedule. It is the same setting as First start and Break between heats in Race Day (Today's schedule) for the race's date - change one and the other follows, and Race Day is in charge.", + "guide.schedule_2": "2. The times shown are Race Day's: every class running that day in running order, with breaks between rounds, before finals and lunch included. Set breaks between rounds, lunch and the order in Race Day.", "guide.schedule_3": "3. As soon as a session actually starts or finishes, the rest of the schedule automatically shifts to match reality - a late start or a session that runs long (including any pause) pushes the rest of the day forward with no manual recalculation. A session that started more than a minute late is marked \"Delayed\".", "guide.schedule_4": "4. The planned clock time is also printed on the start lists (Print/PDF start lists) so drivers can see roughly when their session begins.", "guide.day_flow_title": "Race day step by step: practice → qualifying → finals", @@ -4858,6 +4861,7 @@ const TRANSLATIONS = { "events.schedule_title": "Schedule", "events.schedule_hint": "Set a start time for the day and each session's planned clock time is worked out automatically from its duration, follow-up, and the gap between sessions. If a session runs long or gets paused, the rest of the schedule shifts forward automatically.", "events.schedule_start_time": "Start time", + "events.schedule_day_link": "The start time and gap are the same as First start in Race Day (Today's schedule) and change in both places. The times below are Race Day's - set breaks between rounds, lunch and the heat order there.", "events.schedule_gap": "Gap between sessions (min)", "events.schedule_save": "Save schedule", "events.schedule_clear": "Clear schedule", @@ -7757,6 +7761,8 @@ function renderEventManager(eventId) { ensureRaceParticipantsConfigured, getSessionsForEvent, buildEventSchedule, + getDayPlan, + saveDayPlan: (plan) => saveDayPlan({ ...getDayPlan(plan.date), ...plan }), getSelectedTeamEditId: () => selectedTeamEditId, setSelectedTeamEditId: (value) => { selectedTeamEditId = value; }, getSelectedSessionEditId: () => selectedSessionEditId, diff --git a/src/day_schedule_logic.js b/src/day_schedule_logic.js index fd1f528..4327186 100644 --- a/src/day_schedule_logic.js +++ b/src/day_schedule_logic.js @@ -55,6 +55,31 @@ export function getRaceDay(raceDays, date) { return (raceDays || []).find((day) => day.date === date) || normalizeRaceDay({ date }); } +// Race Day's first start is the only start time. A race that got one in Race setup before the +// two were joined lends it to its day while the day has none of its own. +const localDate = (ms) => { const d = new Date(ms); return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`; }; +export function withRaceSetupStart(day, events = []) { + if (!day || Number(day.startAt) > 0) return day; + const legacy = (events || []) + .filter((event) => event.date === day.date) + .map((event) => Number(event.raceConfig?.scheduleStartAt || 0)) + .filter((ms) => ms > 0 && localDate(ms) === day.date) + .sort((a, b) => a - b)[0]; + return legacy ? { ...day, startAt: legacy } : day; +} + +// One race's part of the day schedule, in the shape Race setup and the printed start lists use. +export function eventScheduleFromDayRows(rows, eventId) { + return (rows || []).filter((row) => row.session.eventId === eventId).map((row) => ({ + sessionId: row.session.id, + plannedStart: row.start, + plannedEnd: row.end, + actualStart: Number(row.session.startedAt || 0) || null, + actualEnd: row.state === "done" ? Number(row.session.endedAt || 0) || null : null, + delayed: row.delayed, + })); +} + // Stores a changed plan for its date; returns the new list. export function upsertRaceDay(raceDays, day) { const next = normalizeRaceDay(day); diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js index 10bbcef..a576b3c 100644 --- a/src/event_manager_controller.js +++ b/src/event_manager_controller.js @@ -107,6 +107,8 @@ export function renderEventManagerView(context) { reorderList, getEventName, buildEventSchedule, + getDayPlan = () => null, + saveDayPlan = () => {}, } = context; const selectedTeamEditId = getSelectedTeamEditId(); @@ -180,6 +182,8 @@ export function renderEventManagerView(context) { setSelectedGridSessionId(selectedGridSession.id); } const eventSchedule = event.mode === "race" ? buildEventSchedule(event) : []; + // The start time and gap are Today's schedule's (Race Day) for the race's date - one setting. + const dayPlan = event.mode === "race" && event.date ? getDayPlan(event.date) : null; eventManageArea.innerHTML = renderEventManagerMarkup({ event, @@ -187,6 +191,7 @@ export function renderEventManagerView(context) { escapeHtml, sessions, eventSchedule, + dayPlan, sessionTypeChoices, sessionTypeHintKey, raceTeams, @@ -676,6 +681,15 @@ export function renderEventManagerView(context) { document.getElementById("scheduleForm")?.addEventListener("submit", (e) => { e.preventDefault(); const form = new FormData(e.currentTarget); + if (dayPlan) { + const time = String(form.get("scheduleStartTime") || "").trim(); + const startAt = time ? new Date(`${event.date}T${time}`).getTime() : NaN; + saveDayPlan({ date: event.date, startAt: Number.isFinite(startAt) ? startAt : null, gapMin: Math.max(0, Number(form.get("scheduleGapMin")) || 0) }); + updateEvent((item) => ({ ...item, raceConfig: { ...item.raceConfig, scheduleStartAt: null } })); + saveState(); + refreshManager(); + return; + } const startValue = String(form.get("scheduleStartAt") || "").trim(); const parsedStart = startValue ? new Date(startValue).getTime() : NaN; const gapMin = Math.max(0, Number(form.get("scheduleGapMin")) || 0); @@ -692,6 +706,7 @@ export function renderEventManagerView(context) { }); document.getElementById("scheduleClear")?.addEventListener("click", () => { + if (dayPlan) saveDayPlan({ date: event.date, startAt: null }); updateEvent((item) => ({ ...item, raceConfig: { ...item.raceConfig, scheduleStartAt: null } })); saveState(); refreshManager(); diff --git a/src/event_manager_view.js b/src/event_manager_view.js index 3a2ecf4..13fcced 100644 --- a/src/event_manager_view.js +++ b/src/event_manager_view.js @@ -33,6 +33,7 @@ export function renderEventManagerMarkup(context) { escapeHtml, sessions, eventSchedule, + dayPlan = null, sessionTypeChoices, sessionTypeHintKey, raceTeams, @@ -574,13 +575,18 @@ export function renderEventManagerMarkup(context) {

${t("events.schedule_title")}

-

${t("events.schedule_hint")}

+

${t("events.schedule_hint")}${dayPlan ? ` ${t("events.schedule_day_link")}` : ""}

+ ${dayPlan ? ` + + + ` : ` + `}
- ${event.raceConfig?.scheduleStartAt ? `` : ""} + ${(dayPlan ? dayPlan.startAt : event.raceConfig?.scheduleStartAt) ? `` : ""}
${eventSchedule && eventSchedule.length diff --git a/tests/browser_event_schedule.js b/tests/browser_event_schedule.js index 0edcccd..6c813f2 100644 --- a/tests/browser_event_schedule.js +++ b/tests/browser_event_schedule.js @@ -36,9 +36,9 @@ export async function runEventScheduleSmoke({ evaluate, navigate, fill, savedSta sessions: [...seeded.sessions, qualifyingSession, practiceSession], }); - const openSchedule = async () => { + const openSchedule = async (eventId = raceEvent.id) => { await navigate("race_setup", "raceWizardStepForm"); - await click("event-manage-" + raceEvent.id); + await click("event-manage-" + eventId); await waitFor(async () => await evaluate(`Boolean(document.querySelector(".manage-tabs"))`), "manage tabs rendered"); await evaluate(`document.querySelector('[data-manage-tab="schedule"]').click()`); await waitFor(async () => await evaluate(`Boolean(document.getElementById("scheduleForm"))`), "schedule panel visible"); @@ -84,4 +84,28 @@ export async function runEventScheduleSmoke({ evaluate, navigate, fill, savedSta await openSchedule(); assert.equal(await evaluate(`Boolean(document.querySelector('[data-manage-panel="schedule"] table'))`), false, "with no start time set, the schedule table is replaced by the not-set hint"); console.log("PASS clearing the schedule removes the start time but keeps the configured gap"); + + // A race with a date (every race made in the app has one): the start time and gap are Race + // Day's for that date - one setting - and the table shows Race Day's times. + const dated = { ...raceEvent, id: "esc_event_dated", name: "ESC Dated", date: "2027-03-12" }; + await patchState({ + events: [...(await savedState()).events, dated], + sessions: [...(await savedState()).sessions, + { id: "esc_dated_p", eventId: dated.id, name: "Dated Practice", type: "practice", durationMin: 5, status: "ready" }, + { id: "esc_dated_q", eventId: dated.id, name: "Dated Qualification", type: "qualification", durationMin: 5, status: "ready" }], + }); + await openSchedule(dated.id); + await fill("scheduleForm", { scheduleStartTime: "10:00", scheduleGapMin: "4" }); + await submit("scheduleForm"); + const dayStart = new Date("2027-03-12T10:00").getTime(); + await waitFor(async () => (await savedState()).raceDays?.find((day) => day.date === dated.date)?.startAt === dayStart, "Race setup saves Race Day's first start"); + assert.equal((await savedState()).raceDays.find((day) => day.date === dated.date).gapMin, 4, "and its break between heats"); + await openSchedule(dated.id); + const planned = await evaluate(`Array.from(document.querySelectorAll('[data-manage-panel="schedule"] table tbody tr td:nth-child(3)')).map((td) => td.textContent.trim())`); + assert.deepEqual(planned.map((text) => text.slice(0, 5)), ["10:00", "10:09"], "Race Day's times: 5 min heat + 4 min break"); + // Changed in Race Day -> Race setup shows it. + await patchState({ raceDays: (await savedState()).raceDays.map((day) => (day.date === dated.date ? { ...day, startAt: new Date("2027-03-12T11:00").getTime() } : day)) }); + await openSchedule(dated.id); + assert.equal(await evaluate(`document.querySelector('#scheduleForm [name="scheduleStartTime"]').value`), "11:00", "a first start changed in Race Day shows in Race setup"); + console.log("PASS Race setup's start time and gap are Race Day's first start and break, and its table shows Race Day's times"); } diff --git a/tests/day_schedule.test.js b/tests/day_schedule.test.js index 1b215e1..c0acff5 100644 --- a/tests/day_schedule.test.js +++ b/tests/day_schedule.test.js @@ -1,6 +1,6 @@ import test from "node:test"; import assert from "node:assert/strict"; -import { orderDaySessions, buildDaySchedule, getAutopilotAction, normalizeRaceDays, moveInDayOrder, pickBoardDate, fixedBreakWindow } from "../src/day_schedule_logic.js"; +import { orderDaySessions, buildDaySchedule, getAutopilotAction, normalizeRaceDays, moveInDayOrder, pickBoardDate, fixedBreakWindow, withRaceSetupStart, eventScheduleFromDayRows } from "../src/day_schedule_logic.js"; const events = [ { id: "e4", name: "Cup #1 4WD", date: "2026-11-08", mode: "race" }, @@ -170,3 +170,26 @@ test("a heat already run between pending ones doesn't pull the rest of the day b const rows = buildDaySchedule(sessions, { startAt: T("23:40"), gapMin: 3 }, T("23:39")).filter((row) => row.state === "upcoming"); assert.deepEqual(rows.map((row) => row.start), [T("23:40"), T("23:48"), T("23:56")], "one after the other from the first start, not all at 23:39"); }); + +test("one start time: Race Day's first start; a Race setup start time from before fills in a day without one", () => { + const at = new Date("2026-11-14T09:30:00").getTime(); + const events = [{ id: "e", date: "2026-11-14", raceConfig: { scheduleStartAt: at } }]; + assert.equal(withRaceSetupStart({ date: "2026-11-14", startAt: null }, events).startAt, at); + const own = new Date("2026-11-14T10:00:00").getTime(); + assert.equal(withRaceSetupStart({ date: "2026-11-14", startAt: own }, events).startAt, own, "Race Day's own time wins"); + assert.equal(withRaceSetupStart({ date: "2026-11-15", startAt: null }, events).startAt, null, "another day is not touched"); +}); + +test("Race setup shows its race's heats with Race Day's times (lunch and other classes included)", () => { + const T = (h) => new Date(`2026-11-14T${h}:00`).getTime(); + const sessions = [ + { id: "a1", eventId: "a", type: "qualification", name: "Q1 H1", status: "ready", durationMin: 5 }, + { id: "b1", eventId: "b", type: "qualification", name: "Q1 H1", status: "ready", durationMin: 5 }, + { id: "a2", eventId: "a", type: "qualification", name: "Q2 H1", status: "ready", durationMin: 5 }, + ]; + const rows = buildDaySchedule(sessions, { date: "2026-11-14", startAt: T("11:50"), gapMin: 2, breakFrom: "12:00", breakTo: "13:00" }, T("08:00")); + const own = eventScheduleFromDayRows(rows, "a"); + assert.deepEqual(own.map((row) => row.sessionId), ["a1", "a2"]); + assert.equal(own[0].plannedStart, T("11:50")); + assert.equal(own[1].plannedStart, T("13:07"), "the other class would run into lunch, goes 13:00-13:05, then a2 after the gap"); +});