feat(race-setup): group the race list into today, upcoming and folded done, with progress and search (1.52.0)
This commit is contained in:
1 parent
b2e08db3d8
commit
b23410c190
13 files changed
+213
-29
No files matched your search
+22
@@ -1756,6 +1756,17 @@ const TRANSLATIONS = {
|
||||
"events.mode_track_option": "Sponsor Event (delade bilar)",
|
||||
"events.title": "Event",
|
||||
"events.race_title": "Race",
|
||||
"events.list_search": "Sök race…",
|
||||
"events.list_empty": "Inga race skapade än.",
|
||||
"events.list_no_date": "Utan datum",
|
||||
"events.progress_empty": "Inga heat än",
|
||||
"events.progress_done": "Klar",
|
||||
"events.progress_next": "Nästa: {name}",
|
||||
"events.progress_count": "{done}/{total} körda",
|
||||
"events.group_today": "Idag",
|
||||
"events.group_upcoming": "Kommande",
|
||||
"events.group_nothing_planned": "Inget planerat idag eller framåt.",
|
||||
"events.group_done": "Körda ({count})",
|
||||
"events.track_only_intro": "Här skapar du sponsor-event med delade bilar/transpondrar.",
|
||||
"events.race_only_intro": "Här skapar du riktiga race med personlig transponder per förare.",
|
||||
"events.manage": "Hantera",
|
||||
@@ -3693,6 +3704,17 @@ const TRANSLATIONS = {
|
||||
"events.mode_track_option": "Track Event (shared cars)",
|
||||
"events.title": "Events",
|
||||
"events.race_title": "Races",
|
||||
"events.list_search": "Search races…",
|
||||
"events.list_empty": "No races created yet.",
|
||||
"events.list_no_date": "No date",
|
||||
"events.progress_empty": "No heats yet",
|
||||
"events.progress_done": "Done",
|
||||
"events.progress_next": "Next: {name}",
|
||||
"events.progress_count": "{done}/{total} run",
|
||||
"events.group_today": "Today",
|
||||
"events.group_upcoming": "Upcoming",
|
||||
"events.group_nothing_planned": "Nothing planned today or later.",
|
||||
"events.group_done": "Done ({count})",
|
||||
"events.track_only_intro": "Create sponsor events with shared cars/transponders here.",
|
||||
"events.race_only_intro": "Create proper races with personal driver transponders here.",
|
||||
"events.manage": "Manage",
|
||||
|
||||
+58
-26
@@ -1,3 +1,7 @@
|
||||
import { groupEventsForList } from "./race_list_logic.js";
|
||||
|
||||
const todayKey = () => { const d = new Date(); return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`; };
|
||||
|
||||
export function renderEventWorkspaceMarkup(mode, deps) {
|
||||
const {
|
||||
state,
|
||||
@@ -14,6 +18,7 @@ export function renderEventWorkspaceMarkup(mode, deps) {
|
||||
getClassName,
|
||||
getModeLabel,
|
||||
editingEvent,
|
||||
doneOpen = false,
|
||||
} = deps;
|
||||
const isRaceMode = mode === "race";
|
||||
const filteredEvents = state.events.filter((event) => event.mode === mode);
|
||||
@@ -22,6 +27,53 @@ export function renderEventWorkspaceMarkup(mode, deps) {
|
||||
.map((c) => `<option value="${c.id}" ${c.id === raceWizardDraft?.classId ? "selected" : ""}>${escapeHtml(c.name)}</option>`)
|
||||
.join("");
|
||||
|
||||
const language = state.settings?.language === "en" ? "en-GB" : "sv-SE";
|
||||
const formatDay = (date) => {
|
||||
if (!date) return t("events.list_no_date");
|
||||
const parsed = new Date(`${date}T12:00:00`);
|
||||
return Number.isNaN(parsed.getTime()) ? date : parsed.toLocaleDateString(language, { weekday: "short", day: "numeric", month: "short", year: "numeric" });
|
||||
};
|
||||
const progressLabel = ({ total, done, live, next }) => {
|
||||
if (!total) return `<span class="event-progress">${escapeHtml(t("events.progress_empty"))}</span>`;
|
||||
if (done === total) return `<span class="event-progress is-done">✓ ${escapeHtml(t("events.progress_done"))}</span>`;
|
||||
const status = live
|
||||
? `<span class="event-progress is-live"><span class="live-dot" aria-hidden="true"></span> ${escapeHtml(live)}</span>`
|
||||
: `<span class="event-progress">${escapeHtml(t("events.progress_next", { name: next }))}</span>`;
|
||||
return `${status} <small class="hint">${escapeHtml(t("events.progress_count", { done, total }))}</small>`;
|
||||
};
|
||||
const renderEventRow = ({ event: e, progress }) => `
|
||||
<div class="event-row" data-event-row="${escapeHtml(e.id)}" data-search="${escapeHtml(`${e.name} ${e.date || ""} ${getClassName(e.classId) || ""}`.toLowerCase())}">
|
||||
<div class="event-row-main">
|
||||
<strong>${escapeHtml(e.name)}</strong>
|
||||
<small>${e.raceConfig?.practiceOnly ? escapeHtml(t("events.quick_open_practice_title")) : escapeHtml(getClassName(e.classId))}${isRaceMode ? "" : ` · ${escapeHtml(getModeLabel(e.mode))}`}</small>
|
||||
</div>
|
||||
<div class="event-row-progress">${e.raceConfig?.practiceOnly ? "" : progressLabel(progress)}</div>
|
||||
<div class="actions-inline event-row-actions">
|
||||
${e.raceConfig?.practiceOnly
|
||||
? `<button id="event-timing-${e.id}" class="btn btn-primary">${t("events.open_timing")}</button>`
|
||||
: `<button id="event-manage-${e.id}" class="btn btn-primary">${t("events.manage")}</button>`}
|
||||
<button id="event-edit-${e.id}" class="btn">${t("events.edit")}</button>
|
||||
<button id="event-delete-${e.id}" class="btn btn-danger" title="${escapeHtml(t("common.delete"))}">✕</button>
|
||||
</div>
|
||||
</div>`;
|
||||
const renderDays = (days) => days.map((day) => `
|
||||
<div class="event-day" data-event-day>
|
||||
<h4>${escapeHtml(formatDay(day.date))}</h4>
|
||||
${day.items.map(renderEventRow).join("")}
|
||||
</div>`).join("");
|
||||
const renderEventGroups = () => {
|
||||
const groups = groupEventsForList(filteredEvents, (id) => getSessionsForEvent(id), todayKey());
|
||||
const doneCount = groups.done.reduce((sum, day) => sum + day.items.length, 0);
|
||||
return `
|
||||
${groups.today.length ? `<div class="event-group"><h3 class="event-group-title">${escapeHtml(t("events.group_today"))}</h3>${renderDays(groups.today)}</div>` : ""}
|
||||
${groups.upcoming.length ? `<div class="event-group"><h3 class="event-group-title">${escapeHtml(t("events.group_upcoming"))}</h3>${renderDays(groups.upcoming)}</div>` : ""}
|
||||
${!groups.today.length && !groups.upcoming.length ? `<p class="hint">${escapeHtml(t("events.group_nothing_planned"))}</p>` : ""}
|
||||
${doneCount ? `<details class="event-group event-group-done" id="eventListDone" ${doneOpen ? "open" : ""}>
|
||||
<summary class="event-group-title">${escapeHtml(t("events.group_done", { count: doneCount }))}</summary>
|
||||
${renderDays(groups.done)}
|
||||
</details>` : ""}`;
|
||||
};
|
||||
|
||||
return `
|
||||
${
|
||||
isRaceMode
|
||||
@@ -101,33 +153,13 @@ export function renderEventWorkspaceMarkup(mode, deps) {
|
||||
}
|
||||
</section>
|
||||
|
||||
<section class="panel">
|
||||
<div class="panel-header"><h3>${t(isRaceMode ? "events.race_title" : "events.title")}</h3></div>
|
||||
<section class="panel event-list">
|
||||
<div class="panel-header">
|
||||
<h3>${t(isRaceMode ? "events.race_title" : "events.title")}</h3>
|
||||
${filteredEvents.length > 6 ? `<input type="search" id="eventListSearch" class="event-list-search" placeholder="${escapeHtml(t("events.list_search"))}" />` : ""}
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
${renderTable(
|
||||
[t("table.name"), t("table.date"), t("table.class"), t("table.mode"), t("events.sessions"), t("events.actions")],
|
||||
filteredEvents.map((e) => {
|
||||
const sessions = getSessionsForEvent(e.id);
|
||||
return `
|
||||
<tr>
|
||||
<td>${escapeHtml(e.name)}</td>
|
||||
<td>${escapeHtml(e.date)}</td>
|
||||
<td>${e.raceConfig?.practiceOnly ? escapeHtml(t("events.open_practice_all_transponders")) : escapeHtml(getClassName(e.classId))}</td>
|
||||
<td>${e.raceConfig?.practiceOnly ? escapeHtml(t("events.quick_open_practice_title")) : getModeLabel(e.mode)}</td>
|
||||
<td>${sessions.length}</td>
|
||||
<td class="actions-inline">
|
||||
<button id="event-edit-${e.id}" class="btn">${t("events.edit")}</button>
|
||||
${
|
||||
e.raceConfig?.practiceOnly
|
||||
? `<button id="event-timing-${e.id}" class="btn btn-primary">${t("events.open_timing")}</button>`
|
||||
: `<button id="event-manage-${e.id}" class="btn">${t("events.manage")}</button>`
|
||||
}
|
||||
<button id="event-delete-${e.id}" class="btn btn-danger">${t("common.delete")}</button>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
})
|
||||
)}
|
||||
${filteredEvents.length ? renderEventGroups() : `<p class="hint">${escapeHtml(t("events.list_empty"))}</p>`}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
|
||||
@@ -1,5 +1,20 @@
|
||||
import { renderEventWorkspaceMarkup } from "./event_views.js";
|
||||
|
||||
// The folded "Done" races remember whether they were opened (per browser only).
|
||||
const DONE_OPEN_KEY = "rc_event_list_done_open";
|
||||
const readDoneOpen = () => { try { return localStorage.getItem(DONE_OPEN_KEY) === "1"; } catch { return false; } };
|
||||
function bindEventListTools() {
|
||||
const done = document.getElementById("eventListDone");
|
||||
done?.addEventListener("toggle", () => { try { localStorage.setItem(DONE_OPEN_KEY, done.open ? "1" : "0"); } catch { /* per browser only */ } });
|
||||
// Search filters the rows in place and opens the done group so older races are found too.
|
||||
document.getElementById("eventListSearch")?.addEventListener("input", (event) => {
|
||||
const query = String(event.target.value || "").trim().toLowerCase();
|
||||
document.querySelectorAll("[data-event-row]").forEach((row) => { row.hidden = Boolean(query) && !row.dataset.search.includes(query); });
|
||||
document.querySelectorAll("[data-event-day]").forEach((day) => { day.hidden = ![...day.querySelectorAll("[data-event-row]")].some((row) => !row.hidden); });
|
||||
if (query && done) done.open = true;
|
||||
});
|
||||
}
|
||||
|
||||
export function renderEventWorkspaceView(context) {
|
||||
const {
|
||||
mode,
|
||||
@@ -65,7 +80,9 @@ export function renderEventWorkspaceView(context) {
|
||||
getClassName,
|
||||
getModeLabel,
|
||||
editingEvent,
|
||||
doneOpen: readDoneOpen(),
|
||||
});
|
||||
bindEventListTools();
|
||||
|
||||
document.getElementById("quickOpenPracticeForm")?.addEventListener("submit", (event) => {
|
||||
event.preventDefault();
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
// The race list in Race Setup, grouped so it stays short: today, upcoming and done (folded
|
||||
// away), each grouped per date, with how far each race has come.
|
||||
import { orderSessionsForRunning } from "./event_race_logic.js";
|
||||
|
||||
const isDone = (session) => ["finished", "stopped"].includes(session.status);
|
||||
const isLive = (session) => ["running", "paused"].includes(session.status);
|
||||
|
||||
// { total, done, live, next }: live/next are session names (in running order).
|
||||
export function getEventProgress(event, sessions = []) {
|
||||
const ordered = orderSessionsForRunning(sessions, event?.sessionOrder);
|
||||
const live = ordered.find(isLive) || null;
|
||||
const next = ordered.find((session) => !isDone(session) && !isLive(session)) || null;
|
||||
return { total: ordered.length, done: ordered.filter(isDone).length, live: live?.name || "", next: next?.name || "" };
|
||||
}
|
||||
|
||||
// A race is done when every session has been run, or its date has passed.
|
||||
export function groupEventsForList(events = [], getSessions = () => [], today = "") {
|
||||
const groups = { today: [], upcoming: [], done: [] };
|
||||
events.forEach((event) => {
|
||||
const progress = getEventProgress(event, getSessions(event.id));
|
||||
const allRun = progress.total > 0 && progress.done === progress.total;
|
||||
const date = String(event.date || "");
|
||||
const key = progress.live || date === today ? "today" : allRun || (date && date < today) ? "done" : "upcoming";
|
||||
groups[key].push({ event, progress });
|
||||
});
|
||||
const byDay = (items, newestFirst) => {
|
||||
const days = new Map();
|
||||
items.forEach((item) => {
|
||||
const date = String(item.event.date || "");
|
||||
if (!days.has(date)) days.set(date, []);
|
||||
days.get(date).push(item);
|
||||
});
|
||||
return [...days.entries()]
|
||||
.sort(([a], [b]) => (newestFirst ? b.localeCompare(a) : (a || "9999").localeCompare(b || "9999")))
|
||||
.map(([date, list]) => ({ date, items: list.sort((a, b) => String(a.event.name || "").localeCompare(String(b.event.name || ""), undefined, { numeric: true })) }));
|
||||
};
|
||||
return { today: byDay(groups.today, false), upcoming: byDay(groups.upcoming, false), done: byDay(groups.done, true) };
|
||||
}
|
||||
@@ -4806,3 +4806,22 @@ tr.is-removed td.lap-actions {
|
||||
.day-schedule-table th:nth-child(3), .day-schedule-table td:nth-child(3) { display: none; }
|
||||
.board-time { font-size: 1.6rem; }
|
||||
}
|
||||
|
||||
/* Race Setup: races grouped today / upcoming / done, per date */
|
||||
.event-list .panel-header { display: flex; justify-content: space-between; align-items: center; gap: 12px; flex-wrap: wrap; }
|
||||
.event-list-search { max-width: 260px; }
|
||||
.event-group + .event-group { margin-top: 18px; }
|
||||
.event-group-title { margin: 0 0 8px; font-size: 1rem; text-transform: uppercase; letter-spacing: 0.05em; color: var(--muted); }
|
||||
details.event-group > summary { cursor: pointer; list-style: revert; }
|
||||
.event-day { margin-bottom: 12px; }
|
||||
.event-day h4 { margin: 0 0 6px; font-size: 0.95rem; }
|
||||
.event-row { display: grid; grid-template-columns: minmax(180px, 2fr) minmax(140px, 1.5fr) auto; gap: 12px; align-items: center; padding: 8px 10px; border: 1px solid var(--line); border-radius: 10px; margin-bottom: 6px; background: var(--surface-card); }
|
||||
.event-row-main { display: grid; gap: 2px; }
|
||||
.event-row-main small { color: var(--muted); }
|
||||
.event-progress.is-done { color: var(--ok); font-weight: 600; }
|
||||
.event-progress.is-live { color: var(--ok); font-weight: 700; }
|
||||
.event-row-actions { justify-content: flex-end; }
|
||||
@media (max-width: 700px) {
|
||||
.event-row { grid-template-columns: 1fr; }
|
||||
.event-row-actions { justify-content: flex-start; }
|
||||
}
|
||||
Reference in new issue
Block a user