${escapeHtml(layout.label || t("settings.track_layout_unnamed"))}${escapeHtml(new Date(layout.startedAt).toLocaleString())}
-
+
${t("settings.track_layout_none")}
`} @@ -760,13 +768,26 @@ Erik Eriksson;654321;4WD;Associated;; alert(t("settings.track_layout_invalid_date")); return; } - const result = addTrackLayout(label, startedAtMs); + const seconds = (name) => Math.round((Number(form.elements.namedItem(name)?.value) || 0) * 1000); + const result = addTrackLayout(label, startedAtMs, { minLapMs: seconds("minLapSec"), maxLapMs: seconds("maxLapSec") }); if (!result.ok) { alert(result.message); return; } renderView(); }); + document.querySelectorAll("[data-layout-lap-window]").forEach((form) => { + form.addEventListener("submit", (event) => { + event.preventDefault(); + const seconds = (name) => Math.round((Number(form.elements.namedItem(name)?.value) || 0) * 1000); + const result = updateTrackLayoutLapWindow(form.dataset.layoutLapWindow, seconds("minLapSec"), seconds("maxLapSec")); + if (!result.ok) { + alert(result.message); + return; + } + renderView(); + }); + }); document.querySelectorAll("[data-delete-track-layout]").forEach((button) => { button.addEventListener("click", () => { const id = button.getAttribute("data-delete-track-layout"); diff --git a/src/styles.css b/src/styles.css index 8264b7d..3002f60 100644 --- a/src/styles.css +++ b/src/styles.css @@ -4560,3 +4560,12 @@ tr.is-removed td.lap-actions { opacity: 1; text-decoration: none; } + +/* Settings -> track layouts: optional min/max lap time per layout */ +.backup-row.track-layout-row { grid-template-columns: minmax(0, 1fr) auto 74px; } +.layout-lap-window { display: flex; gap: 8px; align-items: flex-end; flex-wrap: wrap; } +.layout-lap-window label { display: grid; gap: 2px; font-size: 0.7rem; color: var(--muted); } +.layout-lap-window input { width: 110px; } +@media (max-width: 720px) { + .backup-row.track-layout-row { grid-template-columns: 1fr; } +} diff --git a/src/timing_logic.js b/src/timing_logic.js index 6a847c7..53ac9a0 100644 --- a/src/timing_logic.js +++ b/src/timing_logic.js @@ -1,3 +1,4 @@ +import { getLayoutLapWindowOverride } from "./track_layouts_logic.js"; export function getSessionTypeLabel(type, { t }) { const key = `session.${String(type || "").toLowerCase()}`; const translated = t(key); @@ -40,8 +41,9 @@ export function getSessionLapWindow(session, { state }) { if (event?.mode !== "race") { return { minLapMs: 0, maxLapMs: Number.POSITIVE_INFINITY }; } - const minLapMs = Math.max(0, Number(event?.raceConfig?.minLapMs || 0) || 0); - const configuredMaxLapMs = Math.max(0, Number(event?.raceConfig?.maxLapMs || 60000) || 60000); + const override = getLayoutLapWindowOverride(state.trackLayouts, session); + const minLapMs = override.minLapMs ?? Math.max(0, Number(event?.raceConfig?.minLapMs || 0) || 0); + const configuredMaxLapMs = override.maxLapMs ?? Math.max(0, Number(event?.raceConfig?.maxLapMs || 60000) || 60000); const maxLapMs = configuredMaxLapMs > 0 ? Math.max(configuredMaxLapMs, minLapMs || 0) : Number.POSITIVE_INFINITY; return { minLapMs, maxLapMs }; } diff --git a/src/track_layout_bar.js b/src/track_layout_bar.js index 94c13f2..3f1dc04 100644 --- a/src/track_layout_bar.js +++ b/src/track_layout_bar.js @@ -24,7 +24,9 @@ export function bindTrackLayoutBar(root, { state, t, addTrackLayout, renderView const suggested = nextTrackLayoutLabel(normalizeTrackLayouts(state.trackLayouts)); const label = window.prompt(t("layouts.new_prompt"), suggested); if (label === null) return; - const result = addTrackLayout(label.trim() || suggested, Date.now()); + // Optional: a rebuilt track often needs its own minimum lap time (empty = the event's). + const minLapSec = Number(String(window.prompt(t("layouts.new_min_lap_prompt"), "") || "").replace(",", ".")); + const result = addTrackLayout(label.trim() || suggested, Date.now(), { minLapMs: Number.isFinite(minLapSec) && minLapSec > 0 ? Math.round(minLapSec * 1000) : 0 }); if (!result.ok) { window.alert(result.message); return; diff --git a/src/track_layouts_logic.js b/src/track_layouts_logic.js index c6a952f..f79212f 100644 --- a/src/track_layouts_logic.js +++ b/src/track_layouts_logic.js @@ -9,9 +9,24 @@ export function normalizeTrackLayout(layout, { uid } = {}) { id: String(layout?.id || (uid ? uid("layout") : "")), label: String(layout?.label || "").trim(), startedAt: Number.isFinite(Number(layout?.startedAt)) ? Number(layout.startedAt) : Date.now(), + // Optional lap window for practice on this layout (a rebuilt track is often shorter or + // longer); 0 = not set, the event's own min/max lap time applies. + minLapMs: Math.max(0, Math.round(Number(layout?.minLapMs) || 0)), + maxLapMs: Math.max(0, Math.round(Number(layout?.maxLapMs) || 0)), }; } +// Practice sessions use their layout's min/max lap time where it is set; race sessions +// always keep the event's (set by race control, never changed mid-race by a layout). +export function getLayoutLapWindowOverride(layouts, session) { + if (!session || !isPracticeSessionType(session.type) || !session.trackLayoutId) return {}; + const layout = (Array.isArray(layouts) ? layouts : []).find((item) => item?.id === session.trackLayoutId); + const override = {}; + if (Number(layout?.minLapMs) > 0) override.minLapMs = Number(layout.minLapMs); + if (Number(layout?.maxLapMs) > 0) override.maxLapMs = Number(layout.maxLapMs); + return override; +} + export function normalizeTrackLayouts(layouts, { uid } = {}) { const list = (Array.isArray(layouts) ? layouts : []) .map((layout) => normalizeTrackLayout(layout, { uid })) diff --git a/tests/browser_track_layouts.js b/tests/browser_track_layouts.js index 36fa5d4..a24de11 100644 --- a/tests/browser_track_layouts.js +++ b/tests/browser_track_layouts.js @@ -40,6 +40,19 @@ export async function runTrackLayoutsSmoke({ evaluate, navigate, savedState, wai assert.ok(options.includes((await savedState()).trackLayouts[0].id)); console.log("PASS a track layout can be created from Training stats and the per-layout stats selector appears"); + // Settings: the layout gets its own min/max lap time; max <= min is refused. + await navigate("settings", "settingsForm"); + const layoutId = (await savedState()).trackLayouts[0].id; + const submitLapWindow = (min, max) => evaluate(`(() => { const form = document.querySelector('[data-layout-lap-window="${layoutId}"]'); form.elements.minLapSec.value = "${min}"; form.elements.maxLapSec.value = "${max}"; form.requestSubmit(); })()`); + await submitLapWindow("8.5", "40"); + await waitFor(async () => (await savedState()).trackLayouts[0].minLapMs === 8500, "layout min lap time saved"); + assert.equal((await savedState()).trackLayouts[0].maxLapMs, 40000); + const alertsBefore = dialogs.length; + await submitLapWindow("30", "20"); + await waitFor(async () => dialogs.slice(alertsBefore).some((dialog) => dialog.type === "alert"), "an impossible lap window is refused"); + assert.equal((await savedState()).trackLayouts[0].minLapMs, 8500, "unchanged"); + console.log("PASS each track layout can have its own min/max lap time"); + await patchState({ activeSessionId: quali.id }); await navigate("race_day", "raceDayStart"); assert.equal(await layoutButtonVisible(), false, "no New layout button while a race session is in focus"); diff --git a/tests/track_layouts_logic.test.js b/tests/track_layouts_logic.test.js index f482205..a8f8973 100644 --- a/tests/track_layouts_logic.test.js +++ b/tests/track_layouts_logic.test.js @@ -1,7 +1,8 @@ import test from "node:test"; import assert from "node:assert/strict"; -import { normalizeTrackLayout, normalizeTrackLayouts, getTrackLayoutIdAt, getTrackLayoutLabel, nextTrackLayoutLabel, isPracticeSessionType, findRaceSessionBlockingLayoutChange, isTrackLayoutInUse } from "../src/track_layouts_logic.js"; -import { getTrackRecordMs } from "../src/timing_logic.js"; +import { normalizeTrackLayout, normalizeTrackLayouts, getTrackLayoutIdAt, getTrackLayoutLabel, nextTrackLayoutLabel, isPracticeSessionType, findRaceSessionBlockingLayoutChange, isTrackLayoutInUse, getLayoutLapWindowOverride } from "../src/track_layouts_logic.js"; +import { getTrackRecordMs, getSessionLapWindow } from "../src/timing_logic.js"; +import { buildRaceDayPreflight } from "../src/race_day_logic.js"; test("normalizeTrackLayout fills in an id via uid() when missing and coerces startedAt", () => { const withoutId = normalizeTrackLayout({ label: "Layout 1", startedAt: 1000 }, { uid: (prefix) => `${prefix}_generated` }); @@ -128,3 +129,33 @@ test("a layout is in use when a session started on it or a practice lap was driv assert.equal(isTrackLayoutInUse("layout_2", { sessions: [{ trackLayoutId: "layout_2" }] }), true); assert.equal(isTrackLayoutInUse("layout_2", { sessions: [{ trackLayoutId: "layout_1" }], ledger: [{ trackLayoutId: "layout_2" }] }), true, "a mid-session switch leaves laps on layout_2 even though no session started on it"); }); + +test("practice uses its layout's min/max lap time where set; races always keep the event's", () => { + const state = { + events: [{ id: "event_1", mode: "race", raceConfig: { minLapMs: 12000, maxLapMs: 60000 } }], + trackLayouts: [ + { id: "layout_1", label: "Layout 1", startedAt: 1000 }, + { id: "layout_2", label: "Layout 2 (short)", startedAt: 2000, minLapMs: 8000, maxLapMs: 40000 }, + { id: "layout_3", label: "Layout 3 (min only)", startedAt: 3000, minLapMs: 15000 }, + ], + }; + const practice = (trackLayoutId) => ({ eventId: "event_1", type: "open_practice", trackLayoutId }); + assert.deepEqual(getSessionLapWindow(practice("layout_1"), { state }), { minLapMs: 12000, maxLapMs: 60000 }, "no layout values -> the event's"); + assert.deepEqual(getSessionLapWindow(practice("layout_2"), { state }), { minLapMs: 8000, maxLapMs: 40000 }); + assert.deepEqual(getSessionLapWindow(practice("layout_3"), { state }), { minLapMs: 15000, maxLapMs: 60000 }, "only min set -> the event's max stays"); + assert.deepEqual(getSessionLapWindow({ eventId: "event_1", type: "heat", trackLayoutId: "layout_2" }, { state }), { minLapMs: 12000, maxLapMs: 60000 }, "a heat ignores the layout"); + assert.deepEqual(getLayoutLapWindowOverride(state.trackLayouts, { type: "free_practice", trackLayoutId: "layout_2" }), { minLapMs: 8000, maxLapMs: 40000 }); + assert.deepEqual(normalizeTrackLayout({ id: "x", minLapMs: -5, maxLapMs: "40000" }), { ...normalizeTrackLayout({ id: "x" }), minLapMs: 0, maxLapMs: 40000, startedAt: normalizeTrackLayout({ id: "x", minLapMs: -5, maxLapMs: "40000" }).startedAt }); +}); + +test("Race Day preflight shows the layout's lap window for practice", () => { + const state = { + events: [{ id: "event_1", mode: "race", raceConfig: { minLapMs: 12000, maxLapMs: 60000, practiceOnly: true } }], + trackLayouts: [{ id: "layout_2", startedAt: 2000, minLapMs: 8000, maxLapMs: 40000 }], + sessions: [], drivers: [], classes: [], resultsBySession: {}, settings: {}, decoder: {}, + }; + const session = { id: "op", eventId: "event_1", type: "open_practice", trackLayoutId: "layout_2", status: "ready", mode: "race" }; + const lapWindow = buildRaceDayPreflight(state, session, { backendAvailable: true }).checks.find((check) => check.id === "lap_window"); + assert.equal(lapWindow.minLapMs, 8000); + assert.equal(lapWindow.maxLapMs, 40000); +});