fix(race): finish the lap you are on, one clock owner, edits survive refresh, participants editable (1.59.0)
This commit is contained in:
1 parent
afb8829b16
commit
db6a9f19e4
16 files changed
+313
-39
No files matched your search
@@ -1,4 +1,4 @@
|
||||
import { orderSessionsForRunning, moveSessionInRunningOrder } from "./event_race_logic.js";
|
||||
import { orderSessionsForRunning, moveSessionInRunningOrder, applyFormatToPendingSessions, syncParticipantsToSessions } from "./event_race_logic.js";
|
||||
import { setSessionGroupOpen } from "./event_manager_view.js";
|
||||
let activeManageTab = "setup";
|
||||
// Maps a data-target anchor id (used by the step-card overview and the race-summary
|
||||
@@ -130,6 +130,15 @@ export function renderEventManagerView(context) {
|
||||
.map((d) => `<option value="${d.id}">${escapeHtml(d.name)}</option>`)
|
||||
.join("");
|
||||
const raceDrivers = event.mode === "race" ? getEventDrivers(event) : [];
|
||||
// The checklist offers every driver of the class (a driver left out can be ticked again),
|
||||
// the chosen ones from other classes, and the rest of the club folded away.
|
||||
const chosenIds = event.raceConfig?.participantsConfigured ? (event.raceConfig.driverIds || []) : null;
|
||||
const participantChoices = event.mode === "race"
|
||||
? state.drivers.filter((driver) => !event.classId || driver.classId === event.classId || (chosenIds || []).includes(driver.id))
|
||||
: [];
|
||||
const otherClassChoices = event.mode === "race" && event.classId
|
||||
? state.drivers.filter((driver) => !participantChoices.includes(driver)).sort((a, b) => String(a.name || "").localeCompare(String(b.name || "")))
|
||||
: [];
|
||||
const teamDriverPool = event.mode === "race" ? getTeamDriverPool(event) : { drivers: [], fallback: false };
|
||||
const raceTeams = event.mode === "race" ? getEventTeams(event) : [];
|
||||
if (selectedTeamEditId && !raceTeams.some((team) => team.id === selectedTeamEditId)) {
|
||||
@@ -187,6 +196,8 @@ export function renderEventManagerView(context) {
|
||||
renderManageStatusBadgeView,
|
||||
selectedParticipantCount,
|
||||
raceDrivers,
|
||||
participantChoices,
|
||||
otherClassChoices,
|
||||
teamDriverPool,
|
||||
showTeamsSection,
|
||||
parseQualifyingHeatName,
|
||||
@@ -564,10 +575,15 @@ export function renderEventManagerView(context) {
|
||||
|
||||
if (event.mode === "race") {
|
||||
const persistRaceParticipants = () => {
|
||||
const selectedIds = Array.from(document.querySelectorAll(".race-participant:checked")).map((node) => node.value);
|
||||
const beforeIds = getEventDrivers(event).map((driver) => driver.id);
|
||||
const checked = new Set(Array.from(document.querySelectorAll(".race-participant:checked")).map((node) => node.value));
|
||||
// Keep the entry order: the ones already in stay where they were, new ones go last.
|
||||
const selectedIds = [...beforeIds.filter((id) => checked.has(id)), ...[...checked].filter((id) => !beforeIds.includes(id))];
|
||||
event.raceConfig.driverIds = selectedIds;
|
||||
event.raceConfig.participantsConfigured = true;
|
||||
syncParticipantsToSessions(state.sessions.filter((session) => session.eventId === event.id), beforeIds, selectedIds);
|
||||
saveState();
|
||||
refreshManager();
|
||||
};
|
||||
|
||||
document.querySelectorAll(".race-participant").forEach((node) => {
|
||||
@@ -727,6 +743,7 @@ export function renderEventManagerView(context) {
|
||||
e.preventDefault();
|
||||
const form = new FormData(e.currentTarget);
|
||||
const config = buildRaceFormatConfigFromForm(form, event);
|
||||
const before = { ...(event.raceConfig || {}) };
|
||||
updateEvent((item) => ({
|
||||
...item,
|
||||
raceConfig: {
|
||||
@@ -734,6 +751,7 @@ export function renderEventManagerView(context) {
|
||||
teams: getEventTeams(item),
|
||||
},
|
||||
}));
|
||||
applyFormatToPendingSessions(state.sessions.filter((session) => session.eventId === event.id), before, config);
|
||||
saveState();
|
||||
refreshManager();
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user