fix(team-race): edit teams and length while the race runs; quick length picks (1.67.1)

This commit is contained in:
larssand committed 2026-11-05 22:05:20 +01:00
1 parent 37076b8490
commit a9146d9662
5 files changed
+36 -11

No files matched your search

+2
View File
@@ -2866,6 +2866,7 @@ const TRANSLATIONS = {
"team_setup.length_min": "Längd (minuter)",
"team_setup.create_race": "Skapa lagrace",
"team_setup.locked": "Lagracet är {status} – lagen kan inte ändras.",
"team_setup.live_hint": "Lagracet pågår. Du kan fortfarande byta förare, bil och transponder – ändringen gäller från nästa passering och varven som körts stannar hos laget.",
"team_setup.unplaced": "Inte i något lag: {names}",
"team_setup.issue_no_teams": "Minst två lag behövs.",
"team_setup.issue_empty": "{team} har inga förare.",
@@ -4938,6 +4939,7 @@ const TRANSLATIONS = {
"team_setup.length_min": "Length (minutes)",
"team_setup.create_race": "Create team race",
"team_setup.locked": "The team race is {status} – the teams can't be changed.",
"team_setup.live_hint": "The team race is on. You can still change drivers, car and transponder – it counts from the next passing and the laps already done stay with the team.",
"team_setup.unplaced": "On no team: {names}",
"team_setup.issue_no_teams": "At least two teams are needed.",
"team_setup.issue_empty": "{team} has no drivers.",
+26 -8
View File
@@ -3,6 +3,13 @@
// Logic in team_race_logic.js; this file only renders and binds.
import { splitIntoTeams, moveDriverToTeam, setTeamCar, renameTeam, removeTeam, getTeamTransponders, findTeamRaceIssues } from "./team_race_logic.js";
const LENGTH_PRESETS = [30, 60, 120, 240, 360, 720, 1440];
const formatLength = (minutes) => {
const hours = Math.floor(minutes / 60);
const rest = minutes % 60;
return hours ? `${hours} h${rest ? ` ${rest} min` : ""}` : `${rest} min`;
};
export function mountTeamRaceSetup(root, deps) {
if (!root) return;
const { event, state, t, escapeHtml, uid, saveState, refresh, getSessionsForEvent, getEventTeams, getTeamDriverPool, normalizeSession, getStatusLabel } = deps;
@@ -10,7 +17,10 @@ export function mountTeamRaceSetup(root, deps) {
const pool = getTeamDriverPool(event);
const poolIds = pool.drivers.map((driver) => driver.id);
const session = getSessionsForEvent(event.id).find((item) => item.type === "team_race") || null;
const editable = !session || session.status === "ready";
// Teams stay editable while the race runs (wrong transponder, a broken car swapped): laps are
// kept per team, so a change only counts from the next passing. Locked once it is finished.
const editable = !session || !["finished", "stopped"].includes(session.status);
const live = Boolean(session && ["running", "paused"].includes(session.status));
const lengthMin = Math.max(1, Number(session?.durationMin || event.raceConfig?.teamRaceDurationMin || 60) || 60);
const issues = findTeamRaceIssues(teams, { drivers: state.drivers, cars: state.cars, driverIds: pool.fallback ? [] : poolIds });
const driver = (id) => state.drivers.find((item) => item.id === id);
@@ -55,16 +65,21 @@ export function mountTeamRaceSetup(root, deps) {
<p class="hint">${t("team_setup.intro")}</p>
${pool.fallback ? `<p class="hint">${t("events.team_driver_fallback")}</p>` : ""}
<h4>${t("team_setup.step_teams")}</h4>
${editable ? `<div class="actions team-setup-toolbar">
${live ? `<p class="hint">${t("team_setup.live_hint")}</p>` : ""}
${editable && !live ? `<div class="actions team-setup-toolbar">
<label><span>${t("team_setup.team_count")}</span><input type="number" id="teamSetupCount" min="2" max="30" step="1" value="${Math.max(2, teams.length || Math.min(4, Math.ceil(poolIds.length / 2)) || 2)}" /></label>
<button class="btn btn-primary" type="button" id="teamSetupSplit">${t("team_setup.split")}</button>
<button class="btn" type="button" id="teamSetupAdd">${t("team_setup.add_team")}</button>
</div>` : `<p class="hint">${t("team_setup.locked", { status: getStatusLabel(session.status) })}</p>`}
</div>` : ""}
${editable && live ? `<div class="actions team-setup-toolbar"><button class="btn" type="button" id="teamSetupAdd">${t("team_setup.add_team")}</button></div>` : ""}
${editable ? "" : `<p class="hint">${t("team_setup.locked", { status: getStatusLabel(session.status) })}</p>`}
<div class="team-setup-grid mt-16">${teams.map(teamCard).join("") || `<p>${t("events.no_teams")}</p>`}</div>
${unplaced.length ? `<p class="hint mt-8">${t("team_setup.unplaced", { names: unplaced.join(", ") })}</p>` : ""}
<h4 class="mt-16">${t("team_setup.step_format")}</h4>
<div class="actions team-setup-toolbar">
<label><span>${t("team_setup.length_min")}</span><input type="number" id="teamSetupLength" min="1" max="1440" step="1" value="${lengthMin}" ${disabled} /></label>
${editable ? LENGTH_PRESETS.map((minutes) => `<button class="btn btn-mini ${minutes === lengthMin ? "btn-primary" : ""}" type="button" data-team-length="${minutes}">${escapeHtml(formatLength(minutes))}</button>`).join("") : ""}
<span class="hint">= ${escapeHtml(formatLength(lengthMin))}</span>
${session
? `<span class="pill">${escapeHtml(session.name)} · ${escapeHtml(getStatusLabel(session.status))}</span>`
: `<button class="btn btn-primary" type="button" id="teamSetupCreate">${t("team_setup.create_race")}</button>`}
@@ -78,7 +93,7 @@ export function mountTeamRaceSetup(root, deps) {
// Saves the teams; the team race (if not started) follows: its drivers and length.
const save = (nextTeams) => {
event.raceConfig = { ...(event.raceConfig || {}), teams: nextTeams.filter((team) => team.name) };
if (session && session.status === "ready") session.driverIds = [...new Set(nextTeams.flatMap((team) => team.driverIds))];
if (session && editable) session.driverIds = [...new Set(nextTeams.flatMap((team) => team.driverIds))];
saveState();
refresh();
};
@@ -95,13 +110,16 @@ export function mountTeamRaceSetup(root, deps) {
root.querySelectorAll("[data-team-remove-driver]").forEach((button) => button.addEventListener("click", () => save(moveDriverToTeam(teams, button.dataset.teamRemoveDriver, ""))));
root.querySelectorAll("[data-team-car]").forEach((select) => select.addEventListener("change", () => save(setTeamCar(teams, select.dataset.teamCar, select.value))));
root.querySelectorAll("[data-team-delete]").forEach((button) => button.addEventListener("click", () => save(removeTeam(teams, button.dataset.teamDelete))));
root.querySelector("#teamSetupLength")?.addEventListener("change", (changeEvent) => {
const minutes = Math.max(1, Math.round(Number(changeEvent.currentTarget.value) || lengthMin));
// A running race can be made longer or shorter too: the clock follows.
const setLength = (value) => {
const minutes = Math.max(1, Math.round(Number(value) || lengthMin));
event.raceConfig = { ...(event.raceConfig || {}), teamRaceDurationMin: minutes };
if (session && session.status === "ready") session.durationMin = minutes;
if (session && editable) session.durationMin = minutes;
saveState();
refresh();
});
};
root.querySelector("#teamSetupLength")?.addEventListener("change", (changeEvent) => setLength(changeEvent.currentTarget.value));
root.querySelectorAll("[data-team-length]").forEach((button) => button.addEventListener("click", () => setLength(button.dataset.teamLength)));
root.querySelector("#teamSetupCreate")?.addEventListener("click", () => {
const minutes = Math.max(1, Math.round(Number(root.querySelector("#teamSetupLength").value) || lengthMin));
event.raceConfig = { ...(event.raceConfig || {}), teamRaceDurationMin: minutes };