feat(race-day): offer Create finals once every qualifying heat has run (1.84.0)

This commit is contained in:
larssand committed 2026-11-08 20:57:28 +01:00
1 parent ebdc6104e6
commit 0a4c017e44
9 files changed
+112 -7

No files matched your search

+15 -4
View File
@@ -5,7 +5,7 @@ import { escapeHtml } from "./html_escape.js";
import { getOverlayModeLabel, buildOverlayPanels, renderOverlaySidePanel, renderOverlayLeaderboard, renderTeamOverlay, renderObsOverlay } from "./overlays.js";
import { renderSettings, openSettingsTab } from "./settings.js";
import { buildRaceDayQueue, buildRaceDayPreflight, getRaceDriverIds } from "./race_day_logic.js";
import { buildRaceDayQueue, buildRaceDayPreflight, getRaceDriverIds, shouldOfferFinals } from "./race_day_logic.js";
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";
@@ -21,7 +21,7 @@ import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudio
import { renderRaceFormatField, renderRaceFormatContextCard, getRaceSummaryItems, getRaceSummaryWarnings, renderManageStatusBadge, renderRaceWizardSteps, renderRaceWizardContent, renderRaceStandingsTable } from "./race_setup_ui.js";
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, normalizeHeatOrder, planSeedingGroups } from "./event_race_logic.js";
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, orderSessionsForRunning, buildEventSchedule as buildEventScheduleLogic, normalizeHeatOrder, planSeedingGroups } from "./event_race_logic.js";
import { getFinishWait as getFinishWaitLogic, getSessionTypeLabel as getSessionTypeLabelLogic, getStatusLabel as getStatusLabelLogic, isUntimedSession as isUntimedSessionLogic, getActiveSession as getActiveSessionLogic, getLiveSession as getLiveSessionLogic, 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, findRaceSessionBlockingLayoutChange, isPracticeSessionType, isTrackLayoutInUse } from "./track_layouts_logic.js";
@@ -754,6 +754,13 @@ const renderRaceDay = () => renderRaceDayView({
renderDaySchedule, bindDaySchedule, renderDayCall, bindDayCall,
setCompetitorLapStatus,
...speakerPanelDeps,
shouldOfferFinals: (eventId) => shouldOfferFinals(state, eventId),
createFinalsForEvent: (eventId) => {
const event = state.events.find((item) => item.id === eventId);
if (!event || !generateFinalsForRace(event)) return null;
saveState();
return orderSessionsForRunning(getSessionsForEvent(eventId), event.sessionOrder).find((session) => session.type === "final") || null;
},
renderRaceOverview: (session) => renderRaceOverviewFor(state.events.find((event) => event.id === session?.eventId)),
bindRaceOverview: (root, session) => bindRaceOverviewFor(root, state.events.find((event) => event.id === session?.eventId)),
addTrackLayout, renderView, state, dom, t, escapeHtml, formatLap, formatCountdown, formatElapsedClock,
@@ -1296,6 +1303,8 @@ const TRANSLATIONS = {
"race_day.go_next": "Nästa: {name}",
"race_day.hidden_sessions": "({count} från andra dagar dolda)",
"race_day.restart_session": "Kör om",
"race_day.create_finals": "Alla kval är körda – skapa finaler",
"race_day.create_finals_hint": "Skapar A-, B- och C-finaler från kvalresultatet, samma som Hantera → Format → Skapa finaler från kval.",
"race_day.reset_session_hint": "Avbrutet eller klart heat, kval eller final: varv, resultat och klocka nollställs och den kan startas igen.",
"race_day.reset_session_confirm": "Kör om \"{name}\"?\n\nAlla varv och resultat nollställs och klockan står på noll - sedan trycker du Starta. Det går inte att ångra.",
"race_day.new_practice_day": "Nollställ – ny träningsdag",
@@ -2305,7 +2314,7 @@ const TRANSLATIONS = {
"guide.day_flow_5": "5. Kvalet skapas direkt som riktiga heat (Q1 H1, Q1 H2 …) enligt Förare per kvalheat och Antal kvalrundor. Antal varv, tider och starttyp kan finjusteras under Hantera → Raceformat.",
"guide.day_flow_6": "6. När practice är kört: Hantera → Skapa kval från practice. Kvalheaten byggs då om efter practice-resultatet och ersätter de gamla, så inga dubbletter uppstår. Hoppar du över det körs kvalet i deltagarlistans ordning.",
"guide.day_flow_7": "7. Kör kvalet på Race Day. Flest varv vinner och vid lika antal varv vinner lägst total tid. Vill du sortera om kommande heat efter aktuell ranking: Reseeda kommande kval.",
"guide.day_flow_8": "8. När alla kval är körda: Hantera → Skapa finaler från kval. A-, B- och C-finaler byggs enligt Förare per final, antal finalheat och räknade finalheat.",
"guide.day_flow_8": "8. När alla kval är körda: tryck 🏁 Alla kval är körda – skapa finaler på Race Day (eller Hantera → Format → Skapa finaler från kval). A-, B- och C-finaler byggs enligt Förare per final, antal finalheat och räknade finalheat.",
"guide.day_flow_9": "9. Kör finalerna, lägsta finalen först. Vid gridstart räknar speakern ner 10 … 3, säger \"Start på tonen\" och sedan kommer tonen. Med bump-ups: Applicera bump-ups när en lägre final är klar. Dagens schema på Race Day lägger alla klasser i en körordning med tider.",
"guide.race_wizard_title": "Create Race Wizard",
"guide.race_wizard_1": "1. Börja i Race Setup och använd wizarden när du skapar ett nytt race, i stället för att bygga allt direkt i Hantera.",
@@ -3535,6 +3544,8 @@ const TRANSLATIONS = {
"race_day.go_next": "Next: {name}",
"race_day.hidden_sessions": "({count} from other days hidden)",
"race_day.restart_session": "Run again",
"race_day.create_finals": "All qualifying run – create finals",
"race_day.create_finals_hint": "Creates the A, B and C finals from the qualifying results, same as Manage → Format → Create finals from qualifying.",
"race_day.reset_session_hint": "A stopped or finished heat, qualifier or final: laps, results and clock are reset and it can be started again.",
"race_day.reset_session_confirm": "Run \"{name}\" again?\n\nEvery lap and result is cleared and the clock is back at zero - then press Start. This cannot be undone.",
"race_day.new_practice_day": "Reset – new practice day",
@@ -4544,7 +4555,7 @@ const TRANSLATIONS = {
"guide.day_flow_5": "5. Qualifying is created straight away as real heats (Q1 H1, Q1 H2 …) by Drivers per qualifying heat and Qualifying rounds. Laps, times and start type can be fine-tuned under Manage → Race format.",
"guide.day_flow_6": "6. When practice has run: Manage → Generate qualifying from practice. The heats are rebuilt from the practice result and replace the old ones, so nothing is duplicated. Skip it and qualifying runs in entry-list order.",
"guide.day_flow_7": "7. Run qualifying on Race Day. Most laps wins; on equal laps the lowest total time wins. To re-sort the coming heats by the current ranking: Reseed upcoming qualifying.",
"guide.day_flow_8": "8. When all qualifying has run: Manage → Generate finals from qualifying. A, B and C finals are built by Drivers per final, final legs and counted legs.",
"guide.day_flow_8": "8. When all qualifying has run: press 🏁 All qualifying run – create finals on Race Day (or Manage → Format → Create finals from qualifying). A, B and C finals are built by Drivers per final, final legs and counted legs.",
"guide.day_flow_9": "9. Run the finals, lowest final first. On a grid start the announcer counts 10 … 3, says \"Starting to the sound of the tone\" and the tone follows. With bump-ups: Apply bump-ups when a lower final is done. Today's schedule on Race Day puts every class in one running order with times.",
"guide.race_wizard_title": "Create Race Wizard",
"guide.race_wizard_1": "1. Start in Race Setup and use the wizard when creating a new race instead of building everything directly in Manage.",
+14
View File
@@ -159,3 +159,17 @@ export function buildRaceDayPreflight(state, session, { backendAvailable = false
return { ready: !checks.some((item) => item.level === "error"), checks };
}
// Race Day offers "Create finals" once every heat the finals are seeded from (qualifying, or
// practice when the race seeds finals from practice) has run and the race has no finals yet.
// Not for practice-only races or sponsor events, which have their own flow.
export function shouldOfferFinals(state, eventId) {
const event = (state?.events || []).find((item) => item.id === eventId);
if (!event || event.raceConfig?.practiceOnly || event.mode === "track") return false;
const sessions = (state.sessions || []).filter((session) => session.eventId === eventId);
const sourceType = event.raceConfig?.finalsSource === "practice" ? "practice" : "qualification";
const source = sessions.filter((session) => session.type === sourceType);
return source.length > 0
&& source.every((session) => ["finished", "stopped"].includes(session.status))
&& !sessions.some((session) => session.type === "final");
}
+8
View File
@@ -266,6 +266,7 @@ export function renderRaceDayView(deps) {
renderDaySchedule = () => "", bindDaySchedule = () => {}, renderDayCall = () => "", bindDayCall = () => {},
renderRaceOverview = () => "", bindRaceOverview = () => {},
renderSpeakerPanel = () => "", bindSpeakerPanel = () => {},
shouldOfferFinals = () => false, createFinalsForEvent = () => null,
} = deps;
const queue = buildRaceDayQueue(state);
const session = queue.current;
@@ -344,6 +345,7 @@ export function renderRaceDayView(deps) {
${sessionChoices.hidden || showAllSessions ? `<label class="race-day-show-all"><input type="checkbox" id="raceDayShowAllSessions" ${showAllSessions ? "checked" : ""} /> ${escapeHtml(t("race_day.show_all_sessions"))}${sessionChoices.hidden ? ` <span class="hint">${escapeHtml(t("race_day.hidden_sessions", { count: sessionChoices.hidden }))}</span>` : ""}</label>` : ""}
${session && !isSelected ? `<button id="raceDayActivate" class="btn" type="button">${t("race_day.activate")}</button>` : ""}
<div class="race-day-actions">
${session && ["finished", "stopped"].includes(session.status) && shouldOfferFinals(session.eventId) ? `<button id="raceDayCreateFinals" class="btn btn-go" type="button" title="${escapeHtml(t("race_day.create_finals_hint"))}">🏁 ${escapeHtml(t("race_day.create_finals"))}</button>` : ""}
${session && ["finished", "stopped"].includes(session.status) && queue.next ? `<button id="raceDayNextSession" class="btn btn-go" type="button" data-race-day-select="${escapeHtml(queue.next.id)}">▶ ${escapeHtml(t("race_day.go_next", { name: queue.next.name }))}</button>` : ""}
${usesPrologue
? renderPrologueControls({ t, escapeHtml, getDefaultPrologueSec }, session, warmupForChecks, canStart)
@@ -429,6 +431,12 @@ export function renderRaceDayView(deps) {
const choose = (sessionId) => sessionId && selectSession(sessionId);
document.getElementById("raceDayActivate")?.addEventListener("click", () => choose(session?.id));
document.querySelectorAll("[data-race-day-select]").forEach((node) => node.addEventListener("click", () => choose(node.dataset.raceDaySelect)));
// All heats the finals come from have run: create the finals and go to the first one.
document.getElementById("raceDayCreateFinals")?.addEventListener("click", () => {
const first = createFinalsForEvent(session?.eventId);
if (first) choose(first.id);
else renderView();
});
document.getElementById("raceDayLapWindowForm")?.addEventListener("submit", (event) => {
event.preventDefault();
if (!session) return;