diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fcee19..c25071d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.67.0 + +- Team race setup in one panel (Events → Manage), replacing the separate team form, checkbox lists and edit window: 1 teams and drivers (split the chosen drivers over N teams in one click, rename a team in place, add a driver from a list that says which team they move from, remove with ×), a car per team or the drivers' own transponders, 2 the length, with "Create team race" when there is no team race session yet, 3 the checks before the start (fewer than two teams, a team without drivers or transponder, a transponder on two teams, drivers on no team). Shown as soon as the endurance format is picked. Locked once the race has started. + ## 1.66.0 - Race overview: the whole race in one place, on Race Day (under the heat queue) and in the results archive. A podium from the A final, then practice, qualifying and finals that open and close, each with its standings and every heat's result (laps, result, best lap, and the car in sponsor heats). Print, PDF and CSV export the whole race, every heat included. diff --git a/package-lock.json b/package-lock.json index 93075c3..f510be7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.66.0", + "version": "1.67.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.66.0", + "version": "1.67.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 9b0c0b5..a9defc2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.66.0", + "version": "1.67.0", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/src/app.js b/src/app.js index eb798bf..50f5875 100644 --- a/src/app.js +++ b/src/app.js @@ -2846,6 +2846,33 @@ const TRANSLATIONS = { "race_overview.phase_practice": "Träning", "race_overview.phase_qualification": "Kval", "race_overview.phase_final": "Finaler", + "team_setup.title": "Lagrace", + "team_setup.intro": "Dela in förarna i lag, välj lagets bil (eller förarnas egna transpondrar) och racets längd. Start, paus och stopp sköts från Race Day.", + "team_setup.step_teams": "1. Lag och förare", + "team_setup.step_format": "2. Längd", + "team_setup.step_check": "3. Kontroll före start", + "team_setup.team_count": "Antal lag", + "team_setup.split": "Fördela förarna", + "team_setup.split_confirm": "Förarna fördelas om på lagen. Fortsätta?", + "team_setup.add_team": "Lägg till lag", + "team_setup.delete_team": "Ta bort lag", + "team_setup.team_n": "Lag {n}", + "team_setup.add_driver": "+ Lägg till förare", + "team_setup.from_team": "flyttas från {team}", + "team_setup.no_drivers": "Inga förare än.", + "team_setup.car": "Bil / transponder", + "team_setup.own_transponders": "Förarnas egna transpondrar", + "team_setup.transponders": "Räknas på", + "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.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.", + "team_setup.issue_no_transponder": "{team} har ingen transponder – välj en bil eller ge förarna transponder.", + "team_setup.issue_shared": "Transponder {tp} finns i flera lag ({teams}) – varven skulle hamna fel.", + "team_setup.ready": "Allt klart – starta lagracet från Race Day.", + "team_setup.ready_create": "Lagen är klara – tryck Skapa lagrace.", "session.team_race": "lagrace", "validation.no_assignments": "Ingen förar-/biltilldelning i denna session.", "validation.missing_tp": "En eller flera tilldelade bilar saknar transponder-ID.", @@ -4891,6 +4918,33 @@ const TRANSLATIONS = { "race_overview.phase_practice": "Practice", "race_overview.phase_qualification": "Qualifying", "race_overview.phase_final": "Finals", + "team_setup.title": "Team race", + "team_setup.intro": "Split the drivers into teams, pick each team's car (or the drivers' own transponders) and the race length. Start, pause and stop from Race Day.", + "team_setup.step_teams": "1. Teams and drivers", + "team_setup.step_format": "2. Length", + "team_setup.step_check": "3. Check before the start", + "team_setup.team_count": "Number of teams", + "team_setup.split": "Split the drivers", + "team_setup.split_confirm": "The drivers are split over the teams again. Continue?", + "team_setup.add_team": "Add team", + "team_setup.delete_team": "Delete team", + "team_setup.team_n": "Team {n}", + "team_setup.add_driver": "+ Add driver", + "team_setup.from_team": "moves from {team}", + "team_setup.no_drivers": "No drivers yet.", + "team_setup.car": "Car / transponder", + "team_setup.own_transponders": "The drivers' own transponders", + "team_setup.transponders": "Counts on", + "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.unplaced": "On no team: {names}", + "team_setup.issue_no_teams": "At least two teams are needed.", + "team_setup.issue_empty": "{team} has no drivers.", + "team_setup.issue_no_transponder": "{team} has no transponder – pick a car or give the drivers transponders.", + "team_setup.issue_shared": "Transponder {tp} is on several teams ({teams}) – laps would go to the wrong one.", + "team_setup.ready": "All set – start the team race from Race Day.", + "team_setup.ready_create": "The teams are ready – press Create team race.", "session.team_race": "team race", "validation.no_assignments": "No driver/car assignments in this session.", "validation.missing_tp": "One or more assigned cars are missing transponder ID.", diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js index fcb41ea..772b7bb 100644 --- a/src/event_manager_controller.js +++ b/src/event_manager_controller.js @@ -1,4 +1,5 @@ import { mountSponsorSetup } from "./sponsor_event_view.js"; +import { mountTeamRaceSetup } from "./team_race_setup_view.js"; import { orderSessionsForRunning, moveSessionInRunningOrder, applyFormatToPendingSessions, syncParticipantsToSessions } from "./event_race_logic.js"; import { setSessionGroupOpen } from "./event_manager_view.js"; let activeManageTab = "setup"; @@ -159,7 +160,7 @@ export function renderEventManagerView(context) { const isEndurancePreset = event.mode === "race" && selectedPreset?.id === "endurance"; const showTeamsSection = event.mode === "race" && - (sessions.some((session) => session.type === "team_race") || raceTeams.length > 0 || Boolean(selectedTeamEditId)); + (isEndurancePreset || sessions.some((session) => session.type === "team_race") || raceTeams.length > 0 || Boolean(selectedTeamEditId)); const showBasicQualifyingFields = raceFormatAdvanced || !isEndurancePreset; const showBasicFinalFields = raceFormatAdvanced || !isEndurancePreset; const selectedParticipantCount = event.mode === "race" ? (event.raceConfig.participantsConfigured ? (event.raceConfig.driverIds || []).length : raceDrivers.length) : 0; @@ -611,127 +612,8 @@ export function renderEventManagerView(context) { }); if (showTeamsSection) { - document.getElementById("teamForm")?.addEventListener("submit", (e) => { - e.preventDefault(); - const formNode = e.currentTarget; - if (!(formNode instanceof HTMLFormElement)) { - return; - } - const form = new FormData(formNode); - const name = String(form.get("teamName") || "").trim(); - const driverIds = Array.from(document.querySelectorAll('[form="teamForm"][name="teamDriverIds"]:checked')) - .map((node) => String(node.value)) - .filter(Boolean); - const carIds = Array.from(document.querySelectorAll('[form="teamForm"][name="teamCarIds"]:checked')) - .map((node) => String(node.value)) - .filter(Boolean); - if (!name) { - setFormError("teamCreateError", t("validation.required_name")); - return; - } - if (!driverIds.length && !carIds.length) { - setFormError("teamCreateError", t("validation.invalid_selection")); - return; - } - setFormError("teamCreateError", ""); - const createdTeam = normalizeRaceTeam({ id: uid("team"), name, driverIds, carIds }); - const nextTeams = [...reassignTeamMembers(getEventTeams(event), { excludeTeamId: createdTeam.id, driverIds, carIds }), createdTeam]; - updateEvent((item) => ({ - ...item, - raceConfig: { - ...(item.raceConfig || {}), - teams: nextTeams, - }, - })); - setSelectedTeamEditId(null); - saveState(); - refreshManager(); - }); - - raceTeams.forEach((team) => { - document.getElementById(`team-edit-${team.id}`)?.addEventListener("click", () => { - setSelectedTeamEditId(team.id); - refreshManager(); - }); - - document.getElementById(`team-delete-${team.id}`)?.addEventListener("click", () => { - const nextTeams = getEventTeams(event).filter((item) => item.id !== team.id); - updateEvent((item) => ({ - ...item, - raceConfig: { - ...(item.raceConfig || {}), - teams: nextTeams, - }, - })); - if (getSelectedTeamEditId() === team.id) { - setSelectedTeamEditId(null); - } - saveState(); - refreshManager(); - }); - }); - - document.getElementById("teamEditCancel")?.addEventListener("click", () => { - setSelectedTeamEditId(null); - refreshManager(); - }); - - document.getElementById("teamEditCancelFooter")?.addEventListener("click", () => { - setSelectedTeamEditId(null); - refreshManager(); - }); - - document.getElementById("teamEditModalOverlay")?.addEventListener("click", (modalEvent) => { - if (modalEvent.target?.id === "teamEditModalOverlay") { - setSelectedTeamEditId(null); - refreshManager(); - } - }); - - bindModalShell("teamEditModalOverlay", () => { - setSelectedTeamEditId(null); - refreshManager(); - }); - - document.getElementById("teamEditForm")?.addEventListener("submit", (submitEvent) => { - submitEvent.preventDefault(); - if (!editingTeam) { - return; - } - const formNode = submitEvent.currentTarget; - if (!(formNode instanceof HTMLFormElement)) { - return; - } - const form = new FormData(formNode); - const name = String(form.get("teamName") || "").trim(); - const driverIds = Array.from(formNode.querySelectorAll('[name="teamDriverIds"]:checked')) - .map((node) => String(node.value)) - .filter(Boolean); - const carIds = Array.from(formNode.querySelectorAll('[name="teamCarIds"]:checked')) - .map((node) => String(node.value)) - .filter(Boolean); - if (!name) { - setFormError("teamEditError", t("validation.required_name")); - return; - } - if (!driverIds.length && !carIds.length) { - setFormError("teamEditError", t("validation.invalid_selection")); - return; - } - setFormError("teamEditError", ""); - const nextTeams = reassignTeamMembers(getEventTeams(event), { excludeTeamId: editingTeam.id, driverIds, carIds }).map((team) => - team.id === editingTeam.id ? normalizeRaceTeam({ ...team, name, driverIds, carIds }) : team - ); - updateEvent((item) => ({ - ...item, - raceConfig: { - ...(item.raceConfig || {}), - teams: nextTeams, - }, - })); - setSelectedTeamEditId(null); - saveState(); - refreshManager(); + mountTeamRaceSetup(document.getElementById("manage-setup-teams"), { + event, state, t, escapeHtml, uid, saveState, refresh: refreshManager, getSessionsForEvent, getEventTeams, getTeamDriverPool, normalizeSession, getStatusLabel, }); } diff --git a/src/event_manager_view.js b/src/event_manager_view.js index ca3ddf0..3537f3c 100644 --- a/src/event_manager_view.js +++ b/src/event_manager_view.js @@ -370,98 +370,7 @@ export function renderEventManagerMarkup(context) { ${ showTeamsSection ? ` -
-
-

