feat(race-day): start heats with an EFRA/IFMAR count-down and flying start
Race Day Start now runs a count-down (Go, 30 s - 5 min, default per event) with calls every minute, 30 s and 10 s, grid call and 9..3 count for grid starts, hold/resume/+1 min/to 30 s/to 10 s/Go now, and starts the heat by itself when it runs out. The transponder check runs during the count-down, replacing the separate warm-up. Adds a flying start mode (horn + clock is running, own clock per car) as the qualifying default, and the latest personal clock start rules from EFRA 9.3 / IFMAR 4.2.3 for flying and staggered starts. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
1bc75f8ec1
commit
5bfb67ea02
27 files changed
+884
-334
No files matched your search
+84
-56
@@ -1,5 +1,6 @@
|
||||
import { isPracticeSessionType } from "./track_layouts_logic.js";
|
||||
import { renderTrackLayoutBar, bindTrackLayoutBar } from "./track_layout_bar.js";
|
||||
import { PROLOGUE_OPTIONS_SEC, formatPrologueOption } from "./prologue_logic.js";
|
||||
export function getRaceDayCheckAction(item, session) {
|
||||
if (item.level === "ok") return null;
|
||||
if (["backend", "decoder", "split_decoder", "pit_decoders", "audio"].includes(item.id)) {
|
||||
@@ -54,11 +55,11 @@ function renderQueueSession(session, positionKey, deps) {
|
||||
}
|
||||
|
||||
|
||||
// --- Warm-up / transponder check -------------------------------------------------------
|
||||
// Shown for a selected, not-yet-started race-format heat with driver transponders. The panel
|
||||
// re-renders on its own (refreshRaceDayWarmup) on every passing, without rebuilding the page.
|
||||
// --- Prologue (count-down) and transponder check ---------------------------------------
|
||||
// A race-format heat is started through a prologue (see prologue_logic.js): Start begins the
|
||||
// count-down, and the check panel shows who has crossed the line since. The panel re-renders
|
||||
// on its own (refreshRaceDayWarmup) on every passing, without rebuilding the page.
|
||||
let lastWarmupDeps = null;
|
||||
let warmupClockTimer = null;
|
||||
|
||||
function showsWarmupPanel(session) {
|
||||
return Boolean(session && session.status === "ready" && session.mode !== "track" && session.type !== "team_race" && !isPracticeSessionType(session.type));
|
||||
@@ -69,10 +70,31 @@ function formatMmSs(ms) {
|
||||
return `${Math.floor(total / 60)}:${String(total % 60).padStart(2, "0")}`;
|
||||
}
|
||||
|
||||
function renderPrologueControls({ t, escapeHtml, getDefaultPrologueSec }, session, check, canStart) {
|
||||
const prologue = check?.prologue;
|
||||
if (!prologue) {
|
||||
const defaultSec = getDefaultPrologueSec(session);
|
||||
return `
|
||||
<label class="prologue-length">${t("prologue.length")}
|
||||
<select id="raceDayPrologueLength">${PROLOGUE_OPTIONS_SEC.map((seconds) => `<option value="${seconds}" ${seconds === defaultSec ? "selected" : ""}>${escapeHtml(formatPrologueOption(seconds, t))}</option>`).join("")}</select>
|
||||
</label>
|
||||
<button id="raceDayStart" class="btn btn-primary" type="button" ${canStart ? "" : "disabled"}>${t("prologue.start")}</button>`;
|
||||
}
|
||||
const held = prologue.heldRemainingMs !== null;
|
||||
return `
|
||||
<strong class="prologue-clock ${held ? "is-held" : ""}" data-prologue-clock>${formatMmSs(check.remainingMs)}</strong>
|
||||
<span class="pill ${held ? "pill-warn" : "pill-green"}">${t(held ? "prologue.held" : "prologue.running")}</span>
|
||||
<button class="btn ${held ? "btn-primary" : ""}" type="button" data-prologue="${held ? "resume" : "hold"}">${t(held ? "prologue.resume" : "prologue.hold")}</button>
|
||||
<button class="btn" type="button" data-prologue="plus">${t("prologue.plus_minute")}</button>
|
||||
<button class="btn" type="button" data-prologue="to30">${t("prologue.to_30")}</button>
|
||||
<button class="btn" type="button" data-prologue="to10">${t("prologue.to_10")}</button>
|
||||
<button class="btn btn-primary" type="button" data-prologue="go">${t("prologue.go")}</button>
|
||||
<button class="btn btn-danger" type="button" data-prologue="cancel">${t("prologue.cancel")}</button>`;
|
||||
}
|
||||
|
||||
function renderWarmupPanelInner({ t, escapeHtml, getRaceDayWarmupCheck }, session) {
|
||||
const check = getRaceDayWarmupCheck(session);
|
||||
const warmup = check.warmup;
|
||||
const remaining = warmup && !warmup.stopped ? Math.max(0, warmup.startedAt + warmup.durationMs - Date.now()) : 0;
|
||||
const warmup = check.prologue;
|
||||
const unknownOptions = check.unknownTransponders.map((item) => `<option value="${escapeHtml(item.transponder)}">${escapeHtml(item.ownerName ? `${item.transponder} (${item.ownerName})` : item.transponder)}</option>`).join("");
|
||||
const status = (row) => (!warmup ? "–" : row.seen ? "✅" : "⏳");
|
||||
return `
|
||||
@@ -81,14 +103,7 @@ function renderWarmupPanelInner({ t, escapeHtml, getRaceDayWarmupCheck }, sessio
|
||||
${warmup ? `<span class="pill ${check.seenCount === check.total ? "pill-green" : "pill-warn"}">${t("warmup.seen_count", { seen: check.seenCount, total: check.total })}</span>` : ""}
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<div class="actions">
|
||||
${warmup && remaining > 0
|
||||
? `<strong class="warmup-clock" data-warmup-clock>${formatMmSs(remaining)}</strong><button class="btn" type="button" data-warmup-stop>${t("warmup.stop")}</button>`
|
||||
: `<select data-warmup-minutes>${[1, 2, 3].map((minutes) => `<option value="${minutes}" ${minutes === 2 ? "selected" : ""}>${t("warmup.minutes", { minutes })}</option>`).join("")}</select>
|
||||
<button class="btn btn-primary" type="button" data-warmup-start>${t(warmup ? "warmup.restart" : "warmup.start")}</button>
|
||||
${warmup ? `<span class="hint">${t("warmup.ended")}</span>` : ""}`}
|
||||
</div>
|
||||
<table class="warmup-table mt-16">
|
||||
<table class="warmup-table">
|
||||
<tbody>
|
||||
${check.rows.map((row) => `
|
||||
<tr class="${warmup && !row.seen ? "is-missing" : ""}" data-warmup-driver="${escapeHtml(row.driverId)}">
|
||||
@@ -106,15 +121,7 @@ function renderWarmupPanelInner({ t, escapeHtml, getRaceDayWarmupCheck }, sessio
|
||||
}
|
||||
|
||||
function bindWarmupPanel(panel, deps, session) {
|
||||
const { startRaceDayWarmup, stopRaceDayWarmup, setDriverTransponder } = deps;
|
||||
panel.querySelector("[data-warmup-start]")?.addEventListener("click", () => {
|
||||
startRaceDayWarmup(session, Number(panel.querySelector("[data-warmup-minutes]")?.value || 2) * 60000);
|
||||
refreshRaceDayWarmup(true);
|
||||
});
|
||||
panel.querySelector("[data-warmup-stop]")?.addEventListener("click", () => {
|
||||
stopRaceDayWarmup();
|
||||
refreshRaceDayWarmup(true);
|
||||
});
|
||||
const { setDriverTransponder } = deps;
|
||||
panel.querySelectorAll("[data-warmup-driver]").forEach((row) => {
|
||||
const driverId = row.dataset.warmupDriver;
|
||||
row.querySelector("[data-warmup-assign]")?.addEventListener("change", (event) => {
|
||||
@@ -124,16 +131,20 @@ function bindWarmupPanel(panel, deps, session) {
|
||||
if (setDriverTransponder(driverId, row.querySelector("[data-warmup-transponder]")?.value)) refreshRaceDayWarmup(true);
|
||||
});
|
||||
});
|
||||
clearInterval(warmupClockTimer);
|
||||
warmupClockTimer = setInterval(() => {
|
||||
if (!panel.isConnected) { clearInterval(warmupClockTimer); return; }
|
||||
const clock = panel.querySelector("[data-warmup-clock]");
|
||||
if (!clock) return;
|
||||
const warmup = deps.getRaceDayWarmupCheck(session).warmup;
|
||||
const remaining = warmup ? Math.max(0, warmup.startedAt + warmup.durationMs - Date.now()) : 0;
|
||||
clock.textContent = formatMmSs(remaining);
|
||||
if (remaining <= 0) refreshRaceDayWarmup(true);
|
||||
}, 500);
|
||||
}
|
||||
|
||||
// Called by the prologue timer in app.js (5x a second) - touches only the clock text.
|
||||
export function refreshRaceDayPrologueClock(remainingMs) {
|
||||
document.querySelectorAll("[data-prologue-clock]").forEach((node) => { node.textContent = formatMmSs(remainingMs); });
|
||||
}
|
||||
|
||||
export function updateRaceDayStartDisplay(label, lights = 0) {
|
||||
const button = document.getElementById("raceDayStart");
|
||||
if (button && label) button.textContent = label;
|
||||
const panel = document.getElementById("raceDayStartLights");
|
||||
if (!panel) return;
|
||||
panel.querySelector("strong")?.replaceChildren(document.createTextNode(label));
|
||||
panel.querySelectorAll("[data-start-light]").forEach((node) => node.classList.toggle("is-on", Number(node.dataset.startLight) <= lights));
|
||||
}
|
||||
|
||||
function paintWarmupPanel() {
|
||||
@@ -161,15 +172,19 @@ export function renderRaceDayView(deps) {
|
||||
getSessionTiming, getSessionGridEntries, buildRaceDayQueue, buildRaceDayPreflight,
|
||||
backendAvailable, selectSession, startSession, finishSession, pauseSession, resumeSession,
|
||||
saveLapWindow, navigateTo, getStartLightState, addTrackLayout, renderView,
|
||||
getRaceDayWarmupCheck, startRaceDayWarmup, stopRaceDayWarmup, setDriverTransponder,
|
||||
getRaceDayWarmupCheck, setDriverTransponder, getDefaultPrologueSec,
|
||||
startRacePrologue, holdRacePrologue, resumeRacePrologue, setRacePrologueRemaining, cancelRacePrologue, goRacePrologue,
|
||||
isStartPending,
|
||||
} = deps;
|
||||
const queue = buildRaceDayQueue(state);
|
||||
const session = queue.current;
|
||||
const preflight = buildRaceDayPreflight(state, session, { backendAvailable });
|
||||
const warmupForChecks = showsWarmupPanel(session) ? getRaceDayWarmupCheck(session) : null;
|
||||
const usesPrologue = showsWarmupPanel(session);
|
||||
const warmupForChecks = usesPrologue ? getRaceDayWarmupCheck(session) : null;
|
||||
const prologue = warmupForChecks?.prologue || null;
|
||||
const checks = sortRaceDayChecks([
|
||||
...preflight.checks,
|
||||
...(warmupForChecks?.warmup ? [{ id: "transponder_check", level: warmupForChecks.missing.length ? "warning" : "ok", seen: warmupForChecks.seenCount, total: warmupForChecks.total }] : []),
|
||||
...(prologue ? [{ id: "transponder_check", level: warmupForChecks.missing.length ? "warning" : "ok", seen: warmupForChecks.seenCount, total: warmupForChecks.total }] : []),
|
||||
]);
|
||||
const blockers = checks.filter((item) => item.level === "error").length;
|
||||
const warnings = checks.filter((item) => item.level === "warning").length;
|
||||
@@ -180,7 +195,7 @@ export function renderRaceDayView(deps) {
|
||||
: timing.untimed ? formatElapsedClock(timing.elapsedMs) : formatCountdown(timing.remainingMs);
|
||||
const grid = session ? getSessionGridEntries(session) : [];
|
||||
const isSelected = Boolean(session && state.activeSessionId === session.id);
|
||||
const canStart = Boolean(session && preflight.ready && !["running", "paused"].includes(session.status));
|
||||
const canStart = Boolean(session && preflight.ready && !["running", "paused"].includes(session.status) && !isStartPending?.(session));
|
||||
|
||||
dom.view.innerHTML = `
|
||||
<section class="race-day-hero ${preflight.ready ? "is-ready" : "has-blockers"}">
|
||||
@@ -190,7 +205,9 @@ export function renderRaceDayView(deps) {
|
||||
<p>${session ? `${escapeHtml(getEventName(session.eventId))} · ${escapeHtml(getSessionTypeLabel(session.type))} · ${escapeHtml(getStartModeLabel(session.startMode))}` : t("race_day.no_session_hint")}</p>
|
||||
${renderTrackLayoutBar({ state, t, escapeHtml, showNewButton: !session || isPracticeSessionType(session.type) })}
|
||||
</div>
|
||||
<div class="race-day-clock"><strong data-race-day-clock>${clock}</strong><span>${session ? escapeHtml(getStatusLabel(session.status)) : t("race_day.none")}</span></div>
|
||||
${prologue
|
||||
? `<div class="race-day-clock is-prologue"><strong data-prologue-clock>${formatMmSs(warmupForChecks.remainingMs)}</strong><span>${t("prologue.to_start")}</span></div>`
|
||||
: `<div class="race-day-clock"><strong data-race-day-clock>${clock}</strong><span>${session ? escapeHtml(getStatusLabel(session.status)) : t("race_day.none")}</span></div>`}
|
||||
</section>
|
||||
|
||||
<div class="race-day-layout">
|
||||
@@ -203,10 +220,13 @@ export function renderRaceDayView(deps) {
|
||||
<div class="panel-body">
|
||||
${session && !isSelected ? `<button id="raceDayActivate" class="btn" type="button">${t("race_day.activate")}</button>` : ""}
|
||||
<div class="race-day-actions">
|
||||
<button id="raceDayStart" class="btn btn-primary" type="button" ${canStart ? "" : "disabled"}>${t("timing.start")}</button>
|
||||
${usesPrologue
|
||||
? renderPrologueControls({ t, escapeHtml, getDefaultPrologueSec }, session, warmupForChecks, canStart)
|
||||
: `<button id="raceDayStart" class="btn btn-primary" type="button" ${canStart ? "" : "disabled"}>${t("timing.start")}</button>`}
|
||||
${prologue ? "" : `
|
||||
<button id="raceDayPause" class="btn" type="button" ${session?.status === "running" ? "" : "disabled"}>${t("audio.race_pause")}</button>
|
||||
<button id="raceDayResume" class="btn" type="button" ${session?.status === "paused" ? "" : "disabled"}>${t("audio.race_resume")}</button>
|
||||
<button id="raceDayFinish" class="btn btn-danger" type="button" ${["running", "paused"].includes(session?.status) ? "" : "disabled"}>${t("race_day.finish")}</button>
|
||||
<button id="raceDayFinish" class="btn btn-danger" type="button" ${["running", "paused"].includes(session?.status) ? "" : "disabled"}>${t("race_day.finish")}</button>`}
|
||||
</div>
|
||||
<div id="raceDayStartLights" class="race-start-lights" data-state="${escapeHtml(getStartLightState())}">
|
||||
${[1, 2, 3, 4, 5].map((light) => `<span data-start-light="${light}"></span>`).join("")}
|
||||
@@ -294,33 +314,41 @@ export function renderRaceDayView(deps) {
|
||||
saveLapWindow(session, minLapSec, maxLapSec);
|
||||
});
|
||||
bindTrackLayoutBar(dom.view, { state, t, addTrackLayout, renderView });
|
||||
lastWarmupDeps = { t, escapeHtml, renderView, getRaceDayWarmupCheck, startRaceDayWarmup, stopRaceDayWarmup, setDriverTransponder, getSession: () => buildRaceDayQueue(state).current };
|
||||
lastWarmupDeps = { t, escapeHtml, renderView, getRaceDayWarmupCheck, setDriverTransponder, getSession: () => buildRaceDayQueue(state).current };
|
||||
paintWarmupPanel();
|
||||
document.getElementById("raceDayStart")?.addEventListener("click", async () => {
|
||||
if (!session || !preflight.ready) return;
|
||||
// Warns (never blocks - a driver may not show up) when the warm-up ran and someone in
|
||||
// the heat still hasn't crossed the line.
|
||||
const warmupCheck = showsWarmupPanel(session) ? getRaceDayWarmupCheck(session) : null;
|
||||
if (warmupCheck?.warmup && warmupCheck.missing.length && !window.confirm(t("warmup.start_missing", { names: warmupCheck.missing.map((row) => row.name).join(", ") }))) return;
|
||||
stopRaceDayWarmup();
|
||||
if (!isSelected) selectSession(session.id, { render: false });
|
||||
if (usesPrologue) {
|
||||
startRacePrologue(session, Number(document.getElementById("raceDayPrologueLength")?.value || 0));
|
||||
return;
|
||||
}
|
||||
const button = document.getElementById("raceDayStart");
|
||||
if (button) button.disabled = true;
|
||||
const updateStartDisplay = (label, lights = 0) => {
|
||||
if (button && label) button.textContent = label;
|
||||
const panel = document.getElementById("raceDayStartLights");
|
||||
if (!panel) return;
|
||||
panel.querySelector("strong")?.replaceChildren(document.createTextNode(label));
|
||||
panel.querySelectorAll("[data-start-light]").forEach((node) => node.classList.toggle("is-on", Number(node.dataset.startLight) <= lights));
|
||||
};
|
||||
const result = await startSession(session, {
|
||||
onCountdown: (seconds) => updateStartDisplay(String(seconds), 0),
|
||||
onLight: (light) => updateStartDisplay(`LIGHT_${light}`, light),
|
||||
onArmed: () => updateStartDisplay("WAIT_RANDOM", 5),
|
||||
onCountdown: (seconds) => updateRaceDayStartDisplay(String(seconds), 0),
|
||||
onLight: (light) => updateRaceDayStartDisplay(`LIGHT_${light}`, light),
|
||||
onArmed: () => updateRaceDayStartDisplay("WAIT_RANDOM", 5),
|
||||
});
|
||||
if (!result.ok && result.message) alert(result.message);
|
||||
if (!result.ok && button) button.disabled = false;
|
||||
});
|
||||
dom.view.querySelectorAll("[data-prologue]").forEach((button) => button.addEventListener("click", () => {
|
||||
const action = button.dataset.prologue;
|
||||
if (action === "hold") holdRacePrologue();
|
||||
if (action === "resume") resumeRacePrologue();
|
||||
if (action === "plus") setRacePrologueRemaining(getRaceDayWarmupCheck(session).remainingMs + 60000);
|
||||
if (action === "to30") setRacePrologueRemaining(30000);
|
||||
if (action === "to10") setRacePrologueRemaining(10000);
|
||||
if (action === "cancel") cancelRacePrologue();
|
||||
if (action === "go") {
|
||||
// Warns (never blocks - a driver may not show up) when someone in the heat still
|
||||
// hasn't crossed the line since the count-down began.
|
||||
const check = getRaceDayWarmupCheck(session);
|
||||
if (check.missing.length && !window.confirm(t("warmup.start_missing", { names: check.missing.map((row) => row.name).join(", ") }))) return;
|
||||
goRacePrologue();
|
||||
}
|
||||
}));
|
||||
document.getElementById("raceDayPause")?.addEventListener("click", () => pauseSession(session));
|
||||
document.getElementById("raceDayResume")?.addEventListener("click", () => resumeSession(session));
|
||||
document.getElementById("raceDayFinish")?.addEventListener("click", () => finishSession(session));
|
||||
|
||||
Reference in new issue
Block a user