feat(layouts): optional min/max lap time per track layout for practice
Each layout can carry its own lap window (set on creation, editable in Settings, saved from Race Day during practice). Open/Free practice on that layout uses it; races always keep the event's values. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
8601954ea2
commit
9d79bcb4d3
13 files changed
+174
-15
No files matched your search
+42
-2
@@ -1246,6 +1246,11 @@ const TRANSLATIONS = {
|
||||
"layouts.bar_current": "Banlayout: {label} - sedan {date}",
|
||||
"layouts.bar_none": "Ingen banlayout satt ännu",
|
||||
"layouts.new": "Ny layout",
|
||||
"layouts.min_lap": "Minsta varvtid (s)",
|
||||
"layouts.new_min_lap_prompt": "Minsta varvtid i sekunder för den nya layouten (tomt = som tävlingen, kan ändras under Inställningar):",
|
||||
"layouts.max_lap": "Längsta varvtid (s)",
|
||||
"layouts.lap_from_event": "som tävlingen",
|
||||
"layouts.lap_window_hint": "Valfritt per layout: gäller träning (Open/Free practice) på den layouten. Tomt = tävlingens min/max. Kval, heat och final använder alltid tävlingens värden.",
|
||||
"layouts.new_prompt": "Namn på den nya banlayouten (gäller från nu). Varv som körs efter bytet räknas till den nya layouten - även i ett Open Practice som redan pågår.",
|
||||
"layouts.stats_for": "Statistik för",
|
||||
"layouts.option_current": "Aktiv layout",
|
||||
@@ -2903,6 +2908,11 @@ const TRANSLATIONS = {
|
||||
"layouts.bar_current": "Track layout: {label} - since {date}",
|
||||
"layouts.bar_none": "No track layout set yet",
|
||||
"layouts.new": "New layout",
|
||||
"layouts.min_lap": "Min lap time (s)",
|
||||
"layouts.new_min_lap_prompt": "Minimum lap time in seconds for the new layout (empty = from the event, can be changed in Settings):",
|
||||
"layouts.max_lap": "Max lap time (s)",
|
||||
"layouts.lap_from_event": "from the event",
|
||||
"layouts.lap_window_hint": "Optional per layout: applies to practice (Open/Free practice) on that layout. Empty = the event's min/max. Qualifying, heats and finals always use the event's values.",
|
||||
"layouts.new_prompt": "Name for the new track layout (active from now). Laps driven after the switch count toward the new layout - even in an Open Practice that is already running.",
|
||||
"layouts.stats_for": "Stats for",
|
||||
"layouts.option_current": "Current layout",
|
||||
@@ -4557,6 +4567,13 @@ function saveOperationalLapWindow(session, minLapSec, maxLapSec) {
|
||||
const event = state.events.find((item) => item.id === session?.eventId);
|
||||
const minLapMs = Math.round(Number(minLapSec) * 1000);
|
||||
const maxLapMs = Math.round(Number(maxLapSec) * 1000);
|
||||
// Practice on a layout: the lap window belongs to that layout, not to the event.
|
||||
if (isPracticeSessionType(session?.type) && session.trackLayoutId && state.trackLayouts?.some((layout) => layout.id === session.trackLayoutId)) {
|
||||
if (!Number.isFinite(minLapMs) || !Number.isFinite(maxLapMs) || minLapMs <= 0 || maxLapMs <= minLapMs) return false;
|
||||
const result = updateTrackLayoutLapWindow(session.trackLayoutId, minLapMs, maxLapMs);
|
||||
if (result.ok) renderView();
|
||||
return result.ok;
|
||||
}
|
||||
if (!event || !Number.isFinite(minLapMs) || !Number.isFinite(maxLapMs) || minLapMs <= 0 || maxLapMs <= minLapMs) return false;
|
||||
event.raceConfig = { ...(event.raceConfig || {}), minLapMs, maxLapMs };
|
||||
saveState();
|
||||
@@ -5056,7 +5073,7 @@ async function refreshServerBackups({ render = true } = {}) {
|
||||
return serverBackups;
|
||||
}
|
||||
|
||||
function addTrackLayout(label, startedAtMs = Date.now()) {
|
||||
function addTrackLayout(label, startedAtMs = Date.now(), { minLapMs = 0, maxLapMs = 0 } = {}) {
|
||||
const blocking = findRaceSessionBlockingLayoutChange(state.sessions);
|
||||
if (blocking) return { ok: false, message: t("settings.track_layout_race_running", { name: blocking.name }) };
|
||||
const layouts = normalizeTrackLayouts(state.trackLayouts, { uid });
|
||||
@@ -5064,7 +5081,9 @@ function addTrackLayout(label, startedAtMs = Date.now()) {
|
||||
if (latest && startedAtMs <= latest.startedAt) {
|
||||
return { ok: false, message: t("settings.track_layout_date_error", { date: new Date(latest.startedAt).toLocaleString() }) };
|
||||
}
|
||||
const layout = { id: uid("layout"), label: String(label || "").trim() || nextTrackLayoutLabel(layouts), startedAt: startedAtMs };
|
||||
const lapWindow = validateLayoutLapWindow(minLapMs, maxLapMs);
|
||||
if (!lapWindow.ok) return lapWindow;
|
||||
const layout = { id: uid("layout"), label: String(label || "").trim() || nextTrackLayoutLabel(layouts), startedAt: startedAtMs, minLapMs: lapWindow.minLapMs, maxLapMs: lapWindow.maxLapMs };
|
||||
layouts.push(layout);
|
||||
state.trackLayouts = normalizeTrackLayouts(layouts, { uid });
|
||||
// A practice session that keeps running across the switch moves onto the new layout;
|
||||
@@ -5086,6 +5105,26 @@ function addTrackLayout(label, startedAtMs = Date.now()) {
|
||||
return { ok: true, layout };
|
||||
}
|
||||
|
||||
// 0 / empty = not set (the event's value applies); when both are set, max must exceed min.
|
||||
function validateLayoutLapWindow(minLapMs, maxLapMs) {
|
||||
const min = Math.max(0, Math.round(Number(minLapMs) || 0));
|
||||
const max = Math.max(0, Math.round(Number(maxLapMs) || 0));
|
||||
if (min && max && max <= min) return { ok: false, message: t("race_day.lap_window_invalid") };
|
||||
return { ok: true, minLapMs: min, maxLapMs: max };
|
||||
}
|
||||
|
||||
function updateTrackLayoutLapWindow(id, minLapMs, maxLapMs) {
|
||||
const lapWindow = validateLayoutLapWindow(minLapMs, maxLapMs);
|
||||
if (!lapWindow.ok) return lapWindow;
|
||||
const layouts = normalizeTrackLayouts(state.trackLayouts, { uid });
|
||||
const layout = layouts.find((item) => item.id === id);
|
||||
if (!layout) return { ok: false, message: t("common.unknown") };
|
||||
Object.assign(layout, { minLapMs: lapWindow.minLapMs, maxLapMs: lapWindow.maxLapMs });
|
||||
state.trackLayouts = layouts;
|
||||
saveState();
|
||||
return { ok: true, layout };
|
||||
}
|
||||
|
||||
function deleteTrackLayout(id) {
|
||||
if (isTrackLayoutInUse(id, { sessions: state.sessions, ledger: state.training?.ledger || [] })) {
|
||||
return { ok: false, message: t("settings.track_layout_delete_blocked") };
|
||||
@@ -5341,6 +5380,7 @@ function renderView() {
|
||||
nextTrackLayoutLabel: () => nextTrackLayoutLabel(state.trackLayouts),
|
||||
addTrackLayout,
|
||||
deleteTrackLayout,
|
||||
updateTrackLayoutLapWindow,
|
||||
updateStatus,
|
||||
updateStatusLoaded,
|
||||
updateCheckPending,
|
||||
|
||||
Reference in new issue
Block a user