feat(results): race overview on Race Day and an event-grouped results archive (1.66.0)
This commit is contained in:
1 parent
31ac04616a
commit
69a65748ce
12 files changed
+321
-30
No files matched your search
+85
-22
@@ -26,6 +26,24 @@ export function buildArchiveRows(state, { getEventName, getClassName, getTrackLa
|
||||
.sort((left, right) => Number(right.session.endedAt || 0) - Number(left.session.endedAt || 0));
|
||||
}
|
||||
|
||||
// One row per event (a race, a sponsor event, a practice day); heats without an event stand alone.
|
||||
// Newest first. The winner is the A final's, else the latest heat's.
|
||||
export function groupArchiveRowsByEvent(rows) {
|
||||
const groups = new Map();
|
||||
rows.forEach((row) => {
|
||||
const key = row.event ? row.event.id : `session:${row.session.id}`;
|
||||
if (!groups.has(key)) groups.set(key, { key, event: row.event, eventName: row.eventName, className: row.className, date: row.date, rows: [], driverIds: new Set() });
|
||||
const group = groups.get(key);
|
||||
group.rows.push(row);
|
||||
if (row.date > group.date) group.date = row.date;
|
||||
row.competitors.forEach((competitor) => group.driverIds.add(String(competitor.driverId || competitor.transponder || "")));
|
||||
});
|
||||
return [...groups.values()].map((group) => {
|
||||
const aFinal = group.rows.find((row) => row.session.type === "final" && /^A/i.test(row.session.name || ""));
|
||||
return { ...group, driverCount: group.driverIds.size, winnerName: (aFinal || group.rows[0])?.winnerName || "", endedAt: Math.max(...group.rows.map((row) => Number(row.session.endedAt || 0))) };
|
||||
}).sort((left, right) => right.endedAt - left.endedAt);
|
||||
}
|
||||
|
||||
function matchesArchiveFilters(row, filters) {
|
||||
const search = filters.search.trim().toLowerCase();
|
||||
if (search && !`${row.eventName} ${row.session.name}`.toLowerCase().includes(search)) return false;
|
||||
@@ -117,7 +135,8 @@ export function renderResultsArchiveView(deps) {
|
||||
getClassName, getEventName, buildLeaderboard, getCompetitorPassings,
|
||||
exportRaceResultsPdf, buildRacePackagePayload, downloadJsonFile, sanitizeFilenameSegment,
|
||||
getArchiveFilters, setArchiveFilters, getSelectedSessionId, setSelectedSessionId,
|
||||
getTrackLayoutLabel,
|
||||
getSelectedEventKey = () => "", setSelectedEventKey = () => {},
|
||||
getTrackLayoutLabel, renderRaceOverview = () => "", bindRaceOverview = () => {},
|
||||
} = deps;
|
||||
|
||||
const filters = getArchiveFilters();
|
||||
@@ -129,26 +148,43 @@ export function renderResultsArchiveView(deps) {
|
||||
const classOptions = state.classes.map((c) => `<option value="${escapeHtml(c.id)}" ${c.id === filters.classId ? "selected" : ""}>${escapeHtml(c.name)}</option>`).join("");
|
||||
const driverOptions = state.drivers.map((d) => `<option value="${escapeHtml(d.id)}" ${d.id === filters.driverId ? "selected" : ""}>${escapeHtml(d.name)}</option>`).join("");
|
||||
|
||||
const groups = groupArchiveRowsByEvent(filteredRows);
|
||||
const selectedGroup = groupArchiveRowsByEvent(allRows).find((group) => group.key === (getSelectedEventKey()
|
||||
// A heat opened from elsewhere (driver profile) shows with its event.
|
||||
|| (selectedRow ? (selectedRow.event ? selectedRow.event.id : `session:${selectedRow.session.id}`) : ""))) || null;
|
||||
const table = sortableTable(
|
||||
renderTable(
|
||||
[t("archive.date"), t("archive.event"), t("archive.session"), t("archive.class"), t("archive.layout"), t("archive.drivers"), t("archive.winner"), t("archive.penalties_short"), ""],
|
||||
filteredRows.map((row) => `
|
||||
<tr data-sort-values="${sortValuesAttribute([row.date, row.eventName, row.session.name, row.className, row.trackLayoutLabel, row.competitors.length, row.winnerName, row.adjustmentCount, null])}">
|
||||
<td>${escapeHtml(row.date || "-")}</td>
|
||||
<td>${escapeHtml(row.eventName)}</td>
|
||||
<td>${escapeHtml(row.session.name)}</td>
|
||||
<td>${escapeHtml(row.className || "-")}</td>
|
||||
<td>${escapeHtml(row.trackLayoutLabel || "-")}</td>
|
||||
<td>${row.competitors.length}</td>
|
||||
<td>${escapeHtml(row.winnerName || "-")}</td>
|
||||
<td>${row.adjustmentCount || "-"}</td>
|
||||
<td><button class="btn btn-mini" data-archive-open="${escapeHtml(row.session.id)}" type="button">${t("archive.view")}</button></td>
|
||||
[t("archive.date"), t("archive.event"), t("archive.class"), t("archive.heats"), t("archive.drivers"), t("archive.winner"), ""],
|
||||
groups.map((group) => `
|
||||
<tr class="${selectedGroup?.key === group.key ? "is-selected" : ""}" data-sort-values="${sortValuesAttribute([group.date, group.eventName, group.className, group.rows.length, group.driverCount, group.winnerName, null])}">
|
||||
<td>${escapeHtml(group.date || "-")}</td>
|
||||
<td>${escapeHtml(group.eventName)}</td>
|
||||
<td>${escapeHtml(group.className || "-")}</td>
|
||||
<td>${group.rows.length}</td>
|
||||
<td>${group.driverCount}</td>
|
||||
<td>${escapeHtml(group.winnerName || "-")}</td>
|
||||
<td><button class="btn btn-mini" data-archive-event="${escapeHtml(group.key)}" type="button">${t("archive.view")}</button></td>
|
||||
</tr>
|
||||
`)
|
||||
),
|
||||
"archive-sessions",
|
||||
[1, 2, 3, 4, 6]
|
||||
"archive-events",
|
||||
[1, 2, 3, 4, 5]
|
||||
);
|
||||
// The chosen event: its race overview (with print / PDF / CSV) and its heats.
|
||||
const heatList = selectedGroup ? renderTable(
|
||||
[t("archive.date"), t("archive.session"), t("archive.layout"), t("archive.drivers"), t("archive.winner"), t("archive.penalties_short"), ""],
|
||||
selectedGroup.rows.slice().sort((left, right) => Number(left.session.startedAt || left.session.endedAt || 0) - Number(right.session.startedAt || right.session.endedAt || 0)).map((row) => `
|
||||
<tr class="${row.session.id === selectedSessionId ? "is-selected" : ""}">
|
||||
<td>${escapeHtml(row.date || "-")}</td>
|
||||
<td>${escapeHtml(row.session.name)}</td>
|
||||
<td>${escapeHtml(row.trackLayoutLabel || "-")}</td>
|
||||
<td>${row.competitors.length}</td>
|
||||
<td>${escapeHtml(row.winnerName || "-")}</td>
|
||||
<td>${row.adjustmentCount || "-"}</td>
|
||||
<td><button class="btn btn-mini" data-archive-open="${escapeHtml(row.session.id)}" type="button">${t("archive.view")}</button></td>
|
||||
</tr>`)
|
||||
) : "";
|
||||
const shownRow = selectedRow && (!selectedGroup || selectedGroup.rows.includes(selectedRow)) ? selectedRow : null;
|
||||
|
||||
dom.view.innerHTML = `
|
||||
<section class="panel">
|
||||
@@ -164,10 +200,22 @@ export function renderResultsArchiveView(deps) {
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body" id="archiveResultsBody">
|
||||
${filteredRows.length ? table : `<p>${t("archive.no_results")}</p>`}
|
||||
${groups.length ? table : `<p>${t("archive.no_results")}</p>`}
|
||||
</div>
|
||||
</section>
|
||||
${selectedRow ? renderArchiveDetail(selectedRow, { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings }) : ""}
|
||||
${selectedGroup ? `
|
||||
<section class="panel mt-16" id="archiveEventPanel">
|
||||
<div class="panel-header">
|
||||
<div><h3>${escapeHtml(selectedGroup.eventName)}</h3><p class="hint">${escapeHtml([selectedGroup.date, selectedGroup.className].filter(Boolean).join(" • "))}</p></div>
|
||||
<div class="actions-inline">
|
||||
${selectedGroup.event ? `<button class="btn" id="archiveExportJson" type="button">${t("archive.export_json")}</button>` : ""}
|
||||
<button class="btn" id="archiveEventClose" type="button">${t("archive.close")}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body"><h4>${t("archive.heats")}</h4>${heatList}</div>
|
||||
</section>
|
||||
${selectedGroup.event ? renderRaceOverview(selectedGroup.event) : ""}` : ""}
|
||||
${shownRow ? renderArchiveDetail(shownRow, { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings }) : ""}
|
||||
`;
|
||||
|
||||
const rerender = () => renderResultsArchiveView(deps);
|
||||
@@ -201,17 +249,32 @@ export function renderResultsArchiveView(deps) {
|
||||
setArchiveFilters({ ...filters, dateTo: event.currentTarget.value });
|
||||
rerender();
|
||||
});
|
||||
document.querySelectorAll("[data-archive-event]").forEach((button) => {
|
||||
button.addEventListener("click", () => {
|
||||
setSelectedEventKey(button.dataset.archiveEvent);
|
||||
setSelectedSessionId("");
|
||||
rerender();
|
||||
document.getElementById("archiveEventPanel")?.scrollIntoView({ behavior: "smooth", block: "start" });
|
||||
});
|
||||
});
|
||||
document.getElementById("archiveEventClose")?.addEventListener("click", () => { setSelectedEventKey(""); setSelectedSessionId(""); rerender(); });
|
||||
document.querySelectorAll("[data-archive-open]").forEach((button) => {
|
||||
button.addEventListener("click", () => { setSelectedSessionId(button.dataset.archiveOpen); rerender(); });
|
||||
button.addEventListener("click", () => {
|
||||
setSelectedSessionId(button.dataset.archiveOpen);
|
||||
rerender();
|
||||
document.querySelector(".archive-detail")?.scrollIntoView({ behavior: "smooth", block: "start" });
|
||||
});
|
||||
});
|
||||
document.getElementById("archiveDetailClose")?.addEventListener("click", () => { setSelectedSessionId(""); rerender(); });
|
||||
if (selectedRow?.event) {
|
||||
if (selectedGroup?.event) bindRaceOverview(dom.view, selectedGroup.event);
|
||||
const detailEvent = shownRow?.event || selectedGroup?.event;
|
||||
if (detailEvent) {
|
||||
document.getElementById("archiveExportPdf")?.addEventListener("click", () => {
|
||||
exportRaceResultsPdf(selectedRow.event);
|
||||
exportRaceResultsPdf(detailEvent);
|
||||
});
|
||||
document.getElementById("archiveExportJson")?.addEventListener("click", () => {
|
||||
const payload = buildRacePackagePayload(selectedRow.event.id);
|
||||
downloadJsonFile(`${sanitizeFilenameSegment(selectedRow.event.name)}_race_package.json`, payload);
|
||||
const payload = buildRacePackagePayload(detailEvent.id);
|
||||
downloadJsonFile(`${sanitizeFilenameSegment(detailEvent.name)}_race_package.json`, payload);
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user