feat(layouts): switch track layout mid-practice and view stats per layout

A club can run one Open Practice all season and re-lay the track now and then.
Previously a session's layout was frozen at start and every training lap inherited
it, so a season-long practice stayed on its first layout forever, and changing layout
was hidden under Settings -> Appearance.

- Each practice lap now counts toward the layout active when it was driven; a running
  practice session moves onto a new layout when one is added
- "New layout" strip on Training stats, Race Day and the Dashboard, offered only around
  practice; a running race session blocks layout changes everywhere
- "Stats for" selector (current / older layout / before layouts / all layouts) on
  Training stats and in the driver's mobile profile (?layout= on the public API)
- A layout that has practice laps on it can no longer be deleted
- Fix: the buildDriverTrainingStats wrapper in app.js dropped extra arguments

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
larssandandClaude Opus 5.5 committed 2026-09-27 21:24:44 +02:00
1 parent 196437d25b
commit 627179b95a
22 files changed
+454 -44

No files matched your search

+43 -15
View File
@@ -14,7 +14,7 @@ import { renderRaceFormatField, renderRaceFormatContextCard, getRaceSummaryItems
import { normalizeRaceTeam as normalizeRaceTeamLogic, normalizeStoredRacePreset as normalizeStoredRacePresetLogic, getRaceFormatPresets as getRaceFormatPresetsLogic, applyRaceFormatPreset as applyRaceFormatPresetLogic, buildRaceFormatConfigFromForm as buildRaceFormatConfigFromFormLogic, normalizeEvent as normalizeEventLogic, normalizeBrandingConfig as normalizeBrandingConfigLogic, resolveEventBranding as resolveEventBrandingLogic, getRaceManageStatuses as getRaceManageStatusesLogic, buildDefaultRaceWizardDraft as buildDefaultRaceWizardDraftLogic, getRaceWizardPreset as getRaceWizardPresetLogic, applyRaceWizardPresetDefaults as applyRaceWizardPresetDefaultsLogic, ensureRaceParticipantsConfigured as ensureRaceParticipantsConfiguredLogic, buildRaceSession as buildRaceSessionLogic, buildOpenPracticeBundle as buildOpenPracticeBundleLogic, buildTrackSession as buildTrackSessionLogic, createSponsorRounds as createSponsorRoundsLogic, buildRaceSessionsFromWizard as buildRaceSessionsFromWizardLogic, getRaceWizardSessionPlan as getRaceWizardSessionPlanLogic, getEventDrivers as getEventDriversLogic, getEventTeams as getEventTeamsLogic, getTeamDriverPool as getTeamDriverPoolLogic, reassignTeamMembers as reassignTeamMembersLogic, findEventTeamForPassing as findEventTeamForPassingLogic, generateQualifyingForRace as generateQualifyingForRaceLogic, reseedUpcomingQualifying as reseedUpcomingQualifyingLogic, moveDriversIntoQualifyingHeat as moveDriversIntoQualifyingHeatLogic, parseQualifyingHeatName as parseQualifyingHeatNameLogic, generateFinalsForRace as generateFinalsForRaceLogic, applyBumpsForRace as applyBumpsForRaceLogic, buildEventSchedule as buildEventScheduleLogic } from "./event_race_logic.js";
import { getSessionTypeLabel as getSessionTypeLabelLogic, getStatusLabel as getStatusLabelLogic, isUntimedSession as isUntimedSessionLogic, getActiveSession as getActiveSessionLogic, getSessionTargetMs as getSessionTargetMsLogic, getSessionLapWindow as getSessionLapWindowLogic, isCountedPassing as isCountedPassingLogic, getVisiblePassings as getVisiblePassingsLogic, getPassingValidationLabel as getPassingValidationLabelLogic, getSessionTiming as getSessionTimingLogic, ensureSessionResult as ensureSessionResultLogic, buildLeaderboard as buildLeaderboardLogic, formatLapDelta as formatLapDeltaLogic, formatLeaderboardGap as formatLeaderboardGapLogic, getCompetitorElapsedMs as getCompetitorElapsedMsLogic, getCompetitorPassings as getCompetitorPassingsLogic, getCompetitorSeedMetric as getCompetitorSeedMetricLogic, getSessionEntrants as getSessionEntrantsLogic, buildPracticeStandings as buildPracticeStandingsLogic, getQualifyingPointsValue as getQualifyingPointsValueLogic, isHighPointsTable as isHighPointsTableLogic, compareNumberSet as compareNumberSetLogic, buildQualifyingTieBreakNote as buildQualifyingTieBreakNoteLogic, hasQualifyingPrimaryTie as hasQualifyingPrimaryTieLogic, buildQualifyingStandings as buildQualifyingStandingsLogic, formatTeamActiveMemberLabel as formatTeamActiveMemberLabelLogic, buildTeamRaceStandings as buildTeamRaceStandingsLogic, buildSessionChannelStats as buildSessionChannelStatsLogic, buildTeamStintLog as buildTeamStintLogLogic, getSessionGridEntries as getSessionGridEntriesLogic, getSessionGridOrder as getSessionGridOrderLogic, ensureSessionDriverOrder as ensureSessionDriverOrderLogic, buildFinalStandings as buildFinalStandingsLogic, getTrackRecordMs as getTrackRecordMsLogic } from "./timing_logic.js";
import { normalizeTrackLayouts, getTrackLayoutIdAt, getTrackLayoutLabel, nextTrackLayoutLabel } from "./track_layouts_logic.js";
import { normalizeTrackLayouts, getTrackLayoutIdAt, getTrackLayoutLabel, nextTrackLayoutLabel, findRaceSessionBlockingLayoutChange, isPracticeSessionType, isTrackLayoutInUse } from "./track_layouts_logic.js";
import { renderDashboardView, renderClassesView, renderDriversView, renderCarsView } from "./core_views.js";
@@ -259,13 +259,13 @@ const processDecoderMessage = (msg, decoderRole = "main") => processDecoderMessa
triggerRaceAudio,
getTrackRecordMs,
}, decoderRole);
const renderDashboard = () => renderDashboardView({ state, dom, t, backend, getActiveSession, getStatusLabel, getSessionTypeLabel, getEventName, getModeLabel, getBackendUrl, formatLap, renderSessionsTable, setCurrentView: (view) => { currentView = view; }, updateViewUrl, renderNav, renderView, connectDecoder, disconnectDecoder, openOverlayWindow, ensureAudioContext, playPassingBeep, playFinishSiren, escapeHtml });
const renderDashboard = () => renderDashboardView({ addTrackLayout, state, dom, t, backend, getActiveSession, getStatusLabel, getSessionTypeLabel, getEventName, getModeLabel, getBackendUrl, formatLap, renderSessionsTable, setCurrentView: (view) => { currentView = view; }, updateViewUrl, renderNav, renderView, connectDecoder, disconnectDecoder, openOverlayWindow, ensureAudioContext, playPassingBeep, playFinishSiren, escapeHtml });
const renderClasses = () => renderClassesView({ state, dom, t, selectedClassEditId: () => selectedClassEditId, setSelectedClassEditId: (value) => { selectedClassEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell });
const renderDrivers = () => renderDriversView({ state, dom, t, driverBrandFilter: () => driverBrandFilter, setDriverBrandFilter: (value) => { driverBrandFilter = value; }, selectedDriverEditId: () => selectedDriverEditId, setSelectedDriverEditId: (value) => { selectedDriverEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell, normalizeDriver, getClassName });
const renderCars = () => renderCarsView({ state, dom, t, carBrandFilter: () => carBrandFilter, setCarBrandFilter: (value) => { carBrandFilter = value; }, selectedCarEditId: () => selectedCarEditId, setSelectedCarEditId: (value) => { selectedCarEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell, normalizeCar });
const renderGuide = () => renderGuideView({ dom, t });
const renderRaceDay = () => renderRaceDayView({
state, dom, t, escapeHtml, formatLap, formatCountdown, formatElapsedClock,
addTrackLayout, renderView, state, dom, t, escapeHtml, formatLap, formatCountdown, formatElapsedClock,
getEventName, getSessionTypeLabel, getStatusLabel, getStartModeLabel,
getSessionTiming, getSessionGridEntries, buildRaceDayQueue, buildRaceDayPreflight,
backendAvailable: backend.available,
@@ -328,7 +328,7 @@ const syncTrainingLedger = () => {
state.training = syncTrainingLedgerLogic(state.training, state, { uid });
return state.training;
};
const buildDriverTrainingStats = (trainingState, driverId, classId = "") => buildDriverTrainingStatsLogic(trainingState, driverId, classId);
const buildDriverTrainingStats = (trainingState, driverId, classId = "", options = {}) => buildDriverTrainingStatsLogic(trainingState, driverId, classId, options);
const buildDriverActivePracticeStats = (trainingState, driverId, nowTs = Date.now(), classId = "") => buildDriverActivePracticeStatsLogic(trainingState, driverId, nowTs, classId);
const buildEvenLapsProgress = (trainingState, driverId, classId, config, nowTs = Date.now()) => buildEvenLapsProgressLogic(trainingState, driverId, classId, config, nowTs);
const buildStepTrainingProgress = (trainingState, driverId, classId, config, nowTs = Date.now()) => buildStepTrainingProgressLogic(trainingState, driverId, classId, config, nowTs);
@@ -343,7 +343,7 @@ const renderArchive = () => renderResultsArchiveView({
getSelectedSessionId: () => archiveSelectedSessionId, setSelectedSessionId: (value) => { archiveSelectedSessionId = value; },
getTrackLayoutLabel,
});
const renderTraining = () => renderTrainingView({ state, dom, t, escapeHtml, formatLap, formatRaceClock, uid, saveState, syncStateToBackend, renderView, normalizeTrainingState, syncTrainingLedger, buildDriverTrainingStats, buildDriverTimingChannelStats: buildDriverTimingChannelStatsLogic, buildDriverActivePracticeStats, buildEvenLapsProgress, buildStepTrainingProgress, buildTrainingRecommendation, getTrainingGoalProgress, getNextTrainingMilestone, buildTrainingMissions: buildTrainingMissionsLogic, buildTrainingHighlights: buildTrainingHighlightsLogic, getClubTrainingGoalProgress: getClubTrainingGoalProgressLogic, countDriverExerciseSessions: countDriverExerciseSessionsLogic, countExerciseSessions: countExerciseSessionsLogic, buildTrainingPaceBuckets: buildTrainingPaceBucketsLogic, buildTrainingWeekdayStats: buildTrainingWeekdayStatsLogic, buildTrainingStintAnalysis: buildTrainingStintAnalysisLogic, buildTrainingMarkerComparisons: buildTrainingMarkerComparisonsLogic, getSelectedDriverId: () => selectedTrainingDriverId, setSelectedDriverId: (value) => { selectedTrainingDriverId = value; updateViewUrl("training", value, selectedTrainingClassId); }, getSelectedClassId: () => selectedTrainingClassId, setSelectedClassId: (value) => { selectedTrainingClassId = value; updateViewUrl("training", selectedTrainingDriverId, value); } });
const renderTraining = () => renderTrainingView({ addTrackLayout, state, dom, t, escapeHtml, formatLap, formatRaceClock, uid, saveState, syncStateToBackend, renderView, normalizeTrainingState, syncTrainingLedger, buildDriverTrainingStats, buildDriverTimingChannelStats: buildDriverTimingChannelStatsLogic, buildDriverActivePracticeStats, buildEvenLapsProgress, buildStepTrainingProgress, buildTrainingRecommendation, getTrainingGoalProgress, getNextTrainingMilestone, buildTrainingMissions: buildTrainingMissionsLogic, buildTrainingHighlights: buildTrainingHighlightsLogic, getClubTrainingGoalProgress: getClubTrainingGoalProgressLogic, countDriverExerciseSessions: countDriverExerciseSessionsLogic, countExerciseSessions: countExerciseSessionsLogic, buildTrainingPaceBuckets: buildTrainingPaceBucketsLogic, buildTrainingWeekdayStats: buildTrainingWeekdayStatsLogic, buildTrainingStintAnalysis: buildTrainingStintAnalysisLogic, buildTrainingMarkerComparisons: buildTrainingMarkerComparisonsLogic, getSelectedDriverId: () => selectedTrainingDriverId, setSelectedDriverId: (value) => { selectedTrainingDriverId = value; updateViewUrl("training", value, selectedTrainingClassId); }, getSelectedClassId: () => selectedTrainingClassId, setSelectedClassId: (value) => { selectedTrainingClassId = value; updateViewUrl("training", selectedTrainingDriverId, value); } });
const applyCompetitorCorrection = (session, row, options = {}) => {
const result = applyCompetitorCorrectionLogic(session, row, options, { ensureSessionResult, uid, t, formatLap, saveState });
if (!options.reset && ((Number(options.timeMsDelta || 0) > 0) || (Number(options.lapDelta || 0) < 0))) {
@@ -1064,6 +1064,14 @@ const TRANSLATIONS = {
"guide.tab_run": "Köra ett race",
"guide.tab_training": "Träning & resultat",
"guide.tab_videos": "Videoguider",
"layouts.bar_current": "Banlayout: {label} - sedan {date}",
"layouts.bar_none": "Ingen banlayout satt ännu",
"layouts.new": "Ny layout",
"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",
"layouts.option_none": "Utan layout (före första layouten)",
"layouts.option_all": "Alla layouter",
"tts.title": "Röstmotor",
"tts.hint": "Lokal röst (Piper) låter mer naturligt än webbläsarens röst och fungerar helt utan internet. Installera en gång (kräver internet just då), sedan körs allt lokalt. Om Piper saknas eller dröjer används webbläsarens röst automatiskt.",
"tts.engine": "Röstmotor",
@@ -1578,7 +1586,7 @@ const TRANSLATIONS = {
"settings.logo_clear": "Rensa logo",
"settings.logo_note": "Logotypen visas i huvudmenyn, overlay och publik träningsprofil. PDF-export försöker bädda in den via backend.",
"settings.track_layouts": "Banlayouter",
"settings.track_layouts_hint": "Lägg till en ny banlayout varje gång banan byggs om (t.ex. vid inomhuskörning i samma lokal), så jämförs personbästa, banrekord och \"jämn fart\"-ljudet bara mot pass körda på samma layout. En session räknas till den layout som gällde när den startades. Om ingen layout läggs till fungerar allt som idag.",
"settings.track_layouts_hint": "Lägg till en ny banlayout varje gång banan byggs om (t.ex. vid inomhuskörning i samma lokal), så jämförs personbästa, banrekord och \"jämn fart\"-ljudet bara mot pass körda på samma layout. Varje träningsvarv räknas till den layout som gällde när varvet kördes - byt layout mitt i ett pågående Open Practice så hamnar varven före och efter bytet på rätt layout. Layouter byts bara kring träning: inte medan ett racepass (kval, heat, final) pågår. Snabbast byter du med Ny layout på Träningsstatistik, Race Day eller Översikt. Om ingen layout läggs till fungerar allt som idag.",
"settings.track_layout_label": "Namn (valfritt)",
"settings.track_layout_started_at": "Gäller från",
"settings.track_layout_add": "Lägg till layout",
@@ -1587,7 +1595,8 @@ const TRANSLATIONS = {
"settings.track_layout_invalid_date": "Ogiltigt datum.",
"settings.track_layout_date_error": "Ny layout måste börja gälla efter den senaste layoutens startdatum ({date}).",
"settings.track_layout_delete_confirm": "Ta bort banlayouten \"{label}\"?",
"settings.track_layout_delete_blocked": "Kan inte tas bort - en eller flera sessioner är redan kopplade till den här layouten.",
"settings.track_layout_delete_blocked": "Kan inte tas bort - sessioner eller träningsvarv är redan kopplade till den här layouten.",
"settings.track_layout_race_running": "Kan inte byta banlayout medan {name} pågår - layouter byts bara mellan eller under träningspass. Avsluta racepasset först.",
"settings.update_title": "Uppdateringar",
"settings.update_current_version": "Installerad version",
"settings.update_checking": "Kontrollerar om det finns en ny version...",
@@ -1891,7 +1900,7 @@ const TRANSLATIONS = {
"guide.archive_3": "3. Klicka Visa på en rad för att se resultat, straff/korrigeringar och varvhistorik per förare för den sessionen.",
"guide.archive_4": "4. Exportera samma PDF- och racepaket (JSON)-filer som redan finns i Manage Event, direkt från arkivet.",
"guide.archive_5": "5. Att radera ett event eller en session tar bort racets data överallt, inklusive de råa varvraderna i databasen - men påverkar aldrig förarens beständiga träningsstatistik, som redan sparas separat.",
"guide.archive_6": "6. Kör klubben på flera banlayouter (t.ex. inomhus i samma lokal) - lägg till varje ny layout under Inställningar. Arkivet visar vilken layout varje session kördes på, och personbästa/banrekord jämförs bara mot pass på samma layout.",
"guide.archive_6": "6. Kör klubben på flera banlayouter (t.ex. inomhus i samma lokal) - tryck Ny layout (på Träningsstatistik, Race Day eller Översikt) när banan byggts om; det går även mitt i ett pågående Open Practice. Arkivet visar vilken layout varje session kördes på, och personbästa/banrekord jämförs bara mot samma layout. Under Träningsstatistik och i förarens mobilprofil väljer du Statistik för: aktiv layout, en äldre layout eller Alla layouter.",
"overlay.title": "Overlay",
"overlay.subtitle": "Extern leaderboard-skärm",
"overlay.no_active": "Ingen aktiv session vald.",
@@ -2665,6 +2674,14 @@ const TRANSLATIONS = {
"guide.tab_run": "Run a race",
"guide.tab_training": "Training & results",
"guide.tab_videos": "Video guides",
"layouts.bar_current": "Track layout: {label} - since {date}",
"layouts.bar_none": "No track layout set yet",
"layouts.new": "New layout",
"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",
"layouts.option_none": "No layout (before the first layout)",
"layouts.option_all": "All layouts",
"tts.title": "Voice engine",
"tts.hint": "The local voice (Piper) sounds more natural than the browser voice and works with no internet at all. Install once (needs internet just then), after that everything runs locally. If Piper is missing or slow, the browser voice is used automatically.",
"tts.engine": "Voice engine",
@@ -3179,7 +3196,7 @@ const TRANSLATIONS = {
"settings.logo_clear": "Clear logo",
"settings.logo_note": "The logo is shown in the main menu, overlays, and public training profiles. PDF export attempts to embed it via the backend.",
"settings.track_layouts": "Track layouts",
"settings.track_layouts_hint": "Add a new track layout every time the track gets rebuilt (e.g. running indoors in the same building), so personal bests, the track record and the \"stable pace\" cue only compare against laps run on the same layout. A session is attributed to whichever layout was active when it started. With no layouts added, everything behaves exactly as it does today.",
"settings.track_layouts_hint": "Add a new track layout every time the track gets rebuilt (e.g. running indoors in the same building), so personal bests, the track record and the \"stable pace\" cue only compare against laps run on the same layout. Each practice lap counts toward the layout active when that lap was driven - switch layout in the middle of a running Open Practice and laps before and after the switch land on the right layout. Layouts only change around practice: not while a race session (qualifying, heat, final) is running. The quickest way is New layout on Training stats, Race Day or the Dashboard. With no layouts added, everything behaves exactly as it does today.",
"settings.track_layout_label": "Name (optional)",
"settings.track_layout_started_at": "Active from",
"settings.track_layout_add": "Add layout",
@@ -3188,7 +3205,8 @@ const TRANSLATIONS = {
"settings.track_layout_invalid_date": "Invalid date.",
"settings.track_layout_date_error": "A new layout must start after the latest layout's start date ({date}).",
"settings.track_layout_delete_confirm": "Delete the track layout \"{label}\"?",
"settings.track_layout_delete_blocked": "Can't delete - one or more sessions are already linked to this layout.",
"settings.track_layout_delete_blocked": "Can't delete - sessions or practice laps are already linked to this layout.",
"settings.track_layout_race_running": "Can't change the track layout while {name} is running - layouts only change between or during practice sessions. Finish the race session first.",
"settings.update_title": "Updates",
"settings.update_current_version": "Installed version",
"settings.update_checking": "Checking for a new version...",
@@ -3492,7 +3510,7 @@ const TRANSLATIONS = {
"guide.archive_3": "3. Click View on a row to see that session's results, penalties/corrections and per-driver lap history.",
"guide.archive_4": "4. Export the same PDF and race-package (JSON) files already available in Manage Event, directly from the archive.",
"guide.archive_5": "5. Deleting an event or session removes the race's data everywhere, including the raw lap rows in the database - but never affects a driver's durable training statistics, which are already stored separately.",
"guide.archive_6": "6. Running your club across several track layouts (e.g. indoors in the same building) - add each new layout under Settings. The archive shows which layout each session ran on, and personal bests/track records only compare against laps on the same layout.",
"guide.archive_6": "6. Running your club across several track layouts (e.g. indoors in the same building) - press New layout (on Training stats, Race Day or the Dashboard) when the track has been rebuilt; it works even in the middle of a running Open Practice. The archive shows which layout each session ran on, and personal bests/track records only compare against the same layout. On Training stats and in the driver's mobile profile, pick Stats for: the current layout, an older layout, or All layouts.",
"overlay.title": "Overlay",
"overlay.subtitle": "External leaderboard screen",
"overlay.no_active": "No active session selected.",
@@ -4793,20 +4811,30 @@ async function refreshServerBackups({ render = true } = {}) {
return serverBackups;
}
function addTrackLayout(label, startedAtMs) {
function addTrackLayout(label, startedAtMs = Date.now()) {
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 });
const latest = layouts.at(-1);
if (latest && startedAtMs <= latest.startedAt) {
return { ok: false, message: t("settings.track_layout_date_error", { date: new Date(latest.startedAt).toLocaleString() }) };
}
layouts.push({ id: uid("layout"), label: String(label || "").trim() || nextTrackLayoutLabel(layouts), startedAt: startedAtMs });
const layout = { id: uid("layout"), label: String(label || "").trim() || nextTrackLayoutLabel(layouts), startedAt: startedAtMs };
layouts.push(layout);
state.trackLayouts = normalizeTrackLayouts(layouts, { uid });
// A practice session that keeps running across the switch moves onto the new layout;
// its earlier laps stay on the old one because training laps are tagged per lap.
if (startedAtMs <= Date.now()) {
state.sessions.forEach((session) => {
if (isPracticeSessionType(session.type) && ["running", "paused"].includes(session.status)) session.trackLayoutId = layout.id;
});
}
saveState();
return { ok: true };
return { ok: true, layout };
}
function deleteTrackLayout(id) {
if (state.sessions.some((session) => session.trackLayoutId === id)) {
if (isTrackLayoutInUse(id, { sessions: state.sessions, ledger: state.training?.ledger || [] })) {
return { ok: false, message: t("settings.track_layout_delete_blocked") };
}
state.trackLayouts = normalizeTrackLayouts(state.trackLayouts, { uid }).filter((layout) => layout.id !== id);