feat(drivers): group per class, class filter, sorting and deleting several drivers (1.89.14)
This commit is contained in:
1 parent
1b968bc275
commit
7d711bcd7c
13 files changed
+301
-37
No files matched your search
+96
-33
@@ -1,4 +1,24 @@
|
||||
import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict } from "./driver_profile_logic.js";
|
||||
import { filterDrivers, sortDrivers, groupDriversByClass, removeDrivers, DRIVER_SORT_KEYS } from "./driver_list_logic.js";
|
||||
|
||||
// The driver list's own view settings; kept for the browser tab (sort and grouping also in
|
||||
// localStorage), the selection only while the page is open.
|
||||
const DRIVER_LIST_PREFS_KEY = "rcDriverListPrefs";
|
||||
const driverList = (() => {
|
||||
let saved = {};
|
||||
try { saved = JSON.parse(localStorage.getItem(DRIVER_LIST_PREFS_KEY) || "{}") || {}; } catch { saved = {}; }
|
||||
return {
|
||||
sortKey: DRIVER_SORT_KEYS.includes(saved.sortKey) ? saved.sortKey : "name",
|
||||
sortDir: saved.sortDir === "desc" ? "desc" : "asc",
|
||||
grouped: saved.grouped !== false,
|
||||
classFilter: "",
|
||||
collapsed: new Set(),
|
||||
selected: new Set(),
|
||||
};
|
||||
})();
|
||||
const saveDriverListPrefs = () => {
|
||||
try { localStorage.setItem(DRIVER_LIST_PREFS_KEY, JSON.stringify({ sortKey: driverList.sortKey, sortDir: driverList.sortDir, grouped: driverList.grouped })); } catch { /* per-viewer convenience only */ }
|
||||
};
|
||||
import { isPracticeSessionType } from "./track_layouts_logic.js";
|
||||
import { renderTrackLayoutBar, bindTrackLayoutBar } from "./track_layout_bar.js";
|
||||
import { openHouseOfRcDriverImport, lookupHouseOfRcTransponders } from "./houseofrc_view.js";
|
||||
@@ -392,10 +412,15 @@ export function renderDriversView(deps) {
|
||||
testDriverVoice = () => {},
|
||||
} = deps;
|
||||
const classOptions = state.classes.map((c) => `<option value="${c.id}">${escapeHtml(c.name)}</option>`).join("");
|
||||
const driverSearch = driverBrandFilter().trim().toLowerCase();
|
||||
const filteredDrivers = state.drivers.filter((driver) => !driver.guestEventId && (
|
||||
!driverSearch || [driver.name, driver.speechName, driver.transponder, driver.brand, driver.club, driver.country].map((value) => String(value || "").toLowerCase()).some((value) => value.includes(driverSearch))
|
||||
));
|
||||
const registered = filterDrivers(state.drivers, "");
|
||||
const filteredDrivers = sortDrivers(
|
||||
filterDrivers(state.drivers, driverBrandFilter()).filter((driver) => !driverList.classFilter || String(driver.classId || "") === driverList.classFilter),
|
||||
{ key: driverList.sortKey, dir: driverList.sortDir, getClassName }
|
||||
);
|
||||
// A driver deleted elsewhere or filtered away is not "selected" for a bulk delete.
|
||||
const visibleIds = new Set(filteredDrivers.map((driver) => driver.id));
|
||||
[...driverList.selected].forEach((id) => { if (!visibleIds.has(id)) driverList.selected.delete(id); });
|
||||
const listClasses = groupDriversByClass(registered, getClassName);
|
||||
const editingDriver = state.drivers.find((driver) => driver.id === selectedDriverEditId()) || null;
|
||||
const profileGroups = getDriverProfileGroups(state);
|
||||
const profileOptions = profileGroups
|
||||
@@ -440,19 +465,36 @@ export function renderDriversView(deps) {
|
||||
|
||||
<section class="panel">
|
||||
<div class="panel-header"><h3>${t("drivers.title")}</h3><button class="btn" id="driversHouseOfRc" type="button" title="${escapeHtml(t("houseofrc.import_button_hint"))}">🏠 ${t("houseofrc.import_button")}</button></div>
|
||||
<div class="panel-body">
|
||||
<input id="driverBrandFilter" value="${escapeHtml(driverBrandFilter())}" placeholder="${t("drivers.brand_filter_placeholder")}" />
|
||||
<div class="panel-body driver-list-toolbar">
|
||||
<input id="driverBrandFilter" type="search" value="${escapeHtml(driverBrandFilter())}" placeholder="${t("drivers.brand_filter_placeholder")}" />
|
||||
<label>${t("drivers.class_filter")}<select id="driverClassFilter">
|
||||
<option value="">${t("drivers.all_classes")}</option>
|
||||
${listClasses.map((group) => `<option value="${escapeHtml(group.classId)}" ${group.classId === driverList.classFilter ? "selected" : ""}>${escapeHtml(group.name || t("drivers.no_class"))} (${group.drivers.length})</option>`).join("")}
|
||||
</select></label>
|
||||
<label>${t("drivers.sort_by")}<select id="driverSortKey">
|
||||
${DRIVER_SORT_KEYS.map((key) => `<option value="${key}" ${key === driverList.sortKey ? "selected" : ""}>${t(`drivers.sort_${key}`)}</option>`).join("")}
|
||||
</select></label>
|
||||
<button class="btn btn-mini" type="button" id="driverSortDir" title="${t("drivers.sort_dir")}">${driverList.sortDir === "desc" ? "↓ Ö–A" : "↑ A–Ö"}</button>
|
||||
<label class="toggle"><input type="checkbox" id="driverGrouped" ${driverList.grouped ? "checked" : ""} /><span>${t("drivers.group_by_class")}</span></label>
|
||||
<span class="driver-list-count">${t("drivers.count", { shown: filteredDrivers.length, total: registered.length })}</span>
|
||||
</div>
|
||||
<div class="panel-body driver-list-bulk">
|
||||
<label class="toggle"><input type="checkbox" id="driverSelectAll" ${filteredDrivers.length && filteredDrivers.every((d) => driverList.selected.has(d.id)) ? "checked" : ""} ${filteredDrivers.length ? "" : "disabled"} /><span>${t("drivers.select_all")}</span></label>
|
||||
<button class="btn btn-danger btn-mini" type="button" id="driverDeleteSelected" ${driverList.selected.size ? "" : "disabled"}>🗑 ${t("drivers.delete_selected", { count: driverList.selected.size })}</button>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
${renderTable(
|
||||
[t("table.name"), t("table.class"), t("drivers.club"), t("drivers.country"), t("table.brand"), t("table.transponder"), t("drivers.training_profile"), t("drivers.speech_name"), t("events.actions")],
|
||||
filteredDrivers.map(
|
||||
(d) => {
|
||||
${(() => {
|
||||
// Grouped per class, the class column would only repeat the group's heading.
|
||||
const showClass = !driverList.grouped;
|
||||
const table = (drivers) => renderTable(
|
||||
["", t("table.name"), ...(showClass ? [t("table.class")] : []), t("drivers.club"), t("drivers.country"), t("table.brand"), t("table.transponder"), t("drivers.training_profile"), t("drivers.speech_name"), t("events.actions")],
|
||||
drivers.map((d) => {
|
||||
const profile = profileGroups.find((item) => item.id === getDriverProfileId(d));
|
||||
return `
|
||||
<tr>
|
||||
<tr class="${driverList.selected.has(d.id) ? "is-selected" : ""}">
|
||||
<td><input type="checkbox" data-driver-select="${escapeHtml(d.id)}" ${driverList.selected.has(d.id) ? "checked" : ""} aria-label="${escapeHtml(t("drivers.select_driver", { name: d.name }))}" /></td>
|
||||
<td>${escapeHtml(d.name)}</td>
|
||||
<td>${escapeHtml(getClassName(d.classId))}</td>
|
||||
${showClass ? `<td>${escapeHtml(getClassName(d.classId))}</td>` : ""}
|
||||
<td>${escapeHtml(profile?.club || d.club || "-")}</td>
|
||||
<td>${escapeHtml(profile?.country || d.country || "-")}</td>
|
||||
<td>${escapeHtml(d.brand || "-")}</td>
|
||||
@@ -464,11 +506,17 @@ export function renderDriversView(deps) {
|
||||
<button id="driver-edit-${d.id}" class="btn">${t("common.edit")}</button>
|
||||
<button id="driver-delete-${d.id}" class="btn btn-danger">${t("common.delete")}</button>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
}
|
||||
)
|
||||
)}
|
||||
</tr>`;
|
||||
})
|
||||
);
|
||||
if (!filteredDrivers.length) return `<p class="hint">${t("drivers.none_found")}</p>`;
|
||||
if (!driverList.grouped) return table(filteredDrivers);
|
||||
return groupDriversByClass(filteredDrivers, getClassName).map((group) => `
|
||||
<details class="driver-class-group" data-driver-group="${escapeHtml(group.classId)}" ${driverList.collapsed.has(group.classId) ? "" : "open"}>
|
||||
<summary><strong>${escapeHtml(group.name || t("drivers.no_class"))}</strong> <small>${t("drivers.group_count", { count: group.drivers.length })}</small></summary>
|
||||
${table(group.drivers)}
|
||||
</details>`).join("");
|
||||
})()}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
@@ -582,6 +630,34 @@ export function renderDriversView(deps) {
|
||||
if (driver) testDriverVoice({ spokenName: driver.speechName || driver.name, passSound: driver.passSound || "" });
|
||||
}));
|
||||
|
||||
const rerenderList = () => renderDriversView(deps);
|
||||
document.getElementById("driverClassFilter")?.addEventListener("change", (event) => { driverList.classFilter = event.currentTarget.value; rerenderList(); });
|
||||
document.getElementById("driverSortKey")?.addEventListener("change", (event) => { driverList.sortKey = event.currentTarget.value; saveDriverListPrefs(); rerenderList(); });
|
||||
document.getElementById("driverSortDir")?.addEventListener("click", () => { driverList.sortDir = driverList.sortDir === "desc" ? "asc" : "desc"; saveDriverListPrefs(); rerenderList(); });
|
||||
document.getElementById("driverGrouped")?.addEventListener("change", (event) => { driverList.grouped = event.currentTarget.checked; saveDriverListPrefs(); rerenderList(); });
|
||||
document.querySelectorAll(".driver-class-group").forEach((node) => node.addEventListener("toggle", () => {
|
||||
if (node.open) driverList.collapsed.delete(node.dataset.driverGroup); else driverList.collapsed.add(node.dataset.driverGroup);
|
||||
}));
|
||||
document.querySelectorAll("[data-driver-select]").forEach((box) => box.addEventListener("change", () => {
|
||||
if (box.checked) driverList.selected.add(box.dataset.driverSelect); else driverList.selected.delete(box.dataset.driverSelect);
|
||||
rerenderList();
|
||||
}));
|
||||
document.getElementById("driverSelectAll")?.addEventListener("change", (event) => {
|
||||
filteredDrivers.forEach((driver) => (event.currentTarget.checked ? driverList.selected.add(driver.id) : driverList.selected.delete(driver.id)));
|
||||
rerenderList();
|
||||
});
|
||||
document.getElementById("driverDeleteSelected")?.addEventListener("click", () => {
|
||||
const ids = [...driverList.selected];
|
||||
if (!ids.length) return;
|
||||
const names = state.drivers.filter((driver) => driverList.selected.has(driver.id)).map((driver) => driver.name);
|
||||
const preview = names.slice(0, 10).join(", ") + (names.length > 10 ? ` … (+${names.length - 10})` : "");
|
||||
if (!window.confirm(t("drivers.delete_confirm_many", { count: ids.length, names: preview }))) return;
|
||||
removeDrivers(state, ids);
|
||||
driverList.selected.clear();
|
||||
saveState();
|
||||
renderView();
|
||||
});
|
||||
|
||||
document.getElementById("driverBrandFilter")?.addEventListener("input", (event) => {
|
||||
const input = event.currentTarget;
|
||||
if (!(input instanceof HTMLInputElement)) {
|
||||
@@ -621,22 +697,9 @@ export function renderDriversView(deps) {
|
||||
});
|
||||
|
||||
document.getElementById(`driver-delete-${d.id}`)?.addEventListener("click", () => {
|
||||
state.drivers = state.drivers.filter((x) => x.id !== d.id);
|
||||
state.sessions.forEach((s) => {
|
||||
s.assignments = (s.assignments || []).filter((a) => a.driverId !== d.id);
|
||||
s.driverIds = (s.driverIds || []).filter((id) => id !== d.id);
|
||||
s.manualGridIds = (s.manualGridIds || []).filter((id) => id !== d.id);
|
||||
});
|
||||
// Otherwise a deleted driver stays a "member" of every team/participant list they
|
||||
// were ever added to, silently inflating team/participant counts forever.
|
||||
state.events.forEach((event) => {
|
||||
if (!event.raceConfig) return;
|
||||
event.raceConfig.driverIds = (event.raceConfig.driverIds || []).filter((id) => id !== d.id);
|
||||
event.raceConfig.teams = (event.raceConfig.teams || []).map((team) => ({
|
||||
...team,
|
||||
driverIds: (team.driverIds || []).filter((id) => id !== d.id),
|
||||
}));
|
||||
});
|
||||
if (!window.confirm(t("drivers.delete_confirm_one", { name: d.name }))) return;
|
||||
removeDrivers(state, [d.id]);
|
||||
driverList.selected.delete(d.id);
|
||||
saveState();
|
||||
renderView();
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user