${t("events.teams")}

- ${raceTeams.length} -
-
-

${t("events.team_race_intro")}

-

${t("events.team_steps")}

-
- - - -
-

${t("events.team_hint")}

-
-
-

${t("events.team_drivers")}

-

${t("events.team_form_drivers")}

- ${teamDriverPool.fallback ? `

${t("events.team_driver_fallback")}

` : ""} -
- ${ - teamDriverPool.drivers.length - ? teamDriverPool.drivers - .map( - (driver) => ` - - ` - ) - .join("") - : `

${t("common.no_entries")}

` - } -
-
-
-

${t("events.team_cars")}

-

${t("events.team_form_cars")}

-
- ${ - state.cars.length - ? state.cars - .map( - (car) => ` - - ` - ) - .join("") - : `

${t("common.no_entries")}

` - } -
-
-
-
- ${ - raceTeams.length - ? raceTeams - .map( - (team) => ` -
-
- ${escapeHtml(team.name)} -
${t("events.team_drivers")}: ${escapeHtml( - team.driverIds.map((driverId) => getDriverDisplayById(driverId)).join(", ") || "-" - )}
-
${t("events.team_cars")}: ${escapeHtml( - team.carIds - .map((carId) => { - const car = state.cars.find((item) => item.id === carId); - return car ? `${car.name} (${car.transponder || "-"})` : ""; - }) - .filter(Boolean) - .join(", ") || "-" - )}
-
-
- - -
-
- ` - ) - .join("") - : `

${t("events.no_teams")}

` - } -
-
-
+
` : "" } @@ -869,59 +778,6 @@ export function renderEventManagerMarkup(context) { : "" } - ${ - editingTeam - ? ` - - ` - : "" - } - ${ editingSession ? ` diff --git a/src/styles.css b/src/styles.css index f80a158..ebb1264 100644 --- a/src/styles.css +++ b/src/styles.css @@ -4853,3 +4853,15 @@ details.event-group > summary { cursor: pointer; list-style: revert; } .race-overview-phase summary { cursor: pointer; padding: 4px 0; } .race-overview-phase h4 { margin: 12px 0 6px; } @media (max-width: 640px) { .race-overview-podium { grid-template-columns: 1fr; } } + +/* Team race setup (Events → Manage) */ +.team-setup-toolbar { display: flex; flex-wrap: wrap; align-items: flex-end; gap: 10px; } +.team-setup-toolbar label { display: grid; gap: 4px; max-width: 180px; } +.team-setup-grid { display: grid; grid-template-columns: repeat(auto-fill, minmax(240px, 1fr)); gap: 12px; } +.team-setup-card { display: grid; gap: 8px; align-content: start; padding: 12px; border: 1px solid var(--line); border-radius: 12px; background: var(--surface-card); } +.team-setup-card label { display: grid; gap: 4px; } +.team-setup-name { font-weight: 700; } +.team-setup-drivers { list-style: none; margin: 0; padding: 0; display: grid; gap: 4px; } +.team-setup-drivers li { display: flex; justify-content: space-between; align-items: center; gap: 8px; } +.team-setup-issues { margin: 0; padding-left: 18px; color: var(--danger, #c0392b); } +.team-setup-ready { color: var(--success, #2e8b57); font-weight: 600; } diff --git a/src/team_race_logic.js b/src/team_race_logic.js new file mode 100644 index 0000000..5c4ba98 --- /dev/null +++ b/src/team_race_logic.js @@ -0,0 +1,67 @@ +// Team race setup (Events → Manage → Team race): teams of drivers sharing a car (or each with +// their own transponder), the race length, and the checks before the start. Plain data in, +// new team lists out; the view (team_race_setup_view.js) saves them in event.raceConfig.teams. + +// Drivers dealt out over `count` teams in turn (1,2,3,1,2,3...), so the teams differ by at most +// one driver. Teams already there keep their id, name and car; extra ones are added. +export function splitIntoTeams(driverIds, count, existing = [], { uid, nameFor }) { + const total = Math.max(1, Math.round(Number(count) || 1)); + const teams = Array.from({ length: total }, (_, index) => { + const kept = existing[index]; + return { id: kept?.id || uid("team"), name: kept?.name || nameFor(index + 1), driverIds: [], carIds: kept ? [...(kept.carIds || [])] : [] }; + }); + driverIds.forEach((driverId, index) => teams[index % total].driverIds.push(driverId)); + return teams; +} + +// Puts a driver on one team (teamId "" takes them off every team). +export function moveDriverToTeam(teams, driverId, teamId) { + return teams.map((team) => { + const without = team.driverIds.filter((id) => id !== driverId); + return { ...team, driverIds: team.id === teamId ? [...without, driverId] : without }; + }); +} + +// The team's car (carId "" = none, the drivers' own transponders count). A car is on one team only. +export function setTeamCar(teams, teamId, carId) { + return teams.map((team) => { + if (team.id === teamId) return { ...team, carIds: carId ? [carId] : [] }; + return carId ? { ...team, carIds: team.carIds.filter((id) => id !== carId) } : team; + }); +} + +export function renameTeam(teams, teamId, name) { + return teams.map((team) => (team.id === teamId ? { ...team, name: String(name || "").trim() || team.name } : team)); +} + +export function removeTeam(teams, teamId) { + return teams.filter((team) => team.id !== teamId); +} + +// The transponders that count for a team: its car's, then each driver's own. +export function getTeamTransponders(team, { drivers = [], cars = [] }) { + const values = [ + ...team.carIds.map((id) => cars.find((car) => car.id === id)?.transponder), + ...team.driverIds.map((id) => drivers.find((driver) => driver.id === id)?.transponder), + ]; + return [...new Set(values.map((value) => String(value || "").trim()).filter(Boolean))]; +} + +// What to fix before the start: teams without drivers or transponder, a transponder on two +// teams (laps would go to the wrong one), and chosen drivers on no team. +export function findTeamRaceIssues(teams, { drivers = [], cars = [], driverIds = [] }) { + const owners = new Map(); + teams.forEach((team) => getTeamTransponders(team, { drivers, cars }).forEach((tp) => owners.set(tp, [...(owners.get(tp) || []), team.name]))); + const placed = new Set(teams.flatMap((team) => team.driverIds)); + return { + noTeams: teams.length < 2, + empty: teams.filter((team) => !team.driverIds.length).map((team) => team.name), + noTransponder: teams.filter((team) => team.driverIds.length && !getTeamTransponders(team, { drivers, cars }).length).map((team) => team.name), + shared: [...owners.entries()].filter(([, names]) => names.length > 1).map(([transponder, names]) => ({ transponder, teams: names })), + unplaced: driverIds.filter((id) => !placed.has(id)), + }; +} + +export function hasBlockingTeamIssues(issues) { + return issues.noTeams || issues.empty.length > 0 || issues.noTransponder.length > 0 || issues.shared.length > 0; +} diff --git a/src/team_race_setup_view.js b/src/team_race_setup_view.js new file mode 100644 index 0000000..c840d23 --- /dev/null +++ b/src/team_race_setup_view.js @@ -0,0 +1,116 @@ +// Team race setup (Events → Manage): 1 teams and drivers, 2 car / transponder per team, +// 3 length → the team race session; the checks show what blocks the start. +// 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"; + +export function mountTeamRaceSetup(root, deps) { + if (!root) return; + const { event, state, t, escapeHtml, uid, saveState, refresh, getSessionsForEvent, getEventTeams, getTeamDriverPool, normalizeSession, getStatusLabel } = deps; + const teams = getEventTeams(event); + 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"; + 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); + const teamOf = (driverId) => teams.find((team) => team.driverIds.includes(driverId)); + const label = (id) => { const item = driver(id); return item ? `${item.name}${item.transponder ? ` (${item.transponder})` : ""}` : "?"; }; + const carOwner = (carId, teamId) => teams.find((team) => team.id !== teamId && team.carIds.includes(carId))?.name || ""; + const disabled = editable ? "" : "disabled"; + + const teamCard = (team) => { + const transponders = getTeamTransponders(team, { drivers: state.drivers, cars: state.cars }); + const choices = pool.drivers.filter((item) => !team.driverIds.includes(item.id)) + .sort((a, b) => Number(Boolean(teamOf(a.id))) - Number(Boolean(teamOf(b.id)))); + return ` +
+ + + ${editable ? `` : ""} + + ${t("team_setup.transponders")}: ${escapeHtml(transponders.join(", ") || "-")} + ${editable ? `` : ""} +
`; + }; + + const problems = [ + issues.noTeams ? t("team_setup.issue_no_teams") : "", + ...issues.empty.map((name) => t("team_setup.issue_empty", { team: name })), + ...issues.noTransponder.map((name) => t("team_setup.issue_no_transponder", { team: name })), + ...issues.shared.map((item) => t("team_setup.issue_shared", { tp: item.transponder, teams: item.teams.join(", ") })), + ].filter(Boolean); + const unplaced = issues.unplaced.map((id) => driver(id)?.name).filter(Boolean); + + root.innerHTML = ` +

${t("team_setup.title")}

${teams.length}
+
+

${t("team_setup.intro")}

+ ${pool.fallback ? `

${t("events.team_driver_fallback")}

` : ""} +

${t("team_setup.step_teams")}

+ ${editable ? `
+ + + +
` : `

${t("team_setup.locked", { status: getStatusLabel(session.status) })}

`} +
${teams.map(teamCard).join("") || `

${t("events.no_teams")}

`}
+ ${unplaced.length ? `

${t("team_setup.unplaced", { names: unplaced.join(", ") })}

` : ""} +

${t("team_setup.step_format")}

+
+ + ${session + ? `${escapeHtml(session.name)} · ${escapeHtml(getStatusLabel(session.status))}` + : ``} +
+

${t("team_setup.step_check")}

+ ${problems.length + ? `` + : `

${t(session ? "team_setup.ready" : "team_setup.ready_create")}

`} +
`; + + // 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))]; + saveState(); + refresh(); + }; + const nameFor = (number) => t("team_setup.team_n", { n: number }); + + root.querySelector("#teamSetupSplit")?.addEventListener("click", () => { + const count = Number(root.querySelector("#teamSetupCount").value); + if (teams.some((team) => team.driverIds.length) && !window.confirm(t("team_setup.split_confirm"))) return; + save(splitIntoTeams(poolIds, count, teams, { uid, nameFor })); + }); + root.querySelector("#teamSetupAdd")?.addEventListener("click", () => save([...teams, { id: uid("team"), name: nameFor(teams.length + 1), driverIds: [], carIds: [] }])); + root.querySelectorAll("[data-team-name]").forEach((input) => input.addEventListener("change", () => save(renameTeam(teams, input.dataset.teamName, input.value)))); + root.querySelectorAll("[data-team-add]").forEach((select) => select.addEventListener("change", () => select.value && save(moveDriverToTeam(teams, select.value, select.dataset.teamAdd)))); + 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)); + event.raceConfig = { ...(event.raceConfig || {}), teamRaceDurationMin: minutes }; + if (session && session.status === "ready") session.durationMin = minutes; + saveState(); + refresh(); + }); + root.querySelector("#teamSetupCreate")?.addEventListener("click", () => { + const minutes = Math.max(1, Math.round(Number(root.querySelector("#teamSetupLength").value) || lengthMin)); + event.raceConfig = { ...(event.raceConfig || {}), teamRaceDurationMin: minutes }; + state.sessions.push(normalizeSession({ + id: uid("session"), eventId: event.id, name: t("events.team_race"), type: "team_race", durationMin: minutes, maxCars: null, + mode: "race", status: "ready", assignments: [], driverIds: [...new Set(teams.flatMap((team) => team.driverIds))], + startMode: "mass", followUpSec: event.raceConfig.followUpSec || 0, + })); + saveState(); + refresh(); + }); +} diff --git a/tests/browser_race_setup.js b/tests/browser_race_setup.js index ed3c85b..7a43602 100644 --- a/tests/browser_race_setup.js +++ b/tests/browser_race_setup.js @@ -104,25 +104,21 @@ export async function runRaceSetupSmoke({ evaluate, navigate, fill, savedState, const driver = current.drivers.find(item => item.name === "Browser Driver Updated"); const car = current.cars.find(item => item.name === "Browser Car Updated"); const raceState = () => findEvent("Browser Endurance Updated"); - await fill("teamForm", { teamName: "Browser Team" }); - await evaluate(`document.querySelector('[form="teamForm"][name="teamDriverIds"][value="${driver.id}"]').checked=true`); - await submit("teamForm"); - await waitFor(async () => (await raceState()).raceConfig.teams.some(team => team.name === "Browser Team"), "team create"); - const team = (await raceState()).raceConfig.teams.find(item => item.name === "Browser Team"); - assert.deepEqual(team.driverIds, [driver.id]); - await click("team-edit-" + team.id); - await fill("teamEditForm", { teamName: "Browser Team Updated" }); - await evaluate(`document.querySelector('#teamEditForm [name="teamCarIds"][value="${car.id}"]').checked=true`); - await pause(5500); - assert.equal(await evaluate('document.getElementById("teamEditForm").elements.namedItem("teamName").value'), "Browser Team Updated"); - await click("teamEditSave"); - await waitFor(async () => (await raceState()).raceConfig.teams.some(item => item.name === "Browser Team Updated" && item.carIds.includes(car.id)), "team membership update"); + const setValue = (selector, value) => evaluate(`(() => { const node = document.querySelector(${JSON.stringify(selector)}); node.value = ${JSON.stringify(value)}; node.dispatchEvent(new Event("change", { bubbles: true })); })()`); + await waitFor(async () => await evaluate(`Boolean(document.getElementById("teamSetupAdd"))`), "team race setup"); + await click("teamSetupAdd"); + await waitFor(async () => ((await raceState()).raceConfig.teams || []).length === 1, "team create"); + const team = (await raceState()).raceConfig.teams[0]; + await setValue(`[data-team-name="${team.id}"]`, "Browser Team Updated"); + await waitFor(async () => (await raceState()).raceConfig.teams.some(item => item.name === "Browser Team Updated"), "team rename"); + await setValue(`[data-team-add="${team.id}"]`, driver.id); + await waitFor(async () => (await raceState()).raceConfig.teams[0].driverIds.includes(driver.id), "team driver"); + await setValue(`[data-team-car="${team.id}"]`, car.id); + await waitFor(async () => (await raceState()).raceConfig.teams.some(item => item.name === "Browser Team Updated" && item.carIds.includes(car.id) && item.driverIds.includes(driver.id)), "team membership update"); await navigate("race_setup", "raceWizardStepForm"); await click("event-manage-" + race.id); - await click("team-edit-" + team.id); - assert.equal(await evaluate('document.getElementById("teamEditForm").elements.namedItem("teamName").value'), "Browser Team Updated"); - assert.ok(await evaluate(`document.querySelector('#teamEditForm [name="teamCarIds"][value="${car.id}"]').checked`)); - await click("teamEditCancel"); + await waitFor(async () => (await evaluate(`document.querySelector('[data-team-name="${team.id}"]')?.value || ""`)) === "Browser Team Updated", "team kept after reopening"); + assert.equal(await evaluate(`document.querySelector('[data-team-car="${team.id}"]').value`), car.id); await fill("sessionForm", { name: "Editable Practice", type: "open_practice", durationMin: "5" }); await submit("sessionForm"); @@ -141,7 +137,7 @@ export async function runRaceSetupSmoke({ evaluate, navigate, fill, savedState, assert.equal(await evaluate('document.getElementById("sessionEditForm").elements.namedItem("type").value'), "team_race"); await click("sessionEditCancel"); assert.equal(await evaluate('document.getElementById("raceFormatForm").elements.namedItem("minLapSec").value'), "30.0"); - await click("team-delete-" + team.id); + await evaluate(`document.querySelector('[data-team-delete="${team.id}"]').click()`); await waitFor(async () => !(await raceState()).raceConfig.teams.some(item => item.id === team.id), "team deletion"); console.log("PASS race wizard/edit/reload, team create/member-edit/delete, session type/duration and lap limits"); diff --git a/tests/browser_team_membership.js b/tests/browser_team_membership.js index f248e5b..9c74aae 100644 --- a/tests/browser_team_membership.js +++ b/tests/browser_team_membership.js @@ -1,8 +1,7 @@ import assert from "node:assert/strict"; // Regression coverage for a real bug the user reported: moving a driver from one team to -// another (by ticking them on the new team's edit form - there is no separate "move" -// action) used to only ever ADD the driver to the new team, never remove them from the +// another (by picking them in the new team's "add driver" list in the team race setup) used to only ever ADD the driver to the new team, never remove them from the // old one, so the same driver ended up listed on two teams at once. Also covers the two // related findings from the same investigation: getTeamDriverPool used to ignore the // event's class/participant scoping entirely (showing every driver in the club), and @@ -39,28 +38,29 @@ export async function runTeamMembershipSmoke({ evaluate, navigate, savedState, w await navigate("race_setup", "raceWizardStepForm"); await click("event-manage-" + raceEvent.id); - await waitFor(async () => await evaluate(`Boolean(document.getElementById("teamForm"))`), "teams section visible for a race-mode event with a team_race session"); + await waitFor(async () => await evaluate(`Boolean(document.getElementById("teamSetupAdd"))`), "team race setup visible for a race-mode event with a team_race session"); + const setValue = (selector, value) => evaluate(`(() => { const node = document.querySelector(${JSON.stringify(selector)}); node.value = ${JSON.stringify(value)}; node.dispatchEvent(new Event("change", { bubbles: true })); })()`); + const teamsNow = async () => (await findEvent(raceEvent.id)).raceConfig.teams || []; - await evaluate(`(() => { const form = document.getElementById("teamForm"); form.elements.namedItem("teamName").value = "Membership Team A"; })()`); - await evaluate(`document.querySelector('[form="teamForm"][name="teamDriverIds"][value="${driverA.id}"]').checked = true`); - await submit("teamForm"); - await waitFor(async () => (await findEvent(raceEvent.id)).raceConfig.teams.some((team) => team.name === "Membership Team A"), "team A created"); + await click("teamSetupAdd"); + await waitFor(async () => (await teamsNow()).length === 1, "first team added"); + await click("teamSetupAdd"); + await waitFor(async () => (await teamsNow()).length === 2, "second team added"); + const [first, second] = await teamsNow(); + await setValue(`[data-team-name="${first.id}"]`, "Membership Team A"); + await waitFor(async () => (await teamsNow()).some((team) => team.name === "Membership Team A"), "team A renamed"); + await setValue(`[data-team-name="${second.id}"]`, "Membership Team B"); + await waitFor(async () => (await teamsNow()).some((team) => team.name === "Membership Team B"), "team B renamed"); + await setValue(`[data-team-add="${first.id}"]`, driverA.id); + await waitFor(async () => (await teamsNow())[0].driverIds.includes(driverA.id), "driver A on team A"); + await setValue(`[data-team-add="${second.id}"]`, driverB.id); + await waitFor(async () => (await teamsNow())[1].driverIds.includes(driverB.id), "driver B on team B"); - await evaluate(`(() => { const form = document.getElementById("teamForm"); form.elements.namedItem("teamName").value = "Membership Team B"; })()`); - await evaluate(`document.querySelector('[form="teamForm"][name="teamDriverIds"][value="${driverB.id}"]').checked = true`); - await submit("teamForm"); - await waitFor(async () => (await findEvent(raceEvent.id)).raceConfig.teams.some((team) => team.name === "Membership Team B"), "team B created"); - const teamB = (await findEvent(raceEvent.id)).raceConfig.teams.find((team) => team.name === "Membership Team B"); + const hintText = await evaluate(`document.querySelector('[data-team-add="${second.id}"] option[value="${driverA.id}"]')?.textContent || ""`); + assert.match(hintText, /Membership Team A/, "the add list names the other team a driver is currently on, before the move happens"); - await click("team-edit-" + teamB.id); - await waitFor(async () => await evaluate(`Boolean(document.getElementById("teamEditForm"))`), "team B edit form open"); - const hintText = await evaluate(`document.querySelector('#teamEditForm [name="teamDriverIds"][value="${driverA.id}"]')?.closest("label")?.textContent || ""`); - assert.match(hintText, /Membership Team A/, "the edit form names the other team a driver is currently on, before the move happens"); - - await evaluate(`document.querySelector('#teamEditForm [name="teamDriverIds"][value="${driverA.id}"]').checked = true`); - await pause(5500); // outlast the periodic version poll, matching the existing team-edit browser coverage - await click("teamEditSave"); - await waitFor(async () => (await findEvent(raceEvent.id)).raceConfig.teams.find((team) => team.name === "Membership Team B").driverIds.includes(driverA.id), "driver A saved onto team B"); + await setValue(`[data-team-add="${second.id}"]`, driverA.id); + await waitFor(async () => (await teamsNow()).find((team) => team.name === "Membership Team B").driverIds.includes(driverA.id), "driver A saved onto team B"); const afterMove = await findEvent(raceEvent.id); const teamA = afterMove.raceConfig.teams.find((team) => team.name === "Membership Team A"); diff --git a/tests/run.js b/tests/run.js index 1bdd5a0..46654b6 100644 --- a/tests/run.js +++ b/tests/run.js @@ -1,4 +1,5 @@ import "./auth.test.js"; +import "./team_race_logic.test.js"; import "./race_overview.test.js"; import "./leader_call_logic.test.js"; import "./decoder_sim.test.js"; diff --git a/tests/team_race_logic.test.js b/tests/team_race_logic.test.js new file mode 100644 index 0000000..2b9ea82 --- /dev/null +++ b/tests/team_race_logic.test.js @@ -0,0 +1,47 @@ +import test from "node:test"; +import assert from "node:assert/strict"; +import { splitIntoTeams, moveDriverToTeam, setTeamCar, renameTeam, removeTeam, getTeamTransponders, findTeamRaceIssues, hasBlockingTeamIssues } from "../src/team_race_logic.js"; + +let n = 0; +const uid = (prefix) => `${prefix}_${++n}`; +const nameFor = (i) => `Team ${i}`; + +test("splitIntoTeams deals drivers in turn and keeps existing teams' id, name and car", () => { + const existing = [{ id: "t1", name: "Red", driverIds: ["x"], carIds: ["c1"] }]; + const teams = splitIntoTeams(["a", "b", "c", "d", "e"], 2, existing, { uid, nameFor }); + assert.deepEqual(teams.map((team) => [team.name, team.driverIds, team.carIds]), [["Red", ["a", "c", "e"], ["c1"]], ["Team 2", ["b", "d"], []]]); + assert.equal(teams[0].id, "t1"); +}); + +test("moving a driver takes them off the old team; setting a car takes it off other teams", () => { + let teams = [{ id: "t1", name: "A", driverIds: ["a"], carIds: ["c1"] }, { id: "t2", name: "B", driverIds: ["b"], carIds: [] }]; + teams = moveDriverToTeam(teams, "a", "t2"); + assert.deepEqual(teams.map((team) => team.driverIds), [[], ["b", "a"]]); + teams = setTeamCar(teams, "t2", "c1"); + assert.deepEqual(teams.map((team) => team.carIds), [[], ["c1"]]); + teams = moveDriverToTeam(teams, "b", ""); + assert.deepEqual(teams[1].driverIds, ["a"]); + assert.equal(renameTeam(teams, "t1", " ")[0].name, "A"); + assert.equal(renameTeam(teams, "t1", "Blue")[0].name, "Blue"); + assert.equal(removeTeam(teams, "t1").length, 1); +}); + +test("team transponders and the checks before the start", () => { + const drivers = [{ id: "a", transponder: "11" }, { id: "b", transponder: "" }, { id: "c", transponder: "11" }, { id: "d", transponder: "" }]; + const cars = [{ id: "c1", transponder: "900" }]; + const teams = [ + { id: "t1", name: "A", driverIds: ["a", "b"], carIds: ["c1"] }, + { id: "t2", name: "B", driverIds: ["c"], carIds: [] }, + { id: "t3", name: "C", driverIds: ["d"], carIds: [] }, + { id: "t4", name: "D", driverIds: [], carIds: [] }, + ]; + assert.deepEqual(getTeamTransponders(teams[0], { drivers, cars }), ["900", "11"]); + const issues = findTeamRaceIssues(teams, { drivers, cars, driverIds: ["a", "b", "c", "d", "e"] }); + assert.deepEqual(issues.empty, ["D"]); + assert.deepEqual(issues.noTransponder, ["C"]); + assert.deepEqual(issues.shared, [{ transponder: "11", teams: ["A", "B"] }]); + assert.deepEqual(issues.unplaced, ["e"]); + assert.equal(hasBlockingTeamIssues(issues), true); + const ok = findTeamRaceIssues([{ id: "t1", name: "A", driverIds: ["a"], carIds: [] }, { id: "t2", name: "B", driverIds: ["b"], carIds: ["c1"] }], { drivers, cars }); + assert.equal(hasBlockingTeamIssues(ok), false); +});