fix(events): easy setup first in Manage; manual heats and branding folded away (1.67.2)

This commit is contained in:
larssand committed 2026-11-05 22:21:47 +01:00
1 parent a9146d9662
commit 8a8b2417fd
6 files changed
+184 -163

No files matched your search

+166 -160
View File
@@ -111,166 +111,7 @@ export function renderEventManagerMarkup(context) {
`)
.join("");
return `
<section class="panel" id="manage-session-plan">
<div class="panel-header">
<h3>${t("events.manage_title")}: ${escapeHtml(event.name)}</h3>
</div>
<div class="panel-body">
<form id="sessionForm" class="form-grid cols-5">
<label>
${t("events.session_name")}
<input required name="name" placeholder="${t("events.session_name")}" />
</label>
<label>
${t("events.session_type_label")}
<select id="sessionCreateType" name="type">
${sessionTypeChoices.map((s) => `<option value="${s}">${getSessionTypeLabel(s)}</option>`).join("")}
</select>
<small>${t(sessionTypeHintKey)}</small>
</label>
<label>
${t("events.session_duration_label")}
<input required type="number" min="1" name="durationMin" placeholder="${t("events.duration_placeholder")}" />
<small>${t("events.session_duration_hint")}</small>
</label>
<label>
${t("events.session_followup_label")}
<input type="number" min="0" step="1" name="followUpSec" placeholder="${t("events.follow_up_sec")}" value="${event.mode === "race" ? event.raceConfig.followUpSec || 0 : 0}" />
<small>${t("events.session_followup_hint")}</small>
</label>
<label>
${t("events.session_start_mode_label")}
<select name="startMode">
<option value="mass">${t("events.start_mode_mass")}</option>
<option value="position">${t("events.start_mode_position")}</option>
<option value="staggered">${t("events.start_mode_staggered")}</option>
<option value="flying">${t("events.start_mode_flying")}</option>
</select>
<small>${t("events.session_start_mode_hint")}</small>
</label>
<label>
${t("events.session_seed_laps_label")}
<input type="number" min="0" name="seedBestLapCount" placeholder="${t("events.seed_best_laps")}" />
<small>${t("events.session_seed_laps_hint")}</small>
</label>
<label>
${t("events.session_seed_method_label")}
<select name="seedMethod">
<option value="best_sum">${t("events.seed_method_best_sum")}</option>
<option value="average">${t("events.seed_method_average")}</option>
<option value="consecutive">${t("events.seed_method_consecutive")}</option>
</select>
<small>${t("events.session_seed_method_hint")}</small>
</label>
<label>
${t("events.session_stagger_gap_label")}
<input type="number" min="0" step="1" name="staggerGapSec" placeholder="${t("events.stagger_gap_sec")}" />
<small>${t("events.session_stagger_gap_hint")}</small>
</label>
<label>
${t("events.session_max_cars_label")}
<input type="number" min="1" name="maxCars" placeholder="${t("events.max_cars_placeholder")}" />
<small>${t("events.session_max_cars_hint")}</small>
</label>
<div class="actions-inline align-end">
<button class="btn btn-primary" type="submit">${t("events.add_session")}</button>
</div>
</form>
<p class="hint">${t("events.seed_best_laps_hint")}</p>
<p class="hint">${t("events.free_practice_note")}</p>
<p class="hint">${t("events.open_practice_note")}</p>
<div class="mt-16 session-groups">
${groupSessionsBySteps(sessions).map((group) => {
const title = group.step.id === "practice" ? t("events.step_practice")
: group.step.round ? t("events.step_qual_round", { round: group.step.round })
: group.step.id === "qual" ? t("events.step_qual")
: group.step.id === "final" ? t("events.step_finals")
: getSessionTypeLabel(group.step.type);
const open = group.state !== "done" || isSessionGroupOpen(event.id, group.step.id);
return `
<details class="session-group is-${group.state}" data-session-group="${escapeHtml(group.step.id)}" ${open ? "open" : ""}>
<summary>
<strong>${group.state === "done" ? "✓ " : group.state === "live" ? '<span class="live-dot" aria-hidden="true"></span> ' : ""}${escapeHtml(title)}</strong>
<small>${escapeHtml(t("events.step_count", { done: group.done, total: group.items.length }))}</small>
</summary>
${renderTable(
[t("table.session"), t("table.type"), t("table.duration"), t("table.start_mode"), t("table.seeding"), t("table.status"), t(event.mode === "track" ? "events.assignments" : "events.participants"), t("events.actions")],
group.items.map(({ session: s, index: sessionIndex }) => {
const assignCount =
s.mode === "track"
? (s.assignments || []).length
: s.type === "team_race"
? raceTeams.length
: getSessionEntrants(s).length;
return `
<tr>
<td>${escapeHtml(s.name)}</td>
<td>${escapeHtml(getSessionTypeLabel(s.type))}</td>
<td>${s.type === "open_practice" ? t("events.open_practice_untimed") : `${s.durationMin} min`}</td>
<td>${escapeHtml(getStartModeLabel(s.startMode))}</td>
<td>${s.seedBestLapCount > 0 ? `${s.seedBestLapCount}` : "-"}</td>
<td>${escapeHtml(getStatusLabel(s.status))}</td>
<td>${assignCount || (s.mode === "track" ? t("events.na") : "-")}</td>
<td class="actions-inline session-row-actions">
<button class="btn btn-mini" type="button" data-session-move="${escapeHtml(s.id)}" data-step="-1" title="${escapeHtml(t("events.move_session_up"))}" ${sessionIndex ? "" : "disabled"}>▲</button>
<button class="btn btn-mini" type="button" data-session-move="${escapeHtml(s.id)}" data-step="1" title="${escapeHtml(t("events.move_session_down"))}" ${sessionIndex < sessions.length - 1 ? "" : "disabled"}>▼</button>
<button id="session-edit-${s.id}" class="btn">${t("events.edit_session")}</button>
<button id="session-active-${s.id}" class="btn">${t("events.set_active")}</button>
<details class="row-menu">
<summary class="btn btn-mini" title="${escapeHtml(t("events.more_actions"))}">⋯</summary>
<div class="row-menu-list">
${
event.mode === "race" && normalizeStartMode(s.startMode) === "position"
? `<button id="session-grid-${s.id}" class="btn" type="button">${t("events.open_grid")}</button>`
: ""
}
${
event.mode === "race" && ["qualification", "final"].includes(s.type)
? `
<button id="session-sheet-print-${s.id}" class="btn" type="button">${t("events.print_heat_sheet")}</button>
<button id="session-sheet-export-${s.id}" class="btn" type="button">${t("events.export_heat_sheet")}</button>
<button id="session-sheet-pdf-${s.id}" class="btn" type="button">${t("events.pdf_heat_sheet")}</button>
`
: ""
}
<button id="session-delete-${s.id}" class="btn btn-danger">${t("common.delete")}</button>
</div>
</details>
</td>
</tr>
`;
})
)}
</details>`;
}).join("")}
</div>
</div>
</section>
<section class="panel mt-16">
<div class="panel-header"><h3>${t("events.branding")}</h3></div>
<form id="eventBrandingForm" class="panel-body form-grid cols-3">
<input name="brandName" value="${escapeHtml(branding.brandName)}" placeholder="${t("events.brand_name")}" />
<input name="brandTagline" value="${escapeHtml(branding.brandTagline)}" placeholder="${t("events.brand_tagline")}" />
<input name="pdfFooter" value="${escapeHtml(branding.pdfFooter)}" placeholder="${t("events.brand_footer")}" />
<select name="pdfTheme">
<option value="" ${!branding.pdfTheme ? "selected" : ""}>${t("events.branding_use_global")}</option>
<option value="classic" ${branding.pdfTheme === "classic" ? "selected" : ""}>${t("settings.pdf_theme_classic")}</option>
<option value="minimal" ${branding.pdfTheme === "minimal" ? "selected" : ""}>${t("settings.pdf_theme_minimal")}</option>
<option value="motorsport" ${branding.pdfTheme === "motorsport" ? "selected" : ""}>${t("settings.pdf_theme_motorsport")}</option>
</select>
<button class="btn btn-primary" type="submit">${t("events.branding_save")}</button>
</form>
<div class="panel-body">
<p class="hint">${t("events.branding_note")}</p>
<div class="actions">
<input id="eventLogoUpload" type="file" accept="image/*" />
<button id="eventLogoClear" class="btn" type="button">${t("settings.logo_clear")}</button>
</div>
${branding.logoDataUrl ? `<div class="logo-preview mt-16"><img src="${escapeHtml(branding.logoDataUrl)}" alt="event-logo" /></div>` : ""}
</div>
</section>
<div class="manage-page-head"><h2>${t("events.manage_title")}: ${escapeHtml(event.name)}</h2></div>
${
event.mode === "track"
@@ -778,6 +619,171 @@ export function renderEventManagerMarkup(context) {
: ""
}
<section class="panel mt-16" id="manage-session-plan">
<div class="panel-header">
<h3>${t("events.sessions_heading")}</h3>
</div>
<div class="panel-body">
<details class="manual-session-add">
<summary>${t("events.manual_session_add")}</summary>
<form id="sessionForm" class="form-grid cols-5">
<label>
${t("events.session_name")}
<input required name="name" placeholder="${t("events.session_name")}" />
</label>
<label>
${t("events.session_type_label")}
<select id="sessionCreateType" name="type">
${sessionTypeChoices.map((s) => `<option value="${s}">${getSessionTypeLabel(s)}</option>`).join("")}
</select>
<small>${t(sessionTypeHintKey)}</small>
</label>
<label>
${t("events.session_duration_label")}
<input required type="number" min="1" name="durationMin" placeholder="${t("events.duration_placeholder")}" />
<small>${t("events.session_duration_hint")}</small>
</label>
<label>
${t("events.session_followup_label")}
<input type="number" min="0" step="1" name="followUpSec" placeholder="${t("events.follow_up_sec")}" value="${event.mode === "race" ? event.raceConfig.followUpSec || 0 : 0}" />
<small>${t("events.session_followup_hint")}</small>
</label>
<label>
${t("events.session_start_mode_label")}
<select name="startMode">
<option value="mass">${t("events.start_mode_mass")}</option>
<option value="position">${t("events.start_mode_position")}</option>
<option value="staggered">${t("events.start_mode_staggered")}</option>
<option value="flying">${t("events.start_mode_flying")}</option>
</select>
<small>${t("events.session_start_mode_hint")}</small>
</label>
<label>
${t("events.session_seed_laps_label")}
<input type="number" min="0" name="seedBestLapCount" placeholder="${t("events.seed_best_laps")}" />
<small>${t("events.session_seed_laps_hint")}</small>
</label>
<label>
${t("events.session_seed_method_label")}
<select name="seedMethod">
<option value="best_sum">${t("events.seed_method_best_sum")}</option>
<option value="average">${t("events.seed_method_average")}</option>
<option value="consecutive">${t("events.seed_method_consecutive")}</option>
</select>
<small>${t("events.session_seed_method_hint")}</small>
</label>
<label>
${t("events.session_stagger_gap_label")}
<input type="number" min="0" step="1" name="staggerGapSec" placeholder="${t("events.stagger_gap_sec")}" />
<small>${t("events.session_stagger_gap_hint")}</small>
</label>
<label>
${t("events.session_max_cars_label")}
<input type="number" min="1" name="maxCars" placeholder="${t("events.max_cars_placeholder")}" />
<small>${t("events.session_max_cars_hint")}</small>
</label>
<div class="actions-inline align-end">
<button class="btn btn-primary" type="submit">${t("events.add_session")}</button>
</div>
</form>
<p class="hint">${t("events.seed_best_laps_hint")}</p>
<p class="hint">${t("events.free_practice_note")}</p>
<p class="hint">${t("events.open_practice_note")}</p>
</details>
<div class="mt-16 session-groups">
${groupSessionsBySteps(sessions).map((group) => {
const title = group.step.id === "practice" ? t("events.step_practice")
: group.step.round ? t("events.step_qual_round", { round: group.step.round })
: group.step.id === "qual" ? t("events.step_qual")
: group.step.id === "final" ? t("events.step_finals")
: getSessionTypeLabel(group.step.type);
const open = group.state !== "done" || isSessionGroupOpen(event.id, group.step.id);
return `
<details class="session-group is-${group.state}" data-session-group="${escapeHtml(group.step.id)}" ${open ? "open" : ""}>
<summary>
<strong>${group.state === "done" ? "✓ " : group.state === "live" ? '<span class="live-dot" aria-hidden="true"></span> ' : ""}${escapeHtml(title)}</strong>
<small>${escapeHtml(t("events.step_count", { done: group.done, total: group.items.length }))}</small>
</summary>
${renderTable(
[t("table.session"), t("table.type"), t("table.duration"), t("table.start_mode"), t("table.seeding"), t("table.status"), t(event.mode === "track" ? "events.assignments" : "events.participants"), t("events.actions")],
group.items.map(({ session: s, index: sessionIndex }) => {
const assignCount =
s.mode === "track"
? (s.assignments || []).length
: s.type === "team_race"
? raceTeams.length
: getSessionEntrants(s).length;
return `
<tr>
<td>${escapeHtml(s.name)}</td>
<td>${escapeHtml(getSessionTypeLabel(s.type))}</td>
<td>${s.type === "open_practice" ? t("events.open_practice_untimed") : `${s.durationMin} min`}</td>
<td>${escapeHtml(getStartModeLabel(s.startMode))}</td>
<td>${s.seedBestLapCount > 0 ? `${s.seedBestLapCount}` : "-"}</td>
<td>${escapeHtml(getStatusLabel(s.status))}</td>
<td>${assignCount || (s.mode === "track" ? t("events.na") : "-")}</td>
<td class="actions-inline session-row-actions">
<button class="btn btn-mini" type="button" data-session-move="${escapeHtml(s.id)}" data-step="-1" title="${escapeHtml(t("events.move_session_up"))}" ${sessionIndex ? "" : "disabled"}>▲</button>
<button class="btn btn-mini" type="button" data-session-move="${escapeHtml(s.id)}" data-step="1" title="${escapeHtml(t("events.move_session_down"))}" ${sessionIndex < sessions.length - 1 ? "" : "disabled"}>▼</button>
<button id="session-edit-${s.id}" class="btn">${t("events.edit_session")}</button>
<button id="session-active-${s.id}" class="btn">${t("events.set_active")}</button>
<details class="row-menu">
<summary class="btn btn-mini" title="${escapeHtml(t("events.more_actions"))}">⋯</summary>
<div class="row-menu-list">
${
event.mode === "race" && normalizeStartMode(s.startMode) === "position"
? `<button id="session-grid-${s.id}" class="btn" type="button">${t("events.open_grid")}</button>`
: ""
}
${
event.mode === "race" && ["qualification", "final"].includes(s.type)
? `
<button id="session-sheet-print-${s.id}" class="btn" type="button">${t("events.print_heat_sheet")}</button>
<button id="session-sheet-export-${s.id}" class="btn" type="button">${t("events.export_heat_sheet")}</button>
<button id="session-sheet-pdf-${s.id}" class="btn" type="button">${t("events.pdf_heat_sheet")}</button>
`
: ""
}
<button id="session-delete-${s.id}" class="btn btn-danger">${t("common.delete")}</button>
</div>
</details>
</td>
</tr>
`;
})
)}
</details>`;
}).join("")}
</div>
</div>
</section>
<details class="panel mt-16 manage-branding">
<summary class="panel-header"><h3>${t("events.branding")}</h3></summary>
<form id="eventBrandingForm" class="panel-body form-grid cols-3">
<input name="brandName" value="${escapeHtml(branding.brandName)}" placeholder="${t("events.brand_name")}" />
<input name="brandTagline" value="${escapeHtml(branding.brandTagline)}" placeholder="${t("events.brand_tagline")}" />
<input name="pdfFooter" value="${escapeHtml(branding.pdfFooter)}" placeholder="${t("events.brand_footer")}" />
<select name="pdfTheme">
<option value="" ${!branding.pdfTheme ? "selected" : ""}>${t("events.branding_use_global")}</option>
<option value="classic" ${branding.pdfTheme === "classic" ? "selected" : ""}>${t("settings.pdf_theme_classic")}</option>
<option value="minimal" ${branding.pdfTheme === "minimal" ? "selected" : ""}>${t("settings.pdf_theme_minimal")}</option>
<option value="motorsport" ${branding.pdfTheme === "motorsport" ? "selected" : ""}>${t("settings.pdf_theme_motorsport")}</option>
</select>
<button class="btn btn-primary" type="submit">${t("events.branding_save")}</button>
</form>
<div class="panel-body">
<p class="hint">${t("events.branding_note")}</p>
<div class="actions">
<input id="eventLogoUpload" type="file" accept="image/*" />
<button id="eventLogoClear" class="btn" type="button">${t("settings.logo_clear")}</button>
</div>
${branding.logoDataUrl ? `<div class="logo-preview mt-16"><img src="${escapeHtml(branding.logoDataUrl)}" alt="event-logo" /></div>` : ""}
</div>
</details>
${
editingSession
? `