diff --git a/CHANGELOG.md b/CHANGELOG.md index b221d3d..b31b3e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.82.0 + +- **Late entries and withdrawals:** a race made from House of RC has **🔄 Fetch changes from House of RC** under Manage → Participants. It lists new entries of the race's class (➕, ticked) and participants whose entry is withdrawn or on the waiting list (➖, ticked); **Update participants** applies them the same way as ticking participants by hand, so only heats that haven't run change. Drivers added by hand are never touched. +- **Class choice remembered:** the class you pick for a House of RC class is chosen again next time ("As last time"); a guess by name is marked "Guessed – please check". +- **Brand on existing drivers:** when the car in the entry differs from the brand we have, the list shows "ours → House of RC" with a tick box, pre-ticked only when ours is empty. + ## 1.81.1 - **Fetch from House of RC:** a House of RC class is now also matched to ours when its name is a whole word of exactly one of our classes, e.g. "4wd" → "4WD Buggy". An exact name still wins, and when two classes fit you choose yourself. diff --git a/README.md b/README.md index c07692e..d704ea2 100644 --- a/README.md +++ b/README.md @@ -322,7 +322,7 @@ Erik Eriksson;654321;4WD;Associated;; RaceCore is meant for a trusted race network: - **Admin PIN** (Settings → System & backup, off by default) protects every change through the API. The login lasts 30 days and is throttled against guessing. - **Race Controller Master:** one computer at a time runs the race (the decoder, start, pause, resume, stop, false start, resetting a heat and the autopilot, also from the speaker panel). Judging corrections and the other calls work from any computer. The computer running the server (page opened on `localhost`) becomes master on its own and shows a green line "🎙 You are the Race Controller Master" with **Release master**. Phones and other computers follow the race live (updated every second), show "You are following the race …" and become master only when someone presses the button; that computer then remembers the role. They can also prepare drivers and races. Whoever works as race controller presses **Take over as master**, and the previous master lets go of the decoder within seconds. With the admin PIN on, taking over needs a login. Name the computer under Settings → System, e.g. "Speaker booth". Overlays and OBS are always view-only. -- **House of RC:** under Settings → System → 🏠 House of RC you save the club's API key once (stored on the server only, never shown again) and press **Test connection**. Drivers → **🏠 Fetch from House of RC** fills in names and brands from the transponders (only what you tick), and a known transponder fills in a new driver. With the key of the club running the event, the race wizard's **🏠 Fetch from House of RC** lists the club's events; pick an event and one of its classes, and the name, date, class and entered drivers with their transponders are filled in. Posting results back is being built together with House of RC (see ROADMAP.md). +- **House of RC:** under Settings → System → 🏠 House of RC you save the club's API key once (stored on the server only, never shown again) and press **Test connection**. Drivers → **🏠 Fetch from House of RC** fills in names and brands from the transponders (only what you tick), and a known transponder fills in a new driver. With the key of the club running the event, the race wizard's **🏠 Fetch from House of RC** lists the club's events; pick an event and one of its classes, and the name, date, class and entered drivers with their transponders are filled in. Later, Manage → Participants → **🔄 Fetch changes from House of RC** adds late entries and takes out withdrawals. Posting results back is being built together with House of RC (see ROADMAP.md). - **`RC_ADMIN_ALLOWED_CIDRS`** restricts admin changes to certain addresses or networks, e.g. `192.168.1.0/24`. - **`RC_ALLOWED_ORIGINS`** is for a UI deliberately served from another address. - **Don't expose port 8081 to the internet.** Reads are not PIN protected. Publish only the public overlay and mobile profile paths through a reverse proxy or VPN. diff --git a/README.sv.md b/README.sv.md index 6a77ebe..6dff6e6 100644 --- a/README.sv.md +++ b/README.sv.md @@ -335,7 +335,7 @@ Erik Eriksson;654321;4WD;Associated;; RaceCore är tänkt för ett betrott racenätverk: - **Admin-PIN** (Inställningar → System & backup, av som standard) skyddar alla ändringar via API:t. Inloggningen gäller i 30 dagar och är skyddad mot gissning. - **Race Controller Master:** bara en dator åt gången kör racet (decodern, start, paus, fortsätt, stopp, tjuvstart, nollställ heat och autopiloten, även från speakerpanelen). Domarvyns korrigeringar och övriga utrop fungerar från alla datorer. Datorn som kör servern (sidan öppnad på `localhost`) blir master av sig själv och visar en grön rad "🎙 Du är Race Controller Master" med **Släpp master**. Mobiler och andra datorer följer racet live (uppdateras varje sekund), visar "Du följer racet …" och blir master bara när någon trycker på knappen; den datorn minns sedan rollen. De kan också förbereda förare och race. Den som jobbar som race controller trycker **Ta över som master**, och den förra mastern släpper decodern inom några sekunder. Med admin-PIN krävs inloggning för att ta över. Ge datorn ett namn under Inställningar → System, t.ex. "Speakerbåset". Overlays och OBS är alltid bara visning. -- **House of RC:** under Inställningar → System → 🏠 House of RC sparar du klubbens API-nyckel en gång (bara på servern, visas aldrig igen) och trycker **Testa anslutning**. Förare → **🏠 Hämta från House of RC** fyller i namn och märke utifrån transpondrarna (bara det du bockar i), och en känd transponder fyller i en ny förare. Med nyckeln för klubben som arrangerar tävlingen listar Race-guidens **🏠 Hämta från House of RC** klubbens tävlingar; välj tävling och en av dess klasser så fylls namn, datum, klass och anmälda förare med transpondrar i. Att skicka tillbaka resultat byggs tillsammans med House of RC (se ROADMAP.md). +- **House of RC:** under Inställningar → System → 🏠 House of RC sparar du klubbens API-nyckel en gång (bara på servern, visas aldrig igen) och trycker **Testa anslutning**. Förare → **🏠 Hämta från House of RC** fyller i namn och märke utifrån transpondrarna (bara det du bockar i), och en känd transponder fyller i en ny förare. Med nyckeln för klubben som arrangerar tävlingen listar Race-guidens **🏠 Hämta från House of RC** klubbens tävlingar; välj tävling och en av dess klasser så fylls namn, datum, klass och anmälda förare med transpondrar i. Senare lägger Hantera → Deltagare → **🔄 Hämta ändringar från House of RC** till sena anmälningar och tar bort avanmälda. Att skicka tillbaka resultat byggs tillsammans med House of RC (se ROADMAP.md). - **`RC_ADMIN_ALLOWED_CIDRS`** begränsar adminändringar till vissa adresser eller nät, till exempel `192.168.1.0/24`. - **`RC_ALLOWED_ORIGINS`** används för ett gränssnitt som medvetet körs från en annan adress. - **Exponera inte port 8081 mot internet.** Läsningar skyddas inte av PIN. Publicera bara sökvägarna för publik overlay och mobilprofil via reverse proxy eller VPN. diff --git a/ROADMAP.md b/ROADMAP.md index 2bf6ee2..ccc8e09 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -1012,6 +1012,7 @@ Status 2026-11-08 (1.78.0-1.80.0): Next: - [ ] **Results back:** `POST /v1/timing/events/{id}/entries` with `{ entries: [{ id, ranking, qualification, points, tq, laps_time, data }] }`, all or nothing, up to 2000 entries. `data.result` is shown on House of RC (`main`, `main_position`, `bumped_from`, `race`, `best_lap`, `average_lap`, `points`, `heats[]`). The race already keeps each driver's entry id (`event.houseOfRc.entryIds`). - [ ] **Semi-live (Conny's idea):** post after every heat, with that heat's results in `data`; House of RC would add a view showing only the latest heat. +- [x] 1.82.0: re-fetch in Manage (late entries, withdrawals), remembered class mapping, brand differences offered. - [ ] One click for all classes: create one race per House of RC class. - [ ] The URL and JSON body for posting results, with an example of a qualifying-plus-finals result (TQ, A/B/C finals). Can a result be posted again, overwriting the previous one, after a correction? - [ ] A test event to post against. diff --git a/package-lock.json b/package-lock.json index 9b8748d..f3e9b8f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.81.1", + "version": "1.82.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.81.1", + "version": "1.82.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 398a46d..2e2df06 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.81.1", + "version": "1.82.0", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/src/app.js b/src/app.js index 5ffbe0c..e1b699f 100644 --- a/src/app.js +++ b/src/app.js @@ -2212,12 +2212,24 @@ const TRANSLATIONS = { "houseofrc.entries_empty": "Inga anmälda förare än.", "houseofrc.entries_class": "Klass hos oss", "houseofrc.entries_hor_class": "Klass på House of RC", + "houseofrc.refresh_button": "Hämta ändringar från House of RC", + "houseofrc.refresh_hint": "Nya anmälningar och avanmälningar sedan racet skapades ({name})", + "houseofrc.refresh_title": "Ändrade anmälningar", + "houseofrc.refresh_nothing": "Inga ändringar – deltagarna stämmer med House of RC.", + "houseofrc.refresh_added": "Nya anmälningar ({count})", + "houseofrc.refresh_withdrawn": "Avanmälda eller på reservlistan ({count})", + "houseofrc.refresh_note": "Bara heat som inte har körts ändras, precis som när du bockar i deltagare för hand. Förare du lagt till själv berörs inte.", + "houseofrc.refresh_apply": "Uppdatera deltagare", + "houseofrc.class_remembered": "Som förra gången", + "houseofrc.class_exact": "Samma namn", + "houseofrc.class_guess": "Gissad – kontrollera", + "houseofrc.entries_brand_hint": "Bilen i anmälan skiljer sig från märket hos oss. Bocka i för att ta anmälans.", "houseofrc.entries_new_class": "Ny klass: {name}", "houseofrc.err_not_your_event": "Den här tävlingen tillhör en annan klubb. Anmälningarna kräver nyckeln för klubben som arrangerar den.", "houseofrc.err_event_not_found": "Hittar ingen sådan tävling på House of RC.", "houseofrc.connected_org": "✅ Ansluten som {name} (organisation {id}) · {limit} anrop/min", "houseofrc.entries_all": "Alla", - "houseofrc.entries_hint": "Befintliga förare återanvänds och behåller sitt namn; nya förare skapas med transpondern från anmälan. Hämta igen för nästa klass.", + "houseofrc.entries_hint": "Befintliga förare återanvänds och behåller namn och märke om du inte bockar i ett annat; nya förare skapas med transpondern och bilen från anmälan. Klassvalet kommer RaceCore ihåg till nästa gång. Hämta igen för nästa klass.", "houseofrc.entries_apply": "Fyll i Race-guiden", "houseofrc.entry_linked": "Finns", "houseofrc.entry_copy": "Finns i annan klass", @@ -4420,12 +4432,24 @@ const TRANSLATIONS = { "houseofrc.entries_empty": "No drivers entered yet.", "houseofrc.entries_class": "Our class", "houseofrc.entries_hor_class": "Class on House of RC", + "houseofrc.refresh_button": "Fetch changes from House of RC", + "houseofrc.refresh_hint": "New entries and withdrawals since the race was created ({name})", + "houseofrc.refresh_title": "Changed entries", + "houseofrc.refresh_nothing": "No changes – the participants match House of RC.", + "houseofrc.refresh_added": "New entries ({count})", + "houseofrc.refresh_withdrawn": "Withdrawn or on the waiting list ({count})", + "houseofrc.refresh_note": "Only heats that haven't run change, just like ticking participants by hand. Drivers you added yourself are not affected.", + "houseofrc.refresh_apply": "Update participants", + "houseofrc.class_remembered": "As last time", + "houseofrc.class_exact": "Same name", + "houseofrc.class_guess": "Guessed – please check", + "houseofrc.entries_brand_hint": "The car in the entry differs from our brand. Tick to use the entry's.", "houseofrc.entries_new_class": "New class: {name}", "houseofrc.err_not_your_event": "This event belongs to another club. Its entries need the key of the club running it.", "houseofrc.err_event_not_found": "No such event on House of RC.", "houseofrc.connected_org": "✅ Connected as {name} (organization {id}) · {limit} requests/min", "houseofrc.entries_all": "All", - "houseofrc.entries_hint": "Existing drivers are reused and keep their name; new drivers get the transponder from the entry. Fetch again for the next class.", + "houseofrc.entries_hint": "Existing drivers are reused and keep their name and brand unless you tick another; new drivers get the transponder and car from the entry. RaceCore remembers the class choice for next time. Fetch again for the next class.", "houseofrc.entries_apply": "Fill the race wizard", "houseofrc.entry_linked": "Exists", "houseofrc.entry_copy": "Exists in another class", @@ -6593,6 +6617,8 @@ function normalizeImportedClass(classItem) { return { id: String(classItem?.id || uid("class")), name: String(classItem?.name || "").trim(), + // House of RC class names this class was chosen for, so the next fetch picks it again. + ...(Array.isArray(classItem?.houseOfRcNames) && classItem.houseOfRcNames.length ? { houseOfRcNames: classItem.houseOfRcNames.map(String).slice(0, 20) } : {}), }; } @@ -7455,6 +7481,7 @@ function renderEventManager(eventId) { t, escapeHtml, normalizeEvent, + normalizeDriver, ensureRaceParticipantsConfigured, getSessionsForEvent, buildEventSchedule, diff --git a/src/event_manager_controller.js b/src/event_manager_controller.js index 772b7bb..b751edb 100644 --- a/src/event_manager_controller.js +++ b/src/event_manager_controller.js @@ -1,3 +1,4 @@ +import { openHouseOfRcEntryRefresh } from "./houseofrc_view.js"; import { mountSponsorSetup } from "./sponsor_event_view.js"; import { mountTeamRaceSetup } from "./team_race_setup_view.js"; import { orderSessionsForRunning, moveSessionInRunningOrder, applyFormatToPendingSessions, syncParticipantsToSessions } from "./event_race_logic.js"; @@ -22,6 +23,7 @@ export function renderEventManagerView(context) { t, escapeHtml, normalizeEvent, + normalizeDriver, ensureRaceParticipantsConfigured, getSessionsForEvent, getSelectedTeamEditId, @@ -597,6 +599,20 @@ export function renderEventManagerView(context) { node.addEventListener("change", persistRaceParticipants); }); + // Race made from House of RC: fetch late entries and withdrawals again. + document.getElementById("houseOfRcRefreshEntries")?.addEventListener("click", () => openHouseOfRcEntryRefresh({ + event, state, t, escapeHtml, + makeDriver: (fields) => normalizeDriver({ id: uid("driver"), ...fields }), + onApply: (selectedIds) => { + const beforeIds = getEventDrivers(event).map((driver) => driver.id); + event.raceConfig.driverIds = selectedIds; + event.raceConfig.participantsConfigured = true; + syncParticipantsToSessions(state.sessions.filter((session) => session.eventId === event.id), beforeIds, selectedIds); + saveState(); + refreshManager(); + }, + })); + document.getElementById("selectAllParticipants")?.addEventListener("click", () => { document.querySelectorAll(".race-participant").forEach((node) => { node.checked = true; diff --git a/src/event_manager_view.js b/src/event_manager_view.js index fc2b2f9..a7cf6b8 100644 --- a/src/event_manager_view.js +++ b/src/event_manager_view.js @@ -188,6 +188,7 @@ export function renderEventManagerMarkup(context) {
+ ${event.houseOfRc?.eventId ? `` : ""}
${(() => { const card = (driver) => { diff --git a/src/houseofrc_logic.js b/src/houseofrc_logic.js index acd064a..55fc558 100644 --- a/src/houseofrc_logic.js +++ b/src/houseofrc_logic.js @@ -63,7 +63,11 @@ export function planHouseOfRcEntries(entries = [], drivers = [], classId = "") { return entries.map((entry) => { const entryTransponder = (entry.transponders || [])[0] || ""; const existing = find(inClass, entry); - if (existing) return { entry, status: "linked", driverId: existing.id, transponder: existing.transponder || entryTransponder }; + if (existing) { + // The car in the entry may differ from what we have: offered, pre-ticked only when ours is empty. + const brandDiffers = Boolean(entry.car) && !sameText(entry.car, existing.brand); + return { entry, status: "linked", driverId: existing.id, transponder: existing.transponder || entryTransponder, currentBrand: existing.brand || "", brandDiffers, brandDefault: brandDiffers && !existing.brand }; + } const source = find(club, entry); if (source) return { entry, status: "copy", sourceId: source.id, transponder: entryTransponder || source.transponder }; return { entry, status: "new", transponder: entryTransponder }; @@ -73,7 +77,8 @@ export function planHouseOfRcEntries(entries = [], drivers = [], classId = "") { // Creates/links the ticked entries. Returns the driver ids in House of RC order and which // House of RC entry each driver is ({ driverId: entryId }), for posting results back. // makeDriver(fields) must return a normalized driver with a fresh id. -export function applyHouseOfRcEntries(drivers, plan, { classId, selected, makeDriver }) { +// brands: the row indexes whose car from House of RC replaces our brand. +export function applyHouseOfRcEntries(drivers, plan, { classId, selected, makeDriver, brands = new Set() }) { const driverIds = []; const entryIds = {}; plan.forEach((row, index) => { @@ -84,6 +89,7 @@ export function applyHouseOfRcEntries(drivers, plan, { classId, selected, makeDr if (driver) { if (memberId) driver.houseOfRcId = memberId; if (!driver.transponder && row.transponder) driver.transponder = row.transponder; + if (row.brandDiffers && brands.has(index)) driver.brand = entry.car; } else { const source = row.sourceId ? drivers.find((item) => item.id === row.sourceId) : null; driver = makeDriver({ @@ -105,15 +111,60 @@ export function applyHouseOfRcEntries(drivers, plan, { classId, selected, makeDr return { driverIds, entryIds }; } -// Our class for a House of RC class: the same name (ignoring case and spaces), else the one -// class whose name holds the other as whole words ("4wd" ~ "4WD Buggy"), else none. +// Our class for a House of RC class, and how sure it is: +// remembered - chosen for this House of RC class name before +// exact - the same name (ignoring case and spaces) +// guess - the one class whose name holds the other as whole words ("4wd" ~ "4WD Buggy") export function matchHouseOfRcClass(classes = [], name = "") { + const remembered = classes.find((item) => (item.houseOfRcNames || []).some((known) => sameText(known, name))); + if (remembered) return { id: remembered.id, how: "remembered" }; const exact = classes.find((item) => sameText(item.name, name)); - if (exact) return exact.id; + if (exact) return { id: exact.id, how: "exact" }; const words = (text) => String(text || "").toLocaleLowerCase().split(/[^\p{L}\p{N}.]+/u).filter(Boolean); const wanted = words(name); - if (!wanted.length) return ""; + if (!wanted.length) return { id: "", how: "" }; const holds = (outer, inner) => inner.length <= outer.length && outer.some((_word, index) => inner.every((word, offset) => outer[index + offset] === word)); const candidates = classes.filter((item) => { const own = words(item.name); return holds(own, wanted) || holds(wanted, own); }); - return candidates.length === 1 ? candidates[0].id : ""; + return candidates.length === 1 ? { id: candidates[0].id, how: "guess" } : { id: "", how: "" }; +} + +// Remember the choice: this House of RC class name now points at our class only. +export function rememberHouseOfRcClass(classes = [], classId = "", name = "") { + if (!name) return; + classes.forEach((item) => { + const known = (item.houseOfRcNames || []).filter((value) => !sameText(value, name)); + if (item.id === classId) known.push(name); + if (known.length) item.houseOfRcNames = known; + else delete item.houseOfRcNames; + }); +} + +// Re-fetch for a race made from House of RC: which entries of its class are new, and which of +// our participants' entries are gone (withdrawn or moved to the waiting list - the server +// leaves those out). Participants added by hand (no entry id) are never touched. +export function diffHouseOfRcEntries(event, entries = [], drivers = []) { + const link = event?.houseOfRc || {}; + const entryIds = link.entryIds || {}; + const participants = new Set(event?.raceConfig?.driverIds || []); + const classEntries = entries.filter((entry) => link.classId == null || entry.classId === link.classId); + const known = new Set(Object.entries(entryIds).filter(([driverId]) => participants.has(driverId)).map(([, entryId]) => entryId)); + const plan = planHouseOfRcEntries(classEntries, drivers, event?.classId || ""); + const added = plan.filter((row) => !known.has(row.entry.entryId) && !(row.driverId && participants.has(row.driverId) && entryIds[row.driverId] == null)); + const current = new Set(classEntries.map((entry) => entry.entryId)); + const withdrawn = Object.entries(entryIds) + .filter(([driverId, entryId]) => participants.has(driverId) && !current.has(entryId)) + .map(([driverId]) => drivers.find((driver) => driver.id === driverId)) + .filter(Boolean); + return { added, withdrawn }; +} + +// Apply a re-fetch: add the ticked new entries, take out the ticked withdrawn drivers. +// Returns the new participant list (entry order kept, new ones last). +export function applyHouseOfRcEntryChanges(event, drivers, diff, { addIndexes, removeIds, makeDriver, brands = new Set() }) { + const link = event.houseOfRc; + const { driverIds: addedIds, entryIds } = applyHouseOfRcEntries(drivers, diff.added, { classId: event.classId, selected: addIndexes, makeDriver, brands }); + link.entryIds = { ...(link.entryIds || {}), ...entryIds }; + removeIds.forEach((driverId) => { delete link.entryIds[driverId]; }); + const before = event.raceConfig.driverIds || []; + return [...before.filter((id) => !removeIds.has(id)), ...addedIds.filter((id) => !before.includes(id))]; } diff --git a/src/houseofrc_view.js b/src/houseofrc_view.js index 69dde5c..e557395 100644 --- a/src/houseofrc_view.js +++ b/src/houseofrc_view.js @@ -1,4 +1,4 @@ -import { planHouseOfRcDriverUpdates, applyHouseOfRcDriverUpdates, planHouseOfRcEntries, applyHouseOfRcEntries, matchHouseOfRcClass } from "./houseofrc_logic.js"; +import { planHouseOfRcDriverUpdates, applyHouseOfRcDriverUpdates, planHouseOfRcEntries, applyHouseOfRcEntries, matchHouseOfRcClass, rememberHouseOfRcClass, diffHouseOfRcEntries, applyHouseOfRcEntryChanges } from "./houseofrc_logic.js"; // Settings → System → House of RC: save the club's API key on the server and test it. // The key is never read back; the server only tells whether one is set (and its last 4 chars). @@ -235,9 +235,14 @@ export function openHouseOfRcEventImport({ state, t, escapeHtml, uid, saveState, const NEW_CLASS = "__new__"; let horClassId = classes.find((item) => entries.some((entry) => entry.classId === item.id))?.id ?? classes[0]?.id; let ourClassId = null; + let matchedHow = ""; const render = () => { const horClass = classes.find((item) => item.id === horClassId); - if (ourClassId === null) ourClassId = matchHouseOfRcClass(state.classes, horClass?.name) || NEW_CLASS; + if (ourClassId === null) { + const match = matchHouseOfRcClass(state.classes, horClass?.name); + ourClassId = match.id || NEW_CLASS; + matchedHow = match.how; + } const classEntries = entries.filter((entry) => entry.classId === horClassId); const plan = ourClassId === NEW_CLASS ? planHouseOfRcEntries(classEntries, state.drivers, "") : planHouseOfRcEntries(classEntries, state.drivers, ourClassId); const count = (id) => entries.filter((entry) => entry.classId === id).length; @@ -252,6 +257,7 @@ export function openHouseOfRcEventImport({ state, t, escapeHtml, uid, saveState, ${state.classes.map((item) => ``).join("")} + ${matchedHow ? `${escapeHtml(t(`houseofrc.class_${matchedHow}`))}` : ""} ${classEntries.length ? ` @@ -261,7 +267,9 @@ export function openHouseOfRcEventImport({ state, t, escapeHtml, uid, saveState, ${escapeHtml(row.entry.name)}${row.entry.number != null ? ` #${escapeHtml(String(row.entry.number))}` : ""} ${escapeHtml(row.entry.club || "–")} - ${escapeHtml(row.entry.car || "–")} + ${row.brandDiffers + ? `` + : escapeHtml(row.entry.car || row.currentBrand || "–")} ${escapeHtml(row.transponder || "–")} ${escapeHtml(t(`houseofrc.entry_${row.status}`))} `).join("")} @@ -271,7 +279,7 @@ export function openHouseOfRcEventImport({ state, t, escapeHtml, uid, saveState, : `

${escapeHtml(t("houseofrc.entries_empty"))}

${back}`}`; bindBack(); body.querySelector("[data-hor-source-class]").addEventListener("change", (change) => { horClassId = Number(change.target.value); ourClassId = null; render(); }); - body.querySelector("[data-hor-class]").addEventListener("change", (change) => { ourClassId = change.target.value; render(); }); + body.querySelector("[data-hor-class]").addEventListener("change", (change) => { ourClassId = change.target.value; matchedHow = ""; render(); }); body.querySelector("[data-hor-all]")?.addEventListener("change", (change) => body.querySelectorAll("[data-hor-entry]").forEach((box) => { box.checked = change.target.checked; })); body.querySelector("[data-hor-apply]")?.addEventListener("click", () => { let classId = ourClassId; @@ -280,7 +288,9 @@ export function openHouseOfRcEventImport({ state, t, escapeHtml, uid, saveState, state.classes.push({ id: classId, name: horClass?.name || event.name }); } const selected = new Set([...body.querySelectorAll("[data-hor-entry]:checked")].map((box) => Number(box.dataset.horEntry))); - const { driverIds, entryIds } = applyHouseOfRcEntries(state.drivers, plan, { classId, selected, makeDriver }); + const brands = new Set([...body.querySelectorAll("[data-hor-brand]:checked")].map((box) => Number(box.dataset.horBrand))); + rememberHouseOfRcClass(state.classes, classId, horClass?.name || ""); + const { driverIds, entryIds } = applyHouseOfRcEntries(state.drivers, plan, { classId, selected, makeDriver, brands }); saveState(); close(); onImported({ event, horClass, classId, driverIds, entryIds }); @@ -291,3 +301,48 @@ export function openHouseOfRcEventImport({ state, t, escapeHtml, uid, saveState, showEvents(); } + +// Manage → "Fetch entry changes": late entries to add, withdrawn drivers to take out (ticked). +// The caller applies the new participant list the same way as ticking participants by hand, +// so only heats that haven't run change. +export async function openHouseOfRcEntryRefresh({ event, state, t, escapeHtml, makeDriver, onApply }) { + const { overlay, body, close } = openHorModal({ id: "houseOfRcRefreshOverlay", title: t("houseofrc.refresh_title"), escapeHtml }); + body.innerHTML = `

${escapeHtml(t("houseofrc.entries_loading"))}

`; + const { status: code, body: data } = await postJson("/api/houseofrc/entries", { eventId: String(event.houseOfRc.eventId) }); + if (!overlay.isConnected) return; + if (code !== 200 || !data.ok) { + body.innerHTML = `

${escapeHtml(describeHouseOfRcError(t, code, data))}

`; + return; + } + const diff = diffHouseOfRcEntries(event, data.entries, state.drivers); + const where = [event.houseOfRc.name, event.houseOfRc.className].filter(Boolean).join(" – "); + if (!diff.added.length && !diff.withdrawn.length) { + body.innerHTML = `

${escapeHtml(where)}

âś… ${escapeHtml(t("houseofrc.refresh_nothing"))}

`; + return; + } + body.innerHTML = ` +

${escapeHtml(where)}

+ ${diff.added.length ? `

âž• ${escapeHtml(t("houseofrc.refresh_added", { count: diff.added.length }))}

+
${diff.added.map((row, index) => ` + + + + `).join("")}
${escapeHtml(row.entry.name)}${escapeHtml(row.entry.club || "–")}${escapeHtml(row.entry.car || "–")}${escapeHtml(row.transponder || "–")}${escapeHtml(t(`houseofrc.entry_${row.status}`))}
` : ""} + ${diff.withdrawn.length ? `

âž– ${escapeHtml(t("houseofrc.refresh_withdrawn", { count: diff.withdrawn.length }))}

+
${diff.withdrawn.map((driver) => ` + + + `).join("")}
${escapeHtml(driver.name)}${escapeHtml(driver.transponder || "–")}
` : ""} +

${escapeHtml(t("houseofrc.refresh_note"))}

+
+ + +
`; + body.querySelector("[data-hor-apply]").addEventListener("click", () => { + const addIndexes = new Set([...body.querySelectorAll("[data-hor-add]:checked")].map((box) => Number(box.dataset.horAdd))); + const removeIds = new Set([...body.querySelectorAll("[data-hor-remove]:checked")].map((box) => box.dataset.horRemove)); + const selectedIds = applyHouseOfRcEntryChanges(event, state.drivers, diff, { addIndexes, removeIds, makeDriver }); + close(); + onApply(selectedIds); + }); +} diff --git a/tests/browser_houseofrc.js b/tests/browser_houseofrc.js index 09d370d..1ae3270 100644 --- a/tests/browser_houseofrc.js +++ b/tests/browser_houseofrc.js @@ -77,7 +77,7 @@ export async function runHouseOfRcEventSmoke({ evaluate, navigate, savedState, w if (String(url).includes("/api/houseofrc/events")) return json({ ok: true, organizationId: 233, events: [{ id: 2251, name: "HoR Deltävling 2", start: "2026-12-05T07:00:00Z", city: "Sundsvall", country: "SE", url: "https://houseofrc.com/events/2251" }] }); if (String(url).includes("/api/houseofrc/entries")) return json({ ok: true, event: { id: 2251, name: "HoR Deltävling 2", start: "2026-12-05T07:00:00Z", city: "Sundsvall", url: "https://houseofrc.com/events/2251" }, classes: [{ id: 555, name: "HoR 2wd" }, { id: 556, name: "HoR 4wd" }], - entries: [ + entries: window.__horEntries || [ { entryId: 11, classId: 555, houseOfRcId: 901, name: "HoR Anna", number: 7, transponders: ["7710001"], club: "Sundsvall RC", car: "XRAY X12" }, { entryId: 12, classId: 555, houseOfRcId: 902, name: "HoR Bo", number: null, transponders: [], club: "", car: "" }, { entryId: 13, classId: 555, houseOfRcId: 903, name: "HoR Skipped", number: null, transponders: [], club: "", car: "" }, @@ -103,6 +103,7 @@ export async function runHouseOfRcEventSmoke({ evaluate, navigate, savedState, w const anna = drivers.find((driver) => driver.name === "HoR Anna"); assert.deepEqual([anna.classId, anna.club, anna.brand, anna.houseOfRcId, anna.transponder], ["test_class", "Sundsvall RC", "XRAY X12", "901", "7710001"], "the entry's transponder comes along"); assert.equal(drivers.some((driver) => driver.name === "HoR Skipped"), false, "an unticked entry is not created"); + await waitFor(async () => ((await savedState()).classes.find((item) => item.id === "test_class")?.houseOfRcNames || []).includes("HoR 2wd"), "the class choice is remembered on the server"); const ticked = await evaluate(`[...document.querySelectorAll(".wizard-participant:checked")].map((box) => box.value)`); const ids = drivers.filter((driver) => ["HoR Anna", "HoR Bo"].includes(driver.name)).map((driver) => driver.id); assert.deepEqual([...ticked].sort(), [...ids].sort(), "the wizard is on Participants with exactly the entered drivers"); @@ -115,12 +116,34 @@ export async function runHouseOfRcEventSmoke({ evaluate, navigate, savedState, w assert.deepEqual(Object.values(event.houseOfRc.entryIds).sort(), [11, 12], "each driver's House of RC entry, for the results"); assert.deepEqual([...event.raceConfig.driverIds].sort(), [...ids].sort()); console.log("PASS House of RC event import: pick an event and class, entered drivers fill the race wizard, the race keeps the House of RC event id"); + + // Later: Bo withdraws, Cecilia enters late. Manage → "Fetch changes from House of RC". + await evaluate(`window.__horEntries = [ + { entryId: 11, classId: 555, houseOfRcId: 901, name: "HoR Anna", number: 7, transponders: ["7710001"], club: "Sundsvall RC", car: "XRAY X12" }, + { entryId: 16, classId: 555, houseOfRcId: 906, name: "HoR Late Cecilia", number: null, transponders: ["7710006"], club: "", car: "" }, + ]`); + await waitFor(async () => evaluate(`Boolean(document.getElementById("houseOfRcRefreshEntries"))`), "the refresh button in Manage"); + await evaluate(`document.getElementById("houseOfRcRefreshEntries").click()`); + await waitFor(async () => evaluate(`Boolean(document.querySelector("#houseOfRcRefreshOverlay [data-hor-apply]"))`), "the changes"); + const shown = await evaluate(`({ add: document.querySelectorAll("[data-hor-add]").length, remove: [...document.querySelectorAll("[data-hor-remove]")].map((box) => box.closest("tr").children[1].textContent) })`); + assert.deepEqual(shown, { add: 1, remove: ["HoR Bo"] }); + await evaluate(`document.querySelector("#houseOfRcRefreshOverlay [data-hor-apply]").click()`); + await waitFor(async () => (await savedState()).drivers.some((driver) => driver.name === "HoR Late Cecilia"), "the late entry is created"); + { + const saved = await savedState(); + const race = saved.events.find((item) => item.houseOfRc?.eventId === 2251); + const name = (id) => saved.drivers.find((driver) => driver.id === id)?.name; + assert.deepEqual(race.raceConfig.driverIds.map(name), ["HoR Anna", "HoR Late Cecilia"], "Bo out, Cecilia in, order kept"); + assert.equal(Object.keys(race.houseOfRc.entryIds).length, 2); + } + console.log("PASS House of RC re-fetch in Manage: late entries added, withdrawn drivers taken out"); } finally { await evaluate(`document.getElementById("houseOfRcEventOverlay")?.remove()`).catch(() => {}); const current = await savedState(); const eventIds = current.events.filter((event) => event.houseOfRc?.eventId === 2251).map((event) => event.id); Object.assign(current, { drivers: current.drivers.filter((driver) => !String(driver.name).startsWith("HoR ")), + classes: current.classes.map(({ houseOfRcNames, ...item }) => item), events: current.events.filter((event) => !eventIds.includes(event.id)), sessions: current.sessions.filter((session) => !eventIds.includes(session.eventId)), }); diff --git a/tests/houseofrc_logic.test.js b/tests/houseofrc_logic.test.js index 2a39851..943c4af 100644 --- a/tests/houseofrc_logic.test.js +++ b/tests/houseofrc_logic.test.js @@ -39,7 +39,7 @@ test("House of RC apply: writes only the ticked fields and links drivers whose n }); test("House of RC entries: matched on member, transponder or name; other class and new drivers", async () => { - const { planHouseOfRcEntries, applyHouseOfRcEntries, matchHouseOfRcClass } = await import("../src/houseofrc_logic.js"); + const { planHouseOfRcEntries, applyHouseOfRcEntries, matchHouseOfRcClass, rememberHouseOfRcClass } = await import("../src/houseofrc_logic.js"); const register = [ { id: "d1", name: "Anna Andersson", classId: "2wd", transponder: "111", houseOfRcId: "5" }, { id: "d2", name: "Robban", classId: "2wd", transponder: "222" }, @@ -56,7 +56,12 @@ test("House of RC entries: matched on member, transponder or name; other class a const plan = planHouseOfRcEntries(entries, register, "2wd"); assert.deepEqual(plan.map((row) => `${row.status}:${row.driverId || row.sourceId || ""}`), ["linked:d1", "linked:d2", "linked:d3", "copy:d4", "new:"], "member, then transponder, then name"); let n = 0; - const { driverIds, entryIds } = applyHouseOfRcEntries(register, plan, { classId: "2wd", selected: new Set([0, 1, 2, 3, 4]), makeDriver: (fields) => ({ id: `new${++n}`, ...fields }) }); + assert.deepEqual([plan[0].brandDiffers, plan[0].brandDefault, plan[1].brandDiffers], [true, true, false], "a different car on an existing driver is offered; pre-ticked as our brand is empty"); + register[1].brand = "Team Robban"; + const robban = planHouseOfRcEntries([{ ...entries[1], car: "Mugen" }], register, "2wd")[0]; + assert.deepEqual([robban.brandDiffers, robban.brandDefault, robban.currentBrand], [true, false, "Team Robban"], "our brand is never pre-ticked away"); + const { driverIds, entryIds } = applyHouseOfRcEntries(register, plan, { classId: "2wd", selected: new Set([0, 1, 2, 3, 4]), brands: new Set([0]), makeDriver: (fields) => ({ id: `new${++n}`, ...fields }) }); + assert.equal(register[0].brand, "Xray XB2", "the ticked car is written"); assert.deepEqual(driverIds, ["d1", "d2", "d3", "new1", "new2"]); assert.deepEqual(entryIds, { d1: 1, d2: 2, d3: 3, new1: 4, new2: 5 }, "each driver remembers their House of RC entry"); assert.deepEqual([register[1].name, register[1].houseOfRcId], ["Robban", "6"], "our name is kept, the member is linked"); @@ -65,11 +70,38 @@ test("House of RC entries: matched on member, transponder or name; other class a assert.deepEqual([cid.classId, cid.transponder, cid.profileId, cid.brand], ["2wd", "555", "p3", "Associated B7"], "other class: same profile, this entry's transponder"); const dan = register.find((d) => d.id === "new2"); assert.deepEqual([dan.name, dan.transponder, dan.club, dan.houseOfRcId], ["Dan Ny", "666", "Sundsvall RC", "8"]); - assert.equal(matchHouseOfRcClass([{ id: "c1", name: "Offroad 2WD foam" }], "offroad 2wd Foam"), "c1"); - assert.equal(matchHouseOfRcClass([{ id: "c1", name: "Touring" }], "F1"), ""); + assert.deepEqual(matchHouseOfRcClass([{ id: "c1", name: "Offroad 2WD foam" }], "offroad 2wd Foam"), { id: "c1", how: "exact" }); + assert.deepEqual(matchHouseOfRcClass([{ id: "c1", name: "Touring" }], "F1"), { id: "", how: "" }); const ours = [{ id: "s", name: "Stock 17.5T" }, { id: "b2", name: "2WD Buggy" }, { id: "b4", name: "4WD Buggy" }, { id: "x2", name: "2wd" }]; - assert.equal(matchHouseOfRcClass(ours, "4wd"), "b4", "a whole word of one class"); - assert.equal(matchHouseOfRcClass(ours, "2wd"), "x2", "an exact name wins"); - assert.equal(matchHouseOfRcClass(ours, "Buggy"), "", "two candidates: let the user choose"); - assert.equal(matchHouseOfRcClass(ours, "17.5"), "", "part of a word is no match"); + assert.deepEqual(matchHouseOfRcClass(ours, "4wd"), { id: "b4", how: "guess" }, "a whole word of one class"); + assert.deepEqual(matchHouseOfRcClass(ours, "2wd"), { id: "x2", how: "exact" }, "an exact name wins"); + assert.equal(matchHouseOfRcClass(ours, "Buggy").id, "", "two candidates: let the user choose"); + assert.equal(matchHouseOfRcClass(ours, "17.5").id, "", "part of a word is no match"); + rememberHouseOfRcClass(ours, "b2", "2wd"); + assert.deepEqual(matchHouseOfRcClass(ours, "2WD"), { id: "b2", how: "remembered" }, "the last choice wins over the name"); + rememberHouseOfRcClass(ours, "s", "2wd"); + assert.deepEqual([ours[1].houseOfRcNames, ours[0].houseOfRcNames], [undefined, ["2wd"]], "a name points at one class only"); +}); + +test("House of RC re-fetch: late entries are added, withdrawn ones offered for removal, hand-added drivers left alone", async () => { + const { diffHouseOfRcEntries, applyHouseOfRcEntryChanges } = await import("../src/houseofrc_logic.js"); + const drivers = [ + { id: "a", name: "Anna", classId: "2wd", transponder: "1", houseOfRcId: "5" }, + { id: "b", name: "Bo", classId: "2wd", transponder: "2", houseOfRcId: "6" }, + { id: "h", name: "Hand Added", classId: "2wd", transponder: "3" }, + ]; + const event = { classId: "2wd", raceConfig: { driverIds: ["a", "b", "h"] }, houseOfRc: { eventId: 1, classId: 555, entryIds: { a: 11, b: 12 } } }; + const entries = [ + { entryId: 11, classId: 555, houseOfRcId: 5, name: "Anna", transponders: ["1"] }, + { entryId: 14, classId: 555, houseOfRcId: 8, name: "Late Larsson", transponders: ["9"], car: "Mugen" }, + { entryId: 15, classId: 556, houseOfRcId: 9, name: "Other Class", transponders: [] }, + ]; + const diff = diffHouseOfRcEntries(event, entries, drivers); + assert.deepEqual(diff.added.map((row) => row.entry.name), ["Late Larsson"], "only new entries of the race's class"); + assert.deepEqual(diff.withdrawn.map((driver) => driver.id), ["b"], "Bo's entry is gone; the hand-added driver is not offered"); + const ids = applyHouseOfRcEntryChanges(event, drivers, diff, { addIndexes: new Set([0]), removeIds: new Set(["b"]), makeDriver: (fields) => ({ id: "late", ...fields }) }); + assert.deepEqual(ids, ["a", "h", "late"]); + assert.deepEqual(event.houseOfRc.entryIds, { a: 11, late: 14 }); + assert.equal(drivers.find((driver) => driver.id === "late").transponder, "9"); + assert.deepEqual(diffHouseOfRcEntries({ ...event, raceConfig: { driverIds: ids } }, entries, drivers), { added: [], withdrawn: [] }, "fetching again finds nothing new"); });