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
+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>
|
||||
|
||||
|
||||
Reference in new issue
Block a user