feat(drivers): merge two drivers, link a deleted duplicate's series results; refuse one transponder twice in a class (1.89.39)

This commit is contained in:
larssand committed 2026-11-15 18:22:21 +01:00
1 parent 5928ce847b
commit 10b5d0a447
11 files changed
+223 -10

No files matched your search

+21 -1
View File
@@ -1,5 +1,6 @@
import { flagHtml, countryChoices } from "./country_flags.js";
import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict } from "./driver_profile_logic.js";
import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict, findSameClassTransponder } from "./driver_profile_logic.js";
import { mergeCandidates } from "./driver_merge_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
@@ -411,6 +412,7 @@ export function renderDriversView(deps) {
normalizeDriver,
getClassName,
testDriverVoice = () => {},
mergeDrivers = () => false,
} = deps;
const classOptions = state.classes.map((c) => `<option value="${c.id}">${escapeHtml(c.name)}</option>`).join("");
const registered = filterDrivers(state.drivers, "");
@@ -560,6 +562,14 @@ export function renderDriversView(deps) {
<button class="btn" id="driverEditCancelFooter" type="button">${t("common.cancel")}</button>
</div>
</form>
<details class="panel-body driver-merge">
<summary>${t("drivers.merge_title")}</summary>
<p class="hint">${t("drivers.merge_hint", { name: escapeHtml(editingDriver.name) })}</p>
<div class="actions-inline">
<select id="driverMergeTarget"><option value="">${t("drivers.merge_pick")}</option>${mergeCandidates(state.drivers, { excludeId: editingDriver.id, name: editingDriver.name }).map((driver) => `<option value="${escapeHtml(driver.id)}">${escapeHtml(`${driver.name} - ${getClassName(driver.classId) || "-"}${driver.transponder ? ` (${driver.transponder})` : ""}`)}</option>`).join("")}</select>
<button class="btn btn-danger" id="driverMergeGo" type="button">${t("drivers.merge_go")}</button>
</div>
</details>
</div>
</div>
`
@@ -583,6 +593,8 @@ export function renderDriversView(deps) {
: sameNameProfile?.id || uid("profile");
const linkedProfile = profileGroups.find((profile) => profile.id === profileId);
const cleanedTransponder = String(form.get("transponder") || "").trim();
const sameClass = findSameClassTransponder(state.drivers, { transponder: cleanedTransponder, classId: String(form.get("classId") || "") });
if (sameClass) { window.alert(t("drivers.same_class_transponder", { tp: cleanedTransponder, name: sameClass.name, class: getClassName(sameClass.classId) })); return; }
const transponderConflict = findTransponderConflict(state.drivers, { transponder: cleanedTransponder, profileId });
if (transponderConflict && !window.confirm(t("drivers.transponder_conflict_confirm", { tp: cleanedTransponder, name: transponderConflict.name, class: getClassName(transponderConflict.classId) }))) {
return;
@@ -757,6 +769,8 @@ export function renderDriversView(deps) {
setFormError("driverEditError", t("validation.invalid_selection"));
return;
}
const sameClass = findSameClassTransponder(state.drivers, { transponder: cleanedTp, classId: cleanedClassId || editingDriver.classId, excludeDriverId: editingDriver.id });
if (sameClass) { setFormError("driverEditError", t("drivers.same_class_transponder", { tp: cleanedTp, name: sameClass.name, class: getClassName(sameClass.classId) })); return; }
const transponderConflict = findTransponderConflict(state.drivers, { transponder: cleanedTp, profileId: cleanedProfileId, excludeDriverId: editingDriver.id });
if (transponderConflict && !window.confirm(t("drivers.transponder_conflict_confirm", { tp: cleanedTp, name: transponderConflict.name, class: getClassName(transponderConflict.classId) }))) {
return;
@@ -795,6 +809,12 @@ export function renderDriversView(deps) {
});
document.getElementById("driverEditSave")?.addEventListener("click", commitDriverEdit);
document.getElementById("driverMergeGo")?.addEventListener("click", () => {
const targetId = document.getElementById("driverMergeTarget")?.value;
if (!editingDriver || !targetId) return;
if (mergeDrivers(editingDriver.id, targetId)) setSelectedDriverEditId(null);
renderView();
});
}
export function renderCarsView(deps) {