fix(series): report created races, delete a series with its races; group Race Day sessions by today's races (1.43.1)
This commit is contained in:
1 parent
74dbbf6ae0
commit
dbda06d101
10 files changed
+133
-13
No files matched your search
+24
-3
@@ -620,6 +620,17 @@ const getSeriesRounds = (series) => state.events
|
||||
finalCount: sessions.filter((session) => session.type === "final").length,
|
||||
};
|
||||
});
|
||||
// Deleting a series can take its rounds along (races in another series are kept).
|
||||
const deleteSeriesRaces = (series) => {
|
||||
const inOtherSeries = new Set((state.series || []).filter((item) => item.id !== series.id).flatMap((item) => item.eventIds));
|
||||
const eventIds = new Set(series.eventIds.filter((id) => !inOtherSeries.has(id)));
|
||||
const sessionIds = state.sessions.filter((session) => eventIds.has(session.eventId)).map((session) => session.id);
|
||||
state.events = state.events.filter((event) => !eventIds.has(event.id));
|
||||
state.sessions = state.sessions.filter((session) => !eventIds.has(session.eventId));
|
||||
sessionIds.forEach((id) => delete state.resultsBySession[id]);
|
||||
if (sessionIds.includes(state.activeSessionId)) state.activeSessionId = null;
|
||||
void purgeSessionPassings(sessionIds);
|
||||
};
|
||||
const findSeriesEvent = (eventId) => state.events.find((event) => event.id === eventId) || null;
|
||||
// Format per round (can differ between rounds and classes); locked once qualifying exists.
|
||||
const setSeriesRoundFormat = (eventId, values) => {
|
||||
@@ -713,7 +724,7 @@ const exportSeriesPdf = async (series, tables) => {
|
||||
)),
|
||||
});
|
||||
};
|
||||
const renderSeries = () => renderSeriesView({ state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound });
|
||||
const renderSeries = () => renderSeriesView({ state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, deleteSeriesRaces, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound });
|
||||
const renderArchive = () => renderResultsArchiveView({
|
||||
state, dom, t, escapeHtml, formatLap, formatRaceClock, renderTable,
|
||||
getClassName, getEventName, buildLeaderboard, getCompetitorPassings,
|
||||
@@ -898,6 +909,8 @@ const TRANSLATIONS = {
|
||||
"race_day.quick_layout": "Ny banlayout",
|
||||
"race_day.quick_race": "Skapa race",
|
||||
"race_day.pick_session": "Session",
|
||||
"race_day.show_all_sessions": "Visa alla sessioner",
|
||||
"race_day.hidden_sessions": "({count} från andra dagar dolda)",
|
||||
"race_day.reset_session_hint": "Nollställer sessionens varv och resultat, t.ex. vid omstart. Pausa först om heatet körs.",
|
||||
"race_day.reset_session_confirm": "Nollställ alla varv och resultat i \"{name}\"?\n\nDet går inte att ångra.",
|
||||
"race_day.new_practice_day": "Nollställ – ny träningsdag",
|
||||
@@ -1000,7 +1013,10 @@ const TRANSLATIONS = {
|
||||
"series.counted_of": "{counted} räknas av {completed} körda ({total} planerade)",
|
||||
"series.no_results": "Inga körda deltävlingar ännu.",
|
||||
"series.legend": "Siffra = seriepoäng. (Inom parentes) = struket resultat. – = deltog inte. Lika poäng: flest segrar, sedan andraplatser osv., sedan senaste gemensamma deltävling.",
|
||||
"series.delete_confirm": "Ta bort serien \"{name}\"? Racen och deras resultat finns kvar.",
|
||||
"series.delete_confirm": "Ta bort serien \"{name}\"?",
|
||||
"series.delete_races_confirm": "Ta också bort seriens {count} race från Race Setup, med heat och resultat?\n\nOK = ta bort racen\nAvbryt = behåll racen (t.ex. för resultatarkivet)",
|
||||
"series.created_rounds": "{count} race skapade. De finns i listan nedan och under Race Setup.",
|
||||
"series.created_none": "Inga nya race skapades: seriens klasser har redan race på de datumen.",
|
||||
"nav.race_setup": "Race Setup",
|
||||
"nav.race_setup_sub": "Open Practice, klubbrace och endurance",
|
||||
"nav.overlay": "Overlay",
|
||||
@@ -2752,6 +2768,8 @@ const TRANSLATIONS = {
|
||||
"race_day.quick_layout": "New track layout",
|
||||
"race_day.quick_race": "Create race",
|
||||
"race_day.pick_session": "Session",
|
||||
"race_day.show_all_sessions": "Show all sessions",
|
||||
"race_day.hidden_sessions": "({count} from other days hidden)",
|
||||
"race_day.reset_session_hint": "Clears the session's laps and results, e.g. for a restart. Pause first if the heat is running.",
|
||||
"race_day.reset_session_confirm": "Clear every lap and result in \"{name}\"?\n\nThis cannot be undone.",
|
||||
"race_day.new_practice_day": "Reset – new practice day",
|
||||
@@ -2854,7 +2872,10 @@ const TRANSLATIONS = {
|
||||
"series.counted_of": "{counted} counted of {completed} run ({total} planned)",
|
||||
"series.no_results": "No rounds run yet.",
|
||||
"series.legend": "Number = series points. (In brackets) = dropped result. – = did not take part. Ties: most wins, then 2nd places etc., then the latest common round.",
|
||||
"series.delete_confirm": "Delete the series \"{name}\"? The races and their results are kept.",
|
||||
"series.delete_confirm": "Delete the series \"{name}\"?",
|
||||
"series.delete_races_confirm": "Also delete the series' {count} races from Race Setup, with heats and results?\n\nOK = delete the races\nCancel = keep the races (e.g. for the results archive)",
|
||||
"series.created_rounds": "{count} races created. They are listed below and under Race Setup.",
|
||||
"series.created_none": "No new races were created: the series' classes already have races on those dates.",
|
||||
"nav.race_setup": "Race Setup",
|
||||
"nav.race_setup_sub": "Open Practice, club races and endurance",
|
||||
"nav.overlay": "Overlay",
|
||||
|
||||
+33
-5
@@ -64,6 +64,33 @@ function renderQueueSession(session, positionKey, deps) {
|
||||
// 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 showAllSessions = false;
|
||||
|
||||
const localDateKey = (date = new Date()) => `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}-${String(date.getDate()).padStart(2, "0")}`;
|
||||
|
||||
// The session picker lists today's races by default (plus whatever is live or selected),
|
||||
// grouped per race in the order they were set up. Old races, practices and other series'
|
||||
// rounds stay out of the way until "Show all" is ticked. Undated races show unrun sessions.
|
||||
export function buildRaceDaySessionGroups({ sessions, events, selectedId = "", showAll = false, today = localDateKey() }) {
|
||||
const eventById = new Map((events || []).map((event) => [event.id, event]));
|
||||
const isLive = (session) => ["running", "paused"].includes(session.status);
|
||||
const visible = (session) => {
|
||||
if (showAll || isLive(session) || session.id === selectedId) return true;
|
||||
const date = eventById.get(session.eventId)?.date;
|
||||
return date ? date === today : session.status === "ready";
|
||||
};
|
||||
const groups = new Map();
|
||||
let hidden = 0;
|
||||
(sessions || []).forEach((session) => {
|
||||
if (!visible(session)) { hidden += 1; return; }
|
||||
if (!groups.has(session.eventId)) groups.set(session.eventId, { event: eventById.get(session.eventId) || null, sessions: [] });
|
||||
groups.get(session.eventId).sessions.push(session);
|
||||
});
|
||||
const list = [...groups.values()].sort((a, b) =>
|
||||
Number(b.sessions.some(isLive)) - Number(a.sessions.some(isLive))
|
||||
|| String(b.event?.date || "").localeCompare(String(a.event?.date || "")));
|
||||
return { groups: list, hidden };
|
||||
}
|
||||
|
||||
function showsWarmupPanel(session) {
|
||||
return Boolean(session && session.status === "ready" && session.mode !== "track" && session.type !== "team_race" && !isPracticeSessionType(session.type));
|
||||
@@ -210,10 +237,7 @@ export function renderRaceDayView(deps) {
|
||||
const practiceLabel = !practice ? t("race_day.quick_practice_new")
|
||||
: practice.status === "running" ? t("race_day.quick_practice_show", { name: practice.name })
|
||||
: t("race_day.quick_practice_continue", { name: practice.name });
|
||||
const sessionChoices = state.sessions.slice().sort((a, b) => {
|
||||
const rank = (item) => (["running", "paused"].includes(item.status) ? 0 : item.status === "ready" ? 1 : 2);
|
||||
return rank(a) - rank(b) || Number(b.startedAt || 0) - Number(a.startedAt || 0);
|
||||
});
|
||||
const sessionChoices = buildRaceDaySessionGroups({ sessions: state.sessions, events: state.events, selectedId: session?.id, showAll: showAllSessions });
|
||||
const isPracticeSession = Boolean(session && (isPracticeSessionType(session.type) || session.type === "practice"));
|
||||
const isLiveSession = ["running", "paused"].includes(session?.status);
|
||||
// Layouts are a practice thing: never offered while a race session is in focus.
|
||||
@@ -248,9 +272,12 @@ export function renderRaceDayView(deps) {
|
||||
<label class="race-day-session-picker"><span>${t("race_day.pick_session")}</span>
|
||||
<select id="raceDaySessionSelect">
|
||||
${session ? "" : `<option value="">${t("race_day.none")}</option>`}
|
||||
${sessionChoices.map((item) => `<option value="${escapeHtml(item.id)}" ${session?.id === item.id ? "selected" : ""}>${escapeHtml(`${item.name} · ${getEventName(item.eventId)} · ${getStatusLabel(item.status)}`)}</option>`).join("")}
|
||||
${sessionChoices.groups.map((group) => `<optgroup label="${escapeHtml([group.event?.name || getEventName(group.sessions[0].eventId), group.event?.date].filter(Boolean).join(" · "))}">
|
||||
${group.sessions.map((item) => `<option value="${escapeHtml(item.id)}" ${session?.id === item.id ? "selected" : ""}>${escapeHtml(`${item.name} · ${getStatusLabel(item.status)}`)}</option>`).join("")}
|
||||
</optgroup>`).join("")}
|
||||
</select>
|
||||
</label>
|
||||
${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">
|
||||
${usesPrologue
|
||||
@@ -377,6 +404,7 @@ export function renderRaceDayView(deps) {
|
||||
});
|
||||
document.getElementById("raceDayQuickRace")?.addEventListener("click", () => navigateTo("race_setup"));
|
||||
document.getElementById("raceDaySessionSelect")?.addEventListener("change", (event) => { if (event.target.value) selectSession(event.target.value); });
|
||||
document.getElementById("raceDayShowAllSessions")?.addEventListener("change", (event) => { showAllSessions = event.target.checked; renderView(); });
|
||||
// Races: clear a heat's results (e.g. a restart after a false start) - not while it is running.
|
||||
document.getElementById("raceDayResetSession")?.addEventListener("click", () => {
|
||||
if (session && window.confirm(t("race_day.reset_session_confirm", { name: session.name }))) resetSessionData(session);
|
||||
|
||||
+8
-2
@@ -143,7 +143,7 @@ function renderStandingsTable(table, { t, escapeHtml }) {
|
||||
export function renderSeriesView(deps) {
|
||||
const {
|
||||
state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries,
|
||||
getSeriesRounds, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound,
|
||||
getSeriesRounds, deleteSeriesRaces, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound,
|
||||
} = deps;
|
||||
const list = state.series || [];
|
||||
if (!list.some((item) => item.id === selectedSeriesId)) selectedSeriesId = list[0]?.id || "";
|
||||
@@ -241,7 +241,11 @@ export function renderSeriesView(deps) {
|
||||
}));
|
||||
document.getElementById("seriesDelete")?.addEventListener("click", () => {
|
||||
if (!window.confirm(t("series.delete_confirm", { name: series.name }))) return;
|
||||
// The rounds are ordinary races: ask separately, so results can be kept for the archive.
|
||||
const raceCount = rounds.length;
|
||||
const removeRaces = raceCount > 0 && window.confirm(t("series.delete_races_confirm", { count: raceCount }));
|
||||
state.series = list.filter((item) => item.id !== series.id);
|
||||
if (removeRaces) deleteSeriesRaces(series);
|
||||
saveState();
|
||||
renderView();
|
||||
});
|
||||
@@ -251,7 +255,7 @@ export function renderSeriesView(deps) {
|
||||
const dates = String(data.get("dates") || "").split(/[\s,;]+/).map((value) => value.trim()).filter((value) => /^\d{4}-\d{2}-\d{2}$/.test(value));
|
||||
if (!dates.length) { window.alert(t("series.create_dates_invalid")); return; }
|
||||
const seedMethod = String(data.get("seedMethod") || "consecutive");
|
||||
createSeriesEvents(series, dates, String(data.get("presetId") || "custom"), {
|
||||
const created = createSeriesEvents(series, dates, String(data.get("presetId") || "custom"), {
|
||||
qualifyingRounds: data.get("qualifyingRounds"), finalLegs: data.get("finalLegs"), carsPerHeat: data.get("carsPerHeat"),
|
||||
}, {
|
||||
heatOrder: String(data.get("heatOrder") || "fastest_last"),
|
||||
@@ -262,6 +266,8 @@ export function renderSeriesView(deps) {
|
||||
seedMethod: seedMethod === "best_lap" ? "best_sum" : seedMethod,
|
||||
});
|
||||
renderView();
|
||||
// Always say what happened: clicking again for dates already in the series creates nothing.
|
||||
window.alert(created ? t("series.created_rounds", { count: created }) : t("series.created_none"));
|
||||
});
|
||||
// Picking a format fills the round numbers it defines (they can still be changed before creating).
|
||||
const createForm = document.getElementById("seriesCreateEvents");
|
||||
|
||||
@@ -4709,6 +4709,7 @@ tr.is-removed td.lap-actions {
|
||||
.race-day-quick { display: flex; flex-wrap: wrap; gap: 10px; margin-bottom: 14px; }
|
||||
.race-day-quick-btn { font-size: 1rem; padding: 12px 18px; min-height: 48px; }
|
||||
.race-day-session-picker { display: grid; gap: 4px; margin-bottom: 12px; max-width: 520px; }
|
||||
.race-day-show-all { display: flex; align-items: center; gap: 8px; margin: -4px 0 12px; font-size: 0.9rem; }
|
||||
.timing-run-on-race-day { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; margin-top: 8px; }
|
||||
|
||||
/* Dashboard: the three common tasks */
|
||||
|
||||
Reference in new issue
Block a user