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

+32 -2
View File
@@ -42,6 +42,7 @@ import { renderDashboardView, renderClassesView, renderDriversView, renderCarsVi
import { renderGuideView, renderOverlayPageView } from "./misc_views.js";
import { installAuthFetchGuard, showPinDialog, mountAuthSettings } from "./auth_view.js";
import { createRaceController } from "./race_controller.js";
import { mergeDriverInto } from "./driver_merge_logic.js";
import { resolveBackendUrl } from "./backend_url.js";
import { getSessionsForEventHelper, getModeLabelHelper, normalizeStartModeHelper, getStartModeLabelHelper, getClassNameHelper, getEventNameHelper, renderAssignmentListView, renderSessionsTableView } from "./event_common.js";
import { renderEventWorkspaceView } from "./event_workspace_controller.js";
@@ -872,7 +873,20 @@ const testDriverVoice = ({ spokenName, passSound }) => {
triggerRaceAudio("personal_best", { force: true, interrupt: true, variables });
triggerRaceAudio("race_winner", { force: true, variables });
};
const renderDrivers = () => renderDriversView({ state, dom, t, driverBrandFilter: () => driverBrandFilter, setDriverBrandFilter: (value) => { driverBrandFilter = value; }, selectedDriverEditId: () => selectedDriverEditId, setSelectedDriverEditId: (value) => { selectedDriverEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell, normalizeDriver, getClassName , testDriverVoice });
// Two entries for one person (or results left on a deleted duplicate): everything moves to the
// kept driver. It changes results, so only the Race Controller Master may do it - the server
// keeps the race results out of other browsers' saves.
function mergeDrivers(fromId, toId, { oldName = "" } = {}) {
const target = state.drivers.find((driver) => driver.id === toId);
if (!target || fromId === toId) return false;
if (!isRaceMaster()) { alert(notifyNotMaster()); return false; }
const from = state.drivers.find((driver) => driver.id === fromId);
if (!window.confirm(t("drivers.merge_confirm", { from: from?.name || oldName || fromId, to: target.name, class: getClassName(target.classId) || "-" }))) return false;
const moved = mergeDriverInto(state, fromId, toId);
saveState();
return moved > 0;
}
const renderDrivers = () => renderDriversView({ mergeDrivers, state, dom, t, driverBrandFilter: () => driverBrandFilter, setDriverBrandFilter: (value) => { driverBrandFilter = value; }, selectedDriverEditId: () => selectedDriverEditId, setSelectedDriverEditId: (value) => { selectedDriverEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell, normalizeDriver, getClassName , testDriverVoice });
const renderCars = () => renderCarsView({ state, dom, t, carBrandFilter: () => carBrandFilter, setCarBrandFilter: (value) => { carBrandFilter = value; }, selectedCarEditId: () => selectedCarEditId, setSelectedCarEditId: (value) => { selectedCarEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell, normalizeCar });
const renderGuide = () => renderGuideView({ dom, t });
const renderRaceDay = () => renderRaceDayView({
@@ -1211,7 +1225,7 @@ const exportSeriesPdf = async (series, tables) => {
)),
});
};
const renderSeries = () => renderSeriesView({ state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, deleteSeriesRaces, runSeriesSession, runSeriesSeeding, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound });
const renderSeries = () => renderSeriesView({ mergeDrivers, state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, deleteSeriesRaces, runSeriesSession, runSeriesSeeding, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound });
const renderArchive = () => renderResultsArchiveView({
getBackendUrl,
state, dom, t, escapeHtml, formatLap, formatRaceClock, renderTable,
@@ -2047,6 +2061,14 @@ const TRANSLATIONS = {
"drivers.brand_filter_placeholder": "Sök namn / transponder / märke / klubb / land",
"drivers.transponder_placeholder": "Personlig transponder (valfritt)",
"drivers.transponder_conflict_confirm": "Transpondern {tp} används redan av {name} ({class}). Spara ändå?",
"drivers.same_class_transponder": "Transpondern {tp} finns redan på {name} i {class}. Två förare i samma klass kan inte ha samma transponder - decodern kan inte skilja deras varv åt. Kör båda bilarna på den föraren, eller slå ihop förarna.",
"drivers.merge_title": "Slå ihop med en annan förare",
"drivers.merge_hint": "För samma person som lagts in två gånger (t.ex. två bilar på samma transponder). {name} tas bort och alla heat, varv, resultat och serie-poäng flyttas till föraren du väljer. Samma person i två olika klasser ska INTE slås ihop.",
"drivers.merge_pick": "Välj förare att behålla…",
"drivers.merge_go": "Slå ihop",
"drivers.merge_confirm": "Flytta allt från \"{from}\" till {to} ({class})? Heat, varv, resultat och serie-poäng hamnar på {to} och \"{from}\" tas bort. Det går inte att ångra.",
"series.link_driver": "Koppla till förare",
"series.link_driver_hint": "Föraren finns inte längre i förarlistan (borttagen dubblett). Välj vem resultaten tillhör så slås raderna ihop.",
"drivers.speech_name": "Uttalsnamn",
"drivers.voice_test": "🔊 Testa uttal",
"drivers.speech_name_placeholder": "Uttal för uppläsning (valfritt)",
@@ -4428,6 +4450,14 @@ const TRANSLATIONS = {
"drivers.brand_filter_placeholder": "Search name / transponder / brand / club / country",
"drivers.transponder_placeholder": "Personal transponder (optional)",
"drivers.transponder_conflict_confirm": "Transponder {tp} is already used by {name} ({class}). Save anyway?",
"drivers.same_class_transponder": "Transponder {tp} is already on {name} in {class}. Two drivers in one class can't share a transponder - the decoder can't tell their laps apart. Run both cars on that driver, or merge the drivers.",
"drivers.merge_title": "Merge with another driver",
"drivers.merge_hint": "For one person entered twice (e.g. two cars on one transponder). {name} is removed and every heat, lap, result and series point moves to the driver you pick. The same person in two different classes should NOT be merged.",
"drivers.merge_pick": "Pick the driver to keep…",
"drivers.merge_go": "Merge",
"drivers.merge_confirm": "Move everything from \"{from}\" to {to} ({class})? Heats, laps, results and series points go to {to} and \"{from}\" is removed. This can't be undone.",
"series.link_driver": "Link to driver",
"series.link_driver_hint": "This driver is no longer in the driver list (a deleted duplicate). Pick who the results belong to and the rows are merged.",
"drivers.speech_name": "Spoken name",
"drivers.voice_test": "🔊 Test pronunciation",
"drivers.speech_name_placeholder": "Pronunciation for announcements (optional)",