feat(series): ÖRC Winter format, seeding practice and heat order when creating rounds (1.43.0)

This commit is contained in:
larssand committed 2026-10-31 07:58:40 +01:00
1 parent 40c3737925
commit 74dbbf6ae0
10 files changed
+173 -11

No files matched your search

+36 -4
View File
@@ -15,7 +15,7 @@ import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudio
import { renderRaceFormatField, renderRaceFormatContextCard, getRaceSummaryItems, getRaceSummaryWarnings, renderManageStatusBadge, renderRaceWizardSteps, renderRaceWizardContent, renderRaceStandingsTable } from "./race_setup_ui.js";
import { normalizeRaceTeam as normalizeRaceTeamLogic, normalizeStoredRacePreset as normalizeStoredRacePresetLogic, getRaceFormatPresets as getRaceFormatPresetsLogic, applyRaceFormatPreset as applyRaceFormatPresetLogic, buildRaceFormatConfigFromForm as buildRaceFormatConfigFromFormLogic, normalizeEvent as normalizeEventLogic, normalizeBrandingConfig as normalizeBrandingConfigLogic, resolveEventBranding as resolveEventBrandingLogic, getRaceManageStatuses as getRaceManageStatusesLogic, buildDefaultRaceWizardDraft as buildDefaultRaceWizardDraftLogic, getRaceWizardPreset as getRaceWizardPresetLogic, applyRaceWizardPresetDefaults as applyRaceWizardPresetDefaultsLogic, ensureRaceParticipantsConfigured as ensureRaceParticipantsConfiguredLogic, buildRaceSession as buildRaceSessionLogic, buildOpenPracticeBundle as buildOpenPracticeBundleLogic, buildTrackSession as buildTrackSessionLogic, createSponsorRounds as createSponsorRoundsLogic, buildRaceSessionsFromWizard as buildRaceSessionsFromWizardLogic, getRaceWizardSessionPlan as getRaceWizardSessionPlanLogic, getEventDrivers as getEventDriversLogic, getEventTeams as getEventTeamsLogic, getTeamDriverPool as getTeamDriverPoolLogic, reassignTeamMembers as reassignTeamMembersLogic, findEventTeamForPassing as findEventTeamForPassingLogic, generateQualifyingForRace as generateQualifyingForRaceLogic, reseedUpcomingQualifying as reseedUpcomingQualifyingLogic, moveDriversIntoQualifyingHeat as moveDriversIntoQualifyingHeatLogic, parseQualifyingHeatName as parseQualifyingHeatNameLogic, generateFinalsForRace as generateFinalsForRaceLogic, applyBumpsForRace as applyBumpsForRaceLogic, buildEventSchedule as buildEventScheduleLogic } from "./event_race_logic.js";
import { normalizeRaceTeam as normalizeRaceTeamLogic, normalizeStoredRacePreset as normalizeStoredRacePresetLogic, getRaceFormatPresets as getRaceFormatPresetsLogic, applyRaceFormatPreset as applyRaceFormatPresetLogic, buildRaceFormatConfigFromForm as buildRaceFormatConfigFromFormLogic, normalizeEvent as normalizeEventLogic, normalizeBrandingConfig as normalizeBrandingConfigLogic, resolveEventBranding as resolveEventBrandingLogic, getRaceManageStatuses as getRaceManageStatusesLogic, buildDefaultRaceWizardDraft as buildDefaultRaceWizardDraftLogic, getRaceWizardPreset as getRaceWizardPresetLogic, applyRaceWizardPresetDefaults as applyRaceWizardPresetDefaultsLogic, ensureRaceParticipantsConfigured as ensureRaceParticipantsConfiguredLogic, buildRaceSession as buildRaceSessionLogic, buildOpenPracticeBundle as buildOpenPracticeBundleLogic, buildTrackSession as buildTrackSessionLogic, createSponsorRounds as createSponsorRoundsLogic, buildRaceSessionsFromWizard as buildRaceSessionsFromWizardLogic, getRaceWizardSessionPlan as getRaceWizardSessionPlanLogic, getEventDrivers as getEventDriversLogic, getEventTeams as getEventTeamsLogic, getTeamDriverPool as getTeamDriverPoolLogic, reassignTeamMembers as reassignTeamMembersLogic, findEventTeamForPassing as findEventTeamForPassingLogic, generateQualifyingForRace as generateQualifyingForRaceLogic, reseedUpcomingQualifying as reseedUpcomingQualifyingLogic, moveDriversIntoQualifyingHeat as moveDriversIntoQualifyingHeatLogic, parseQualifyingHeatName as parseQualifyingHeatNameLogic, generateFinalsForRace as generateFinalsForRaceLogic, applyBumpsForRace as applyBumpsForRaceLogic, buildEventSchedule as buildEventScheduleLogic, normalizeHeatOrder } from "./event_race_logic.js";
import { getSessionTypeLabel as getSessionTypeLabelLogic, getStatusLabel as getStatusLabelLogic, isUntimedSession as isUntimedSessionLogic, getActiveSession as getActiveSessionLogic, getLiveSession as getLiveSessionLogic, getSessionTargetMs as getSessionTargetMsLogic, getSessionLapWindow as getSessionLapWindowLogic, isCountedPassing as isCountedPassingLogic, getVisiblePassings as getVisiblePassingsLogic, getPassingValidationLabel as getPassingValidationLabelLogic, getSessionTiming as getSessionTimingLogic, ensureSessionResult as ensureSessionResultLogic, buildLeaderboard as buildLeaderboardLogic, formatLapDelta as formatLapDeltaLogic, formatLeaderboardGap as formatLeaderboardGapLogic, getCompetitorElapsedMs as getCompetitorElapsedMsLogic, getCompetitorPassings as getCompetitorPassingsLogic, getCompetitorSeedMetric as getCompetitorSeedMetricLogic, getSessionEntrants as getSessionEntrantsLogic, buildPracticeStandings as buildPracticeStandingsLogic, getQualifyingPointsValue as getQualifyingPointsValueLogic, isHighPointsTable as isHighPointsTableLogic, compareNumberSet as compareNumberSetLogic, buildQualifyingTieBreakNote as buildQualifyingTieBreakNoteLogic, hasQualifyingPrimaryTie as hasQualifyingPrimaryTieLogic, buildQualifyingStandings as buildQualifyingStandingsLogic, formatTeamActiveMemberLabel as formatTeamActiveMemberLabelLogic, buildTeamRaceStandings as buildTeamRaceStandingsLogic, buildSessionChannelStats as buildSessionChannelStatsLogic, buildTeamStintLog as buildTeamStintLogLogic, getSessionGridEntries as getSessionGridEntriesLogic, getSessionGridOrder as getSessionGridOrderLogic, ensureSessionDriverOrder as ensureSessionDriverOrderLogic, buildFinalStandings as buildFinalStandingsLogic, getTrackRecordMs as getTrackRecordMsLogic } from "./timing_logic.js";
import { normalizeTrackLayouts, getTrackLayoutIdAt, getTrackLayoutLabel, nextTrackLayoutLabel, findRaceSessionBlockingLayoutChange, isPracticeSessionType, isTrackLayoutInUse } from "./track_layouts_logic.js";
@@ -575,7 +575,7 @@ const getSeriesStandings = (series) => buildSeriesStandings(series, {
classNames: new Map(state.classes.map((item) => [item.id, item.name])),
});
// One race per date and class, named "<series> #<round> <class>", with the chosen race format.
const createSeriesEvents = (series, dates, presetId, format = {}) => {
const createSeriesEvents = (series, dates, presetId, format = {}, { heatOrder = "", seedPractice = false, seedPracticeMin = 5, seedLaps = 3, seedMethod = "consecutive" } = {}) => {
const existingDates = new Set(state.events.filter((event) => series.eventIds.includes(event.id)).map((event) => event.date));
const allDates = [...new Set([...existingDates, ...dates])].sort();
let created = 0;
@@ -587,6 +587,14 @@ const createSeriesEvents = (series, dates, presetId, format = {}) => {
applyRaceFormatPreset(event, presetId);
state.events.push(event);
if (Object.keys(format).length) setSeriesRoundFormat(event.id, format);
if (heatOrder) event.raceConfig.heatOrder = normalizeHeatOrder(heatOrder);
// A practice before qualifying seeds the heats (no driver list: it follows the round's
// participants, set later).
if (seedPractice) {
state.sessions.push(buildRaceSession(event.id, t("series.seed_practice_name"), "practice", Math.max(1, Math.round(seedPracticeMin)), {
startMode: "mass", seedBestLapCount: seedLaps, seedMethod,
}));
}
series.eventIds.push(event.id);
created += 1;
});
@@ -921,7 +929,14 @@ const TRANSLATIONS = {
"series.col_finals": "Finaler",
"series.col_per_heat": "Max bilar/heat",
"series.col_status": "Status",
"series.base_format": "Övrigt format (tider, starttyp)",
"series.base_format": "Format",
"series.seed_practice": "Seedningsträning före kval",
"series.seed_practice_min": "Träning, minuter",
"series.seed_method": "Seedas på",
"series.seed_laps": "Antal varv (N)",
"series.seed_best_lap": "Bästa enskilda varv",
"series.seed_practice_name": "Seedningsträning",
"series.seed_hint": "Varje deltävling får en träning först. \"Generera kval\" delar sedan in heaten efter träningstiderna, så att lika snabba förare kör tillsammans. \"Reseeda kommande kval\" i tävlingen delar om efter kvalrankingen.",
"series.make_qualifying": "Skapa kval",
"series.make_finals": "Skapa finaler",
"series.open_race": "Öppna",
@@ -1776,6 +1791,11 @@ const TRANSLATIONS = {
"events.preset_custom": "Custom / nuvarande värden",
"events.preset_short_technical": "Kort teknisk bana 16s",
"events.preset_club_qualifying": "Klubbrace kval + final",
"events.preset_orc_winter": "ÖRC Winter (3 kval, 6/heat, 3 finaler)",
"events.heat_order": "Heatordning",
"events.heat_order_hint": "Kvalheaten seedas efter practice (sedan kvalrankingen vid reseed). Välj om det snabbaste heatet körs först eller sist.",
"events.heat_order_fastest_last": "Snabbaste heatet sist",
"events.heat_order_fastest_first": "Snabbaste heatet först",
"events.preset_ifmar": "IFMAR-stil kval/final",
"events.preset_endurance": "Endurance / lagrace",
"events.tie_break_note": "Tie-break",
@@ -2763,7 +2783,14 @@ const TRANSLATIONS = {
"series.col_finals": "Finals",
"series.col_per_heat": "Max cars/heat",
"series.col_status": "Status",
"series.base_format": "Other format (times, start mode)",
"series.base_format": "Format",
"series.seed_practice": "Seeding practice before qualifying",
"series.seed_practice_min": "Practice, minutes",
"series.seed_method": "Seed on",
"series.seed_laps": "Number of laps (N)",
"series.seed_best_lap": "Best single lap",
"series.seed_practice_name": "Seeding practice",
"series.seed_hint": "Each round gets a practice first. \"Generate qualifying\" then splits the heats on the practice times, so drivers of equal pace run together. \"Reseed upcoming qualifying\" in the race re-splits on the qualifying standings.",
"series.make_qualifying": "Create qualifying",
"series.make_finals": "Create finals",
"series.open_race": "Open",
@@ -3618,6 +3645,11 @@ const TRANSLATIONS = {
"events.preset_custom": "Custom / current values",
"events.preset_short_technical": "Short technical track 16s",
"events.preset_club_qualifying": "Club race qual + finals",
"events.preset_orc_winter": "ÖRC Winter (3 quals, 6/heat, 3 finals)",
"events.heat_order": "Heat order",
"events.heat_order_hint": "Qualifying heats are seeded from practice (then from the qualifying standings on reseed). Choose whether the fastest heat runs first or last.",
"events.heat_order_fastest_last": "Fastest heat last",
"events.heat_order_fastest_first": "Fastest heat first",
"events.preset_ifmar": "IFMAR-style qual/finals",
"events.preset_endurance": "Endurance / team race",
"events.tie_break_note": "Tie-break",
+5
View File
@@ -535,6 +535,11 @@ export function renderEventManagerMarkup(context) {
"events.prologue_hint",
`<select name="qualPrologueSec">${PROLOGUE_OPTIONS_SEC.map((seconds) => `<option value="${seconds}" ${event.raceConfig.qualPrologueSec === seconds ? "selected" : ""}>${formatPrologueOption(seconds, t)}</option>`).join("")}</select>`
) : ""}
${showBasicQualifyingFields ? renderRaceFormatFieldView(
"events.heat_order",
"events.heat_order_hint",
`<select name="heatOrder">${["fastest_last", "fastest_first"].map((order) => `<option value="${order}" ${event.raceConfig.heatOrder === order ? "selected" : ""}>${t(`events.heat_order_${order}`)}</option>`).join("")}</select>`
) : ""}
${raceFormatAdvanced
? renderRaceFormatFieldView(
"events.qual_seed_laps",
+45 -2
View File
@@ -102,6 +102,34 @@ export function getRaceFormatPresets({ state, t, uid, normalizeStoredRacePreset
bumpCount: 0,
},
},
{
// ÖRC Winter Championship: 3 x 5 min qualifying (own clock), the best of two rounds
// compared, max 6 per heat and final, 3 finals of which 2 count, slowest heat first.
id: "orc_winter",
label: t("events.preset_orc_winter"),
values: {
qualifyingScoring: "best",
qualifyingRounds: 3,
carsPerHeat: 6,
qualDurationMin: 5,
qualStartMode: "flying",
qualSeedLapCount: 3,
qualSeedMethod: "consecutive",
countedQualRounds: 2,
qualifyingPointsTable: "rank_low",
qualifyingTieBreak: "rounds",
carsPerFinal: 6,
finalLegs: 3,
countedFinalLegs: 2,
finalDurationMin: 5,
finalStartMode: "position",
followUpSec: 15,
minLapMs: 12000,
maxLapMs: 60000,
bumpCount: 0,
heatOrder: "fastest_last",
},
},
{
id: "endurance",
label: t("events.preset_endurance"),
@@ -187,6 +215,7 @@ export function buildRaceFormatConfigFromForm(form, event, { normalizeStartMode,
maxLapMs: Math.max(1000, Math.round((Number(form.get("maxLapSec") || 60) || 60) * 1000)),
bumpCount: Math.max(0, Number(form.get("bumpCount") || 0) || 0),
reserveBumpSlots: form.get("reserveBumpSlots") === "on",
heatOrder: normalizeHeatOrder(form.get("heatOrder") ?? event.raceConfig.heatOrder),
driverIds: event.raceConfig.driverIds || [],
participantsConfigured: event.raceConfig.participantsConfigured !== false,
finalsSource: String(form.get("finalsSource") || "qualifying") === "practice" ? "practice" : "qualifying",
@@ -231,6 +260,7 @@ export function normalizeEvent(event, { normalizeBrandingConfig, normalizeStartM
maxLapMs: Math.max(0, Number(event?.raceConfig?.maxLapMs || 60000) || 60000),
bumpCount: Math.max(0, Number(event?.raceConfig?.bumpCount || 0) || 0),
reserveBumpSlots: event?.raceConfig?.reserveBumpSlots !== false,
heatOrder: normalizeHeatOrder(event?.raceConfig?.heatOrder),
driverIds: Array.isArray(event?.raceConfig?.driverIds) ? event.raceConfig.driverIds : [],
participantsConfigured: Boolean(event?.raceConfig?.participantsConfigured),
finalsSource: event?.raceConfig?.finalsSource === "practice" ? "practice" : "qualifying",
@@ -625,6 +655,19 @@ export function findEventTeamForPassing(event, driverId, carId, { getEventTeams
// Qualifying heats as even as possible: 9 drivers with max 8 per heat -> 5 + 4, never 8 + 1
// (someone driving alone). The number of heats follows the number of participants. Order is
// kept; earlier heats get the extra driver.
// Which qualifying heat runs first. Seeded heats are built fastest-first; most club races
// run the fastest heat last. Races saved before this option keep fastest first.
export const HEAT_ORDERS = ["fastest_first", "fastest_last"];
export function normalizeHeatOrder(value) {
return HEAT_ORDERS.includes(String(value || "")) ? String(value) : "fastest_first";
}
// Seeded rows (fastest first) split into heats in running order (heat 1 first).
export function buildSeededHeats(rows, carsPerHeat, heatOrder) {
const heats = splitIntoBalancedGroups(rows, carsPerHeat);
return normalizeHeatOrder(heatOrder) === "fastest_last" ? heats.reverse() : heats;
}
export function splitIntoBalancedGroups(items, maxSize) {
const list = Array.isArray(items) ? items : [];
if (!list.length) return [];
@@ -667,7 +710,7 @@ export function generateQualifyingForRace(event, { buildPracticeStandings, getEv
? String(event.raceConfig.qualSeedMethod).toLowerCase()
: "best_sum";
const followUpSec = Math.max(0, Number(event.raceConfig?.followUpSec || 0) || 0);
const heats = splitIntoBalancedGroups(fallbackRows, carsPerHeat);
const heats = buildSeededHeats(fallbackRows, carsPerHeat, event.raceConfig?.heatOrder);
let created = 0;
heats.forEach((heatRows, heatIndex) => {
@@ -738,7 +781,7 @@ export function reseedUpcomingQualifying(event, { buildQualifyingStandings, buil
const carsPerHeat = Math.max(2, Number(event.raceConfig?.carsPerHeat || 8) || 8);
// Same even split as generateQualifyingForRace, so reseeded heats line up with the generated ones.
const heats = splitIntoBalancedGroups(sourceRows, carsPerHeat);
const heats = buildSeededHeats(sourceRows, carsPerHeat, event.raceConfig?.heatOrder);
const sessionsByRound = new Map();
getSessionsForEvent(event.id)
.filter((session) => session.type === "qualification" && session.generated && session.status === "ready")
+22 -1
View File
@@ -169,7 +169,13 @@ export function renderSeriesView(deps) {
<label><span>${t("series.col_qual")}</span><input type="number" min="1" name="qualifyingRounds" value="3" /></label>
<label><span>${t("series.col_finals")}</span><input type="number" min="1" name="finalLegs" value="3" /></label>
<label><span>${t("series.col_per_heat")}</span><input type="number" min="2" name="carsPerHeat" value="6" /></label>
<label><span>${t("series.base_format")}</span><select name="presetId">${getRaceFormatPresets().map((preset) => `<option value="${escapeHtml(preset.id)}">${escapeHtml(preset.label || preset.name)}</option>`).join("")}</select></label>
<label><span>${t("series.base_format")}</span><select name="presetId" data-series-format>${getRaceFormatPresets().map((preset) => `<option value="${escapeHtml(preset.id)}" ${preset.id === "orc_winter" ? "selected" : ""}>${escapeHtml(preset.label || preset.name)}</option>`).join("")}</select></label>
<label class="series-check"><input type="checkbox" name="seedPractice" checked /><span>${t("series.seed_practice")}</span></label>
<label><span>${t("series.seed_practice_min")}</span><input type="number" min="1" name="seedPracticeMin" value="5" /></label>
<label><span>${t("series.seed_method")}</span><select name="seedMethod">${[["consecutive", 3], ["best_sum", 3], ["average", 3], ["best_lap", 0]].map(([method]) => `<option value="${method}">${t(method === "best_lap" ? "series.seed_best_lap" : `events.seed_method_${method}`)}</option>`).join("")}</select></label>
<label><span>${t("series.seed_laps")}</span><input type="number" min="1" name="seedLaps" value="3" /></label>
<label><span>${t("events.heat_order")}</span><select name="heatOrder">${["fastest_last", "fastest_first"].map((order) => `<option value="${order}">${t(`events.heat_order_${order}`)}</option>`).join("")}</select></label>
<p class="hint series-create-hint">${t("series.seed_hint")}</p>
<div class="series-create-actions"><button class="btn btn-primary" type="submit" ${series.classIds.length ? "" : "disabled"}>${t("series.create_events")}</button></div>
</form>
${series.classIds.length ? "" : `<p class="hint">${t("series.pick_classes_first")}</p>`}
@@ -244,11 +250,26 @@ export function renderSeriesView(deps) {
const data = new FormData(event.currentTarget);
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"), {
qualifyingRounds: data.get("qualifyingRounds"), finalLegs: data.get("finalLegs"), carsPerHeat: data.get("carsPerHeat"),
}, {
heatOrder: String(data.get("heatOrder") || "fastest_last"),
seedPractice: data.get("seedPractice") === "on",
seedPracticeMin: Number(data.get("seedPracticeMin")) || 5,
// "Best lap" = no lap-count metric: practice is then ranked on each driver's best lap.
seedLaps: seedMethod === "best_lap" ? 0 : Math.max(1, Number(data.get("seedLaps")) || 3),
seedMethod: seedMethod === "best_lap" ? "best_sum" : seedMethod,
});
renderView();
});
// Picking a format fills the round numbers it defines (they can still be changed before creating).
const createForm = document.getElementById("seriesCreateEvents");
createForm?.querySelector("[data-series-format]")?.addEventListener("change", (event) => {
const values = getRaceFormatPresets().find((preset) => preset.id === event.target.value)?.values || {};
["qualifyingRounds", "finalLegs", "carsPerHeat"].forEach((name) => { if (values[name]) createForm.elements[name].value = values[name]; });
if (values.heatOrder) createForm.elements.heatOrder.value = values.heatOrder;
});
dom.view.querySelector("[data-series-add-existing]")?.addEventListener("change", (event) => {
if (!event.target.value) return;
series.eventIds = [...new Set([...series.eventIds, event.target.value])];
+5 -1
View File
@@ -4670,7 +4670,10 @@ tr.is-removed td.lap-actions {
.training-race-origin { color: var(--muted); font-size: 0.72rem; }
/* Series hub: rounds table */
.series-create { display: grid; grid-template-columns: minmax(200px, 2fr) repeat(3, minmax(90px, 1fr)) minmax(160px, 2fr) auto; gap: 12px; align-items: end; }
.series-create { display: grid; grid-template-columns: repeat(auto-fill, minmax(170px, 1fr)); gap: 12px; align-items: end; }
.series-create > label:first-child, .series-create .series-create-hint, .series-create .series-create-actions { grid-column: 1 / -1; }
.series-create .series-check { display: flex; align-items: center; gap: 8px; min-height: 38px; }
.series-create .series-create-hint { margin: 0; }
.series-create label { display: grid; gap: 4px; }
.series-create textarea { font-family: inherit; }
.series-rounds-table { width: 100%; border-collapse: collapse; }
@@ -4687,6 +4690,7 @@ tr.is-removed td.lap-actions {
.series-status-done { border-color: var(--success, #2e9d5b); }
.series-status-qual_running, .series-status-finals { border-color: var(--accent); }
@media (max-width: 900px) { .series-create { grid-template-columns: 1fr 1fr; } }
@media (max-width: 480px) { .series-create { grid-template-columns: 1fr; } }
/* Settings -> public address */
.settings-public-address { display: flex; gap: 8px; flex-wrap: wrap; align-items: center; }