feat(houseofrc): create a race from a House of RC event and its entries (1.80.0)

This commit is contained in:
larssand committed 2026-11-08 11:52:57 +01:00
1 parent 42df6a786f
commit 9c1f5713e6
18 files changed
+444 -21

No files matched your search

+49
View File
@@ -2196,6 +2196,30 @@ const TRANSLATIONS = {
"houseofrc.import_model": "Bil",
"houseofrc.import_apply": "Uppdatera valda",
"houseofrc.filled_from": "Ifyllt från House of RC ({model})",
"houseofrc.event_button": "Hämta från House of RC",
"houseofrc.event_button_hint": "Välj en tävling på House of RC och fyll i guiden med dess anmälda förare",
"houseofrc.event_title": "Tävling från House of RC",
"houseofrc.event_from": "Från",
"houseofrc.event_to": "Till",
"houseofrc.event_country": "Land",
"houseofrc.event_search": "Sök",
"houseofrc.event_link_placeholder": "…eller klistra in länk/ID, t.ex. https://houseofrc.com/events/2251",
"houseofrc.event_open": "Öppna",
"houseofrc.event_loading": "Hämtar tävlingar…",
"houseofrc.event_none": "Inga tävlingar i den perioden.",
"houseofrc.event_back": "Tävlingar",
"houseofrc.entries_loading": "Hämtar anmälda förare…",
"houseofrc.entries_not_found": "House of RC har inga anmälningar för den här tävlingen (404). Tar klubben anmälan någon annanstans, t.ex. MyRCM?",
"houseofrc.entries_empty": "Inga anmälda förare än.",
"houseofrc.entries_class": "Klass hos oss",
"houseofrc.entries_class_hint": "House of RC skickar inte klassen än: välj vilken klass de här förarna kör. Hämta igen för nästa klass.",
"houseofrc.entries_all": "Alla",
"houseofrc.entries_hint": "Befintliga förare återanvänds (med transponder). Nya förare skapas utan transponder – fyll i den under Förare eller i Deltagare.",
"houseofrc.entries_apply": "Fyll i Race-guiden",
"houseofrc.entry_linked": "Finns",
"houseofrc.entry_name": "Finns (samma namn)",
"houseofrc.entry_copy": "Finns i annan klass",
"houseofrc.entry_new": "Ny förare",
"houseofrc.title": "House of RC",
"houseofrc.hint": "Klubbens API-nyckel från House of RC. Den sparas bara på servern (data/houseofrc.json) och visas aldrig igen, inte ens här.",
"houseofrc.key": "API-nyckel",
@@ -4378,6 +4402,30 @@ const TRANSLATIONS = {
"houseofrc.import_model": "Car",
"houseofrc.import_apply": "Update selected",
"houseofrc.filled_from": "Filled in from House of RC ({model})",
"houseofrc.event_button": "Fetch from House of RC",
"houseofrc.event_button_hint": "Pick an event on House of RC and fill the wizard with its entered drivers",
"houseofrc.event_title": "Event from House of RC",
"houseofrc.event_from": "From",
"houseofrc.event_to": "To",
"houseofrc.event_country": "Country",
"houseofrc.event_search": "Search",
"houseofrc.event_link_placeholder": "…or paste a link/ID, e.g. https://houseofrc.com/events/2251",
"houseofrc.event_open": "Open",
"houseofrc.event_loading": "Fetching events…",
"houseofrc.event_none": "No events in that period.",
"houseofrc.event_back": "Events",
"houseofrc.entries_loading": "Fetching entered drivers…",
"houseofrc.entries_not_found": "House of RC has no entries for this event (404). Does the club take entries elsewhere, e.g. MyRCM?",
"houseofrc.entries_empty": "No drivers entered yet.",
"houseofrc.entries_class": "Our class",
"houseofrc.entries_class_hint": "House of RC doesn't send the class yet: choose which class these drivers race. Fetch again for the next class.",
"houseofrc.entries_all": "All",
"houseofrc.entries_hint": "Existing drivers are reused (with their transponder). New drivers are created without a transponder – fill it in under Drivers or Participants.",
"houseofrc.entries_apply": "Fill the race wizard",
"houseofrc.entry_linked": "Exists",
"houseofrc.entry_name": "Exists (same name)",
"houseofrc.entry_copy": "Exists in another class",
"houseofrc.entry_new": "New driver",
"houseofrc.title": "House of RC",
"houseofrc.hint": "The club's House of RC API key. It is stored on the server only (data/houseofrc.json) and never shown again, not even here.",
"houseofrc.key": "API key",
@@ -7369,6 +7417,7 @@ function renderEventWorkspace(mode) {
renderEventManager,
uid,
normalizeEvent,
normalizeDriver,
applyRaceFormatPreset,
buildOpenPracticeBundle,
buildRaceSessionsFromWizard,
+1 -1
View File
@@ -123,7 +123,7 @@ export function renderEventWorkspaceMarkup(mode, deps) {
}
<section class="panel">
<div class="panel-header"><h3>${t(isRaceMode ? "events.create_competition_race" : "events.create")}</h3></div>
<div class="panel-header"><h3>${t(isRaceMode ? "events.create_competition_race" : "events.create")}</h3>${isRaceMode ? `<button class="btn" id="raceWizardHouseOfRc" type="button" title="${escapeHtml(t("houseofrc.event_button_hint"))}">🏠 ${t("houseofrc.event_button")}</button>` : ""}</div>
<div class="panel-body">
<p>${t(isRaceMode ? "events.race_only_intro" : "events.track_only_intro")}</p>
${isRaceMode ? `<p class="hint">${t("events.wizard_hint")}</p>` : ""}
+21
View File
@@ -1,3 +1,4 @@
import { openHouseOfRcEventImport } from "./houseofrc_view.js";
import { renderEventWorkspaceMarkup } from "./event_views.js";
// The folded "Done" races remember whether they were opened (per browser only).
@@ -41,6 +42,7 @@ export function renderEventWorkspaceView(context) {
renderEventManager,
uid,
normalizeEvent,
normalizeDriver,
applyRaceFormatPreset,
buildOpenPracticeBundle,
buildRaceSessionsFromWizard,
@@ -245,6 +247,23 @@ export function renderEventWorkspaceView(context) {
renderView();
});
document.getElementById("raceWizardHouseOfRc")?.addEventListener("click", () => openHouseOfRcEventImport({
state, t, escapeHtml, uid, saveState,
makeDriver: (fields) => normalizeDriver({ id: uid("driver"), ...fields }),
onImported: ({ event, classId, driverIds }) => {
const draft = getRaceWizardDraft();
Object.assign(draft, {
name: draft.name.trim() || event.name,
date: String(event.start || "").slice(0, 10) || draft.date,
classId,
driverIds,
houseOfRc: { eventId: event.id, name: event.name, url: event.url },
});
setRaceWizardStep(2);
renderView();
},
}));
document.getElementById("raceWizardCreate")?.addEventListener("click", () => {
const draft = getRaceWizardDraft();
const selectedDrivers = draft.driverIds.length ? draft.driverIds : getDriversForClass(draft.classId).map((driver) => driver.id);
@@ -254,6 +273,8 @@ export function renderEventWorkspaceView(context) {
date: draft.date,
classId: draft.classId,
mode,
// Filled by "Fetch from House of RC": where the results go back to later.
...(draft.houseOfRc ? { houseOfRc: draft.houseOfRc } : {}),
});
applyRaceFormatPreset(event, draft.presetId);
event.raceConfig.driverIds = selectedDrivers;
+65 -5
View File
@@ -3,22 +3,29 @@
// only when ours is empty (a name that is just the transponder number counts as empty).
const sameText = (a, b) => String(a || "").trim().toLocaleLowerCase().replace(/\s+/g, " ") === String(b || "").trim().toLocaleLowerCase().replace(/\s+/g, " ");
// The make: House of RC often has it only inside the model name ("Xray XB4 2025").
const memberBrand = (member) => member.brand || member.model || "";
const isPlaceholderName = (driver) => !driver.name || sameText(driver.name, driver.transponder);
export function planHouseOfRcDriverUpdates(drivers = [], members = {}) {
return drivers
.filter((driver) => !driver.guestEventId && driver.transponder && members[driver.transponder])
.map((driver) => {
const member = members[driver.transponder];
const nameDiffers = Boolean(member.name) && !sameText(member.name, driver.name);
const brandDiffers = Boolean(member.brand) && !sameText(member.brand, driver.brand);
const brand = memberBrand(member);
// Any difference counts, also only upper/lower case ("anders larsson").
const nameDiffers = Boolean(member.name) && member.name.trim() !== String(driver.name || "").trim();
const brandDiffers = Boolean(brand) && !sameText(brand, driver.brand);
return {
driverId: driver.id,
transponder: driver.transponder,
currentName: driver.name || "",
currentBrand: driver.brand || "",
member,
member: { ...member, brand },
nameDiffers,
brandDiffers,
nameDefault: nameDiffers && (!driver.name || sameText(driver.name, driver.transponder)),
// Pre-ticked: empty, just the transponder number, or the same name in other letters.
nameDefault: nameDiffers && (isPlaceholderName(driver) || sameText(driver.name, member.name)),
brandDefault: brandDiffers && !driver.brand,
linked: String(driver.houseOfRcId || "") === String(member.id ?? ""),
};
@@ -35,9 +42,62 @@ export function applyHouseOfRcDriverUpdates(drivers = [], members = {}, choices
const choice = choices[driver.id] || {};
const before = JSON.stringify(driver);
if (choice.name && member.name) driver.name = member.name;
if (choice.brand && member.brand) driver.brand = member.brand;
if (choice.brand && memberBrand(member)) driver.brand = memberBrand(member);
if (member.id != null && sameText(driver.name, member.name)) driver.houseOfRcId = String(member.id);
if (JSON.stringify(driver) !== before) changed += 1;
});
return changed;
}
// Entries of a House of RC event against our register, for one of our classes:
// linked - already a driver in that class with this House of RC id
// name - a driver in that class with the same name (gets linked)
// copy - the person exists in another class: a new driver in this class, same profile
// new - unknown: a new driver (transponder to fill in)
export function planHouseOfRcEntries(entries = [], drivers = [], classId = "") {
const club = drivers.filter((driver) => !driver.guestEventId);
const sameMember = (entry) => (driver) => entry.houseOfRcId != null && String(driver.houseOfRcId || "") === String(entry.houseOfRcId);
const sameName = (entry) => (driver) => sameText(driver.name, entry.name);
return entries.map((entry) => {
const inClass = club.filter((driver) => driver.classId === classId);
const linked = inClass.find(sameMember(entry));
if (linked) return { entry, status: "linked", driverId: linked.id, transponder: linked.transponder };
const named = inClass.find(sameName(entry));
if (named) return { entry, status: "name", driverId: named.id, transponder: named.transponder };
const source = club.find(sameMember(entry)) || club.find(sameName(entry));
if (source) return { entry, status: "copy", sourceId: source.id, transponder: source.transponder };
return { entry, status: "new", transponder: "" };
});
}
// Creates/links the ticked entries and returns their driver ids in House of RC order.
// makeDriver(fields) must return a normalized driver with a fresh id.
export function applyHouseOfRcEntries(drivers, plan, { classId, selected, makeDriver }) {
const ids = [];
plan.forEach((row, index) => {
if (!selected.has(index)) return;
const { entry } = row;
const memberId = entry.houseOfRcId != null ? String(entry.houseOfRcId) : "";
if (row.driverId) {
const driver = drivers.find((item) => item.id === row.driverId);
if (driver && memberId) driver.houseOfRcId = memberId;
if (driver) ids.push(driver.id);
return;
}
const source = row.sourceId ? drivers.find((item) => item.id === row.sourceId) : null;
const driver = makeDriver({
name: source?.name || entry.name,
classId,
transponder: source?.transponder || "",
brand: entry.car || source?.brand || "",
club: entry.club || source?.club || "",
country: source?.country || "",
speechName: source?.speechName || "",
profileId: source?.profileId || "",
houseOfRcId: memberId,
});
drivers.push(driver);
ids.push(driver.id);
});
return ids;
}
+115 -1
View File
@@ -1,4 +1,4 @@
import { planHouseOfRcDriverUpdates, applyHouseOfRcDriverUpdates } from "./houseofrc_logic.js";
import { planHouseOfRcDriverUpdates, applyHouseOfRcDriverUpdates, planHouseOfRcEntries, applyHouseOfRcEntries } 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).
@@ -150,3 +150,117 @@ export async function openHouseOfRcDriverImport({ state, t, escapeHtml, saveStat
}
});
}
function openHorModal({ id, title, escapeHtml, wide = true }) {
document.getElementById(id)?.remove();
const overlay = document.createElement("div");
overlay.className = "modal-overlay";
overlay.id = id;
overlay.innerHTML = `<div class="modal-card ${wide ? "hor-import" : ""}"><div class="panel-header"><h3>🏠 ${escapeHtml(title)}</h3><button class="btn" type="button" data-hor-close>✕</button></div><div class="panel-body" data-hor-body></div></div>`;
document.body.append(overlay);
const onKey = (event) => { if (event.key === "Escape") close(); };
const close = () => { overlay.remove(); document.removeEventListener("keydown", onKey); };
document.addEventListener("keydown", onKey);
overlay.addEventListener("click", (event) => { if (event.target === overlay || event.target.closest("[data-hor-close]")) close(); });
return { overlay, body: overlay.querySelector("[data-hor-body]"), close };
}
// Race wizard → "Fetch from House of RC": pick an event, then one of our classes and the
// entered drivers; fills the wizard (name, date, class, participants) and links the event.
export function openHouseOfRcEventImport({ state, t, escapeHtml, saveState, makeDriver, onImported }) {
const { overlay, body, close } = openHorModal({ id: "houseOfRcEventOverlay", title: t("houseofrc.event_title"), escapeHtml });
const day = (offset) => new Date(Date.now() + offset * 864e5).toISOString().slice(0, 10);
const fmtDate = (iso) => (iso ? new Date(iso).toLocaleDateString(undefined, { weekday: "short", day: "numeric", month: "short" }) : "");
const error = (code, data) => `<p class="error">${escapeHtml(describeHouseOfRcError(t, code, data))}</p>`;
const showEvents = async (filters = { from: day(0), to: day(60), country: "SE" }) => {
body.innerHTML = `
<form class="form-grid cols-4" data-hor-filter>
<label>${escapeHtml(t("houseofrc.event_from"))}<input type="date" name="from" value="${escapeHtml(filters.from)}" /></label>
<label>${escapeHtml(t("houseofrc.event_to"))}<input type="date" name="to" value="${escapeHtml(filters.to)}" /></label>
<label>${escapeHtml(t("houseofrc.event_country"))}<input name="country" maxlength="2" value="${escapeHtml(filters.country)}" placeholder="SE" /></label>
<div class="actions-inline align-end"><button class="btn" type="submit">${escapeHtml(t("houseofrc.event_search"))}</button></div>
</form>
<form class="hor-link-row mt-16" data-hor-link>
<input name="link" placeholder="${escapeHtml(t("houseofrc.event_link_placeholder"))}" />
<button class="btn btn-primary" type="submit">${escapeHtml(t("houseofrc.event_open"))}</button>
</form>
<div class="mt-16" data-hor-list><p class="hint">${escapeHtml(t("houseofrc.event_loading"))}</p></div>`;
body.querySelector("[data-hor-filter]").addEventListener("submit", (event) => {
event.preventDefault();
const form = new FormData(event.currentTarget);
showEvents({ from: String(form.get("from") || day(0)), to: String(form.get("to") || day(60)), country: String(form.get("country") || "").trim().toUpperCase() });
});
body.querySelector("[data-hor-link]").addEventListener("submit", (event) => {
event.preventDefault();
const link = String(new FormData(event.currentTarget).get("link") || "").trim();
if (link) showEntries(link);
});
const list = body.querySelector("[data-hor-list]");
const { status: code, body: data } = await postJson("/api/houseofrc/events", { from: `${filters.from}T00:00:00Z`, to: `${filters.to}T23:59:59Z`, country: filters.country });
if (!overlay.isConnected || !list.isConnected) return;
if (code !== 200 || !data.ok) { list.innerHTML = error(code, data); return; }
const events = (data.events || []).filter((event) => event.status !== "cancelled");
list.innerHTML = events.length
? `<div class="hor-event-list">${events.map((event) => `
<button type="button" class="hor-event" data-hor-event="${escapeHtml(String(event.id))}">
<strong>${escapeHtml(event.name)}</strong>
<small>${escapeHtml([fmtDate(event.start), event.city].filter(Boolean).join(" · "))}</small>
</button>`).join("")}</div>`
: `<p class="hint">${escapeHtml(t("houseofrc.event_none"))}</p>`;
list.querySelectorAll("[data-hor-event]").forEach((button) => button.addEventListener("click", () => showEntries(button.dataset.horEvent)));
};
const showEntries = async (eventRef) => {
body.innerHTML = `<p class="hint">${escapeHtml(t("houseofrc.entries_loading"))}</p>`;
const { status: code, body: data } = await postJson("/api/houseofrc/entries", { eventId: eventRef });
if (!overlay.isConnected) return;
const back = `<button class="btn" type="button" data-hor-back>← ${escapeHtml(t("houseofrc.event_back"))}</button>`;
const bindBack = () => body.querySelector("[data-hor-back]")?.addEventListener("click", () => showEvents());
if (code !== 200 || !data.ok) {
body.innerHTML = (code === 502 && data.status === 404 ? `<p class="error">${escapeHtml(t("houseofrc.entries_not_found"))}</p>` : error(code, data)) + back;
bindBack();
return;
}
const { event, entries } = data;
let classId = state.classes[0]?.id || "";
const render = () => {
const plan = planHouseOfRcEntries(entries, state.drivers, classId);
const statusText = (row) => t(`houseofrc.entry_${row.status}`);
body.innerHTML = `
<p><strong>${escapeHtml(event.name)}</strong> · ${escapeHtml([fmtDate(event.start), event.city].filter(Boolean).join(" · "))}${event.url ? ` · <a href="${escapeHtml(event.url)}" target="_blank" rel="noopener">House of RC ↗</a>` : ""}</p>
${entries.length ? `
<label>${escapeHtml(t("houseofrc.entries_class"))}
<select data-hor-class>${state.classes.map((item) => `<option value="${escapeHtml(item.id)}" ${item.id === classId ? "selected" : ""}>${escapeHtml(item.name)}</option>`).join("")}</select>
<small>${escapeHtml(t("houseofrc.entries_class_hint"))}</small>
</label>
<div class="table-wrap mt-16"><table class="hor-import-table">
<thead><tr><th><input type="checkbox" data-hor-all checked aria-label="${escapeHtml(t("houseofrc.entries_all"))}" /></th><th>${escapeHtml(t("table.name"))}</th><th>${escapeHtml(t("drivers.club"))}</th><th>${escapeHtml(t("houseofrc.import_model"))}</th><th>${escapeHtml(t("table.transponder"))}</th><th></th></tr></thead>
<tbody>${plan.map((row, index) => `<tr>
<td><input type="checkbox" data-hor-entry="${index}" checked /></td>
<td>${escapeHtml(row.entry.name)}${row.entry.number != null ? ` <small>#${escapeHtml(String(row.entry.number))}</small>` : ""}</td>
<td>${escapeHtml(row.entry.club || "–")}</td>
<td>${escapeHtml(row.entry.car || "–")}</td>
<td>${escapeHtml(row.transponder || "–")}</td>
<td><span class="pill ${row.status === "new" ? "pill-warn" : "pill-green"}">${escapeHtml(statusText(row))}</span></td>
</tr>`).join("")}</tbody>
</table></div>
<p class="hint">${escapeHtml(t("houseofrc.entries_hint"))}</p>
<div class="actions mt-16">${back}<button class="btn btn-primary" type="button" data-hor-apply>${escapeHtml(t("houseofrc.entries_apply"))}</button></div>`
: `<p>${escapeHtml(t("houseofrc.entries_empty"))}</p>${back}`}`;
bindBack();
body.querySelector("[data-hor-class]")?.addEventListener("change", (change) => { classId = change.target.value; 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", () => {
const selected = new Set([...body.querySelectorAll("[data-hor-entry]:checked")].map((box) => Number(box.dataset.horEntry)));
const driverIds = applyHouseOfRcEntries(state.drivers, plan, { classId, selected, makeDriver });
saveState();
close();
onImported({ event, classId, driverIds });
});
};
render();
};
showEvents();
}
+6
View File
@@ -4947,3 +4947,9 @@ tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60,
.hor-import-table td { vertical-align: middle; }
.hor-choice { display: inline-flex; align-items: center; gap: 6px; cursor: pointer; }
.hor-choice s { opacity: 0.6; }
.hor-link-row { display: flex; gap: 8px; }
.hor-link-row input { flex: 1; min-width: 0; }
.hor-event-list { display: grid; gap: 6px; max-height: 50vh; overflow: auto; }
.hor-event { display: flex; flex-direction: column; align-items: flex-start; gap: 2px; text-align: left; padding: 10px 12px; border: 1px solid var(--line); border-radius: 10px; background: transparent; color: inherit; cursor: pointer; }
.hor-event:hover, .hor-event:focus-visible { border-color: var(--accent); }
.hor-event small { opacity: 0.75; }