feat(houseofrc): fetch driver names and brands by transponder (1.79.0)
This commit is contained in:
1 parent
0c54e8b58a
commit
3829ca1cab
17 files changed
+319
-7
No files matched your search
+24
@@ -2184,6 +2184,17 @@ const TRANSLATIONS = {
|
||||
"tts.download": "Hämta",
|
||||
"tts.downloading": "Hämtar...",
|
||||
"tts.test_failed": "Kunde inte spela upp den lokala rösten - kontrollera installationen.",
|
||||
"houseofrc.import_button": "Hämta från House of RC",
|
||||
"houseofrc.import_button_hint": "Slå upp alla transpondrar på House of RC och fyll i namn och märke",
|
||||
"houseofrc.import_title": "Förare från House of RC",
|
||||
"houseofrc.import_loading": "Slår upp transpondrar…",
|
||||
"houseofrc.import_no_transponders": "Inga förare har transponder ännu.",
|
||||
"houseofrc.import_summary": "{found} av {asked} transpondrar finns på House of RC.",
|
||||
"houseofrc.import_nothing": "Allt stämmer redan, inget att uppdatera.",
|
||||
"houseofrc.import_hint": "Bocka i det som ska ändras. Bara tomma fält är förvalda, inget skrivs över utan att du väljer det.",
|
||||
"houseofrc.import_model": "Bil",
|
||||
"houseofrc.import_apply": "Uppdatera valda",
|
||||
"houseofrc.filled_from": "Ifyllt från House of RC ({model})",
|
||||
"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",
|
||||
@@ -4354,6 +4365,17 @@ const TRANSLATIONS = {
|
||||
"tts.download": "Download",
|
||||
"tts.downloading": "Downloading...",
|
||||
"tts.test_failed": "Could not play the local voice - check the installation.",
|
||||
"houseofrc.import_button": "Fetch from House of RC",
|
||||
"houseofrc.import_button_hint": "Look up every transponder on House of RC and fill in names and brands",
|
||||
"houseofrc.import_title": "Drivers from House of RC",
|
||||
"houseofrc.import_loading": "Looking up transponders…",
|
||||
"houseofrc.import_no_transponders": "No driver has a transponder yet.",
|
||||
"houseofrc.import_summary": "{found} of {asked} transponders are on House of RC.",
|
||||
"houseofrc.import_nothing": "Everything already matches, nothing to update.",
|
||||
"houseofrc.import_hint": "Tick what to change. Only empty fields are pre-ticked; nothing is overwritten unless you choose it.",
|
||||
"houseofrc.import_model": "Car",
|
||||
"houseofrc.import_apply": "Update selected",
|
||||
"houseofrc.filled_from": "Filled in from House of RC ({model})",
|
||||
"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",
|
||||
@@ -5640,6 +5662,8 @@ function normalizeDriver(driver = {}) {
|
||||
club: String(driver?.club || "").trim(),
|
||||
country: String(driver?.country || "").trim(),
|
||||
passSound: String(driver?.passSound || "").trim(),
|
||||
// House of RC member id, set when the transponder lookup matched this driver.
|
||||
...(driver?.houseOfRcId ? { houseOfRcId: String(driver.houseOfRcId) } : {}),
|
||||
// Sponsor event guest: only shown inside that event, deleted with it.
|
||||
...(driver?.guestEventId ? { guestEventId: String(driver.guestEventId) } : {}),
|
||||
};
|
||||
|
||||
+20
-1
@@ -1,6 +1,7 @@
|
||||
import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict } from "./driver_profile_logic.js";
|
||||
import { isPracticeSessionType } from "./track_layouts_logic.js";
|
||||
import { renderTrackLayoutBar, bindTrackLayoutBar } from "./track_layout_bar.js";
|
||||
import { openHouseOfRcDriverImport, lookupHouseOfRcTransponders } from "./houseofrc_view.js";
|
||||
|
||||
function getScheduleDriftSummary(state) {
|
||||
const scheduledSessions = state.sessions
|
||||
@@ -438,7 +439,7 @@ export function renderDriversView(deps) {
|
||||
</section>
|
||||
|
||||
<section class="panel">
|
||||
<div class="panel-header"><h3>${t("drivers.title")}</h3></div>
|
||||
<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>
|
||||
@@ -553,6 +554,22 @@ export function renderDriversView(deps) {
|
||||
renderView();
|
||||
});
|
||||
|
||||
document.getElementById("driversHouseOfRc")?.addEventListener("click", () => openHouseOfRcDriverImport({ state, t, escapeHtml, saveState, renderView }));
|
||||
// New driver: a known transponder fills in an empty name and brand from House of RC.
|
||||
const newDriverForm = document.getElementById("driverForm");
|
||||
newDriverForm?.elements.namedItem("transponder")?.addEventListener("change", async (event) => {
|
||||
const transponder = String(event.target.value || "").trim();
|
||||
const nameInput = newDriverForm.elements.namedItem("name");
|
||||
const brandInput = newDriverForm.elements.namedItem("brand");
|
||||
if (!transponder || nameInput.value.trim()) return;
|
||||
const result = await lookupHouseOfRcTransponders([transponder]);
|
||||
const member = result.ok ? result.members[transponder] : null;
|
||||
if (!member || nameInput.value.trim() || event.target.value.trim() !== transponder) return;
|
||||
nameInput.value = member.name;
|
||||
if (!brandInput.value.trim() && member.brand) brandInput.value = member.brand;
|
||||
nameInput.title = t("houseofrc.filled_from", { model: [member.brand, member.model].filter(Boolean).join(" ") || "House of RC" });
|
||||
});
|
||||
|
||||
// Hear the spoken name as race audio will say it, before saving: the form's current
|
||||
// spoken name (or name) and passing sound.
|
||||
dom.view.querySelectorAll("[data-driver-voice-test]").forEach((button) => button.addEventListener("click", () => {
|
||||
@@ -690,6 +707,8 @@ export function renderDriversView(deps) {
|
||||
speechName: cleanedSpeechName,
|
||||
passSound: cleanedPassSound,
|
||||
profileId: cleanedProfileId,
|
||||
// A new transponder may belong to someone else on House of RC.
|
||||
houseOfRcId: cleanedTp === item.transponder ? item.houseOfRcId : "",
|
||||
club: cleanedClub,
|
||||
country: cleanedCountry,
|
||||
});
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
// House of RC driver lookup: compare our drivers with the members owning their transponders
|
||||
// and apply only what the user ticked. Nothing is overwritten by default: a field is pre-ticked
|
||||
// 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, " ");
|
||||
|
||||
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);
|
||||
return {
|
||||
driverId: driver.id,
|
||||
transponder: driver.transponder,
|
||||
currentName: driver.name || "",
|
||||
currentBrand: driver.brand || "",
|
||||
member,
|
||||
nameDiffers,
|
||||
brandDiffers,
|
||||
nameDefault: nameDiffers && (!driver.name || sameText(driver.name, driver.transponder)),
|
||||
brandDefault: brandDiffers && !driver.brand,
|
||||
linked: String(driver.houseOfRcId || "") === String(member.id ?? ""),
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
// choices: { [driverId]: { name: bool, brand: bool } }. Links the driver to the member
|
||||
// (houseOfRcId, for posting results later) when the names agree after the update.
|
||||
export function applyHouseOfRcDriverUpdates(drivers = [], members = {}, choices = {}) {
|
||||
let changed = 0;
|
||||
drivers.forEach((driver) => {
|
||||
const member = driver.transponder ? members[driver.transponder] : null;
|
||||
if (!member || driver.guestEventId) return;
|
||||
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 (member.id != null && sameText(driver.name, member.name)) driver.houseOfRcId = String(member.id);
|
||||
if (JSON.stringify(driver) !== before) changed += 1;
|
||||
});
|
||||
return changed;
|
||||
}
|
||||
@@ -1,3 +1,5 @@
|
||||
import { planHouseOfRcDriverUpdates, applyHouseOfRcDriverUpdates } 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).
|
||||
async function postJson(path, body) {
|
||||
@@ -75,3 +77,76 @@ export async function mountHouseOfRcSettings(container, { t, escapeHtml }) {
|
||||
remount();
|
||||
});
|
||||
}
|
||||
|
||||
// Ask the server (which holds the key) who owns these transponders on House of RC.
|
||||
export async function lookupHouseOfRcTransponders(transponders) {
|
||||
const { status: code, body } = await postJson("/api/houseofrc/transponders", { transponders });
|
||||
return code === 200 && body.ok ? { ok: true, members: body.members || {}, asked: body.asked || 0 } : { ok: false, code, body };
|
||||
}
|
||||
|
||||
// Drivers → "Fetch from House of RC": one lookup for every transponder, then a list of what
|
||||
// differs. Only fields that are empty on our side are pre-ticked; nothing changes until Apply.
|
||||
export async function openHouseOfRcDriverImport({ state, t, escapeHtml, saveState, renderView }) {
|
||||
document.getElementById("houseOfRcImportOverlay")?.remove();
|
||||
const overlay = document.createElement("div");
|
||||
overlay.className = "modal-overlay";
|
||||
overlay.id = "houseOfRcImportOverlay";
|
||||
overlay.innerHTML = `<div class="modal-card hor-import"><div class="panel-header"><h3>🏠 ${escapeHtml(t("houseofrc.import_title"))}</h3><button class="btn" type="button" data-hor-close>${escapeHtml(t("common.cancel"))}</button></div><div class="panel-body" data-hor-body><p class="hint">${escapeHtml(t("houseofrc.import_loading"))}</p></div></div>`;
|
||||
document.body.append(overlay);
|
||||
const close = () => { overlay.remove(); document.removeEventListener("keydown", onKey); };
|
||||
const onKey = (event) => { if (event.key === "Escape") close(); };
|
||||
document.addEventListener("keydown", onKey);
|
||||
overlay.addEventListener("click", (event) => { if (event.target === overlay || event.target.closest("[data-hor-close]")) close(); });
|
||||
const body = overlay.querySelector("[data-hor-body]");
|
||||
|
||||
const transponders = state.drivers.filter((driver) => !driver.guestEventId && driver.transponder).map((driver) => driver.transponder);
|
||||
if (!transponders.length) {
|
||||
body.innerHTML = `<p>${escapeHtml(t("houseofrc.import_no_transponders"))}</p>`;
|
||||
return;
|
||||
}
|
||||
const result = await lookupHouseOfRcTransponders(transponders);
|
||||
if (!overlay.isConnected) return;
|
||||
if (!result.ok) {
|
||||
body.innerHTML = `<p class="error">${escapeHtml(describeHouseOfRcError(t, result.code, result.body))}</p>`;
|
||||
return;
|
||||
}
|
||||
const plan = planHouseOfRcDriverUpdates(state.drivers, result.members);
|
||||
const found = Object.keys(result.members).length;
|
||||
const summary = t("houseofrc.import_summary", { found, asked: result.asked });
|
||||
const changes = plan.filter((row) => row.nameDiffers || row.brandDiffers || !row.linked);
|
||||
if (!changes.length) {
|
||||
body.innerHTML = `<p>${escapeHtml(summary)}</p><p>${escapeHtml(t("houseofrc.import_nothing"))}</p>`;
|
||||
return;
|
||||
}
|
||||
const cell = (row, field, current, incoming) => (row[`${field}Differs`]
|
||||
? `<label class="hor-choice"><input type="checkbox" data-hor-field="${field}" data-hor-driver="${escapeHtml(row.driverId)}" ${row[`${field}Default`] ? "checked" : ""} /> <span><s>${escapeHtml(current || "–")}</s> → <strong>${escapeHtml(incoming)}</strong></span></label>`
|
||||
: `<span class="hint">${escapeHtml(current || incoming || "–")}</span>`);
|
||||
body.innerHTML = `
|
||||
<p>${escapeHtml(summary)}</p>
|
||||
<p class="hint">${escapeHtml(t("houseofrc.import_hint"))}</p>
|
||||
<div class="table-wrap"><table class="hor-import-table">
|
||||
<thead><tr><th>${escapeHtml(t("table.transponder"))}</th><th>${escapeHtml(t("table.name"))}</th><th>${escapeHtml(t("table.brand"))}</th><th>${escapeHtml(t("houseofrc.import_model"))}</th></tr></thead>
|
||||
<tbody>${changes.map((row) => `<tr>
|
||||
<td>${escapeHtml(row.transponder)}</td>
|
||||
<td>${cell(row, "name", row.currentName, row.member.name)}</td>
|
||||
<td>${cell(row, "brand", row.currentBrand, row.member.brand)}</td>
|
||||
<td>${escapeHtml(row.member.model || "–")}</td>
|
||||
</tr>`).join("")}</tbody>
|
||||
</table></div>
|
||||
<div class="actions mt-16">
|
||||
<button class="btn btn-primary" type="button" data-hor-apply>${escapeHtml(t("houseofrc.import_apply"))}</button>
|
||||
<button class="btn" type="button" data-hor-close>${escapeHtml(t("common.cancel"))}</button>
|
||||
</div>`;
|
||||
body.querySelector("[data-hor-apply]").addEventListener("click", () => {
|
||||
const choices = {};
|
||||
body.querySelectorAll("[data-hor-field]").forEach((box) => {
|
||||
choices[box.dataset.horDriver] = { ...choices[box.dataset.horDriver], [box.dataset.horField]: box.checked };
|
||||
});
|
||||
const changed = applyHouseOfRcDriverUpdates(state.drivers, result.members, choices);
|
||||
close();
|
||||
if (changed) {
|
||||
saveState();
|
||||
renderView();
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -4941,3 +4941,9 @@ tr:has(> td > .medal-3) { background: linear-gradient(90deg, rgba(205, 127, 60,
|
||||
.controller-badge { background: color-mix(in srgb, var(--accent) 22%, var(--panel)); color: var(--text); }
|
||||
.controller-badge[hidden] { display: none; }
|
||||
.controller-banner.is-master { border-color: #2fa84f; background: color-mix(in srgb, #2fa84f 14%, var(--panel)); }
|
||||
|
||||
/* House of RC driver import */
|
||||
.hor-import { width: min(900px, 100%); }
|
||||
.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; }
|
||||
Reference in new issue
Block a user