diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bcf8b3..0338ab7 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.89.29 - 2026-11-14 + +### Added + +- **Optional check-in** in Manage race → Check-in: present and paid per driver, the transponder seen on the decoder today, search and a count, a printable list, and **Remove no-shows** (before qualifying starts; drivers stay in the register). Without a check-in everyone counts as present, as before. + ## 1.89.28 - 2026-11-14 ### Added diff --git a/README.md b/README.md index 0a4cfd2..4f43c84 100644 --- a/README.md +++ b/README.md @@ -135,6 +135,7 @@ The menu follows how a race day works: **Start** (Dashboard, Race Day), **Create - **Flying start** (default for qualifying): the signal and "Clock is running". Each car's clock starts at its own first crossing, and a late car's clock starts at the latest 150 % of a lap (EFRA 9.3). - **Staggered start:** cars are called out one by one. - **Transponder check:** every driver in the heat gets a green tick when their transponder crosses during the count-down. A missing driver's transponder can be changed in the panel, or linked to an unknown transponder that just crossed. +- **Check-in (optional):** Manage race → **Check-in** ticks ✓ Present and 💰 Paid per driver, with search and a count ("12 of 15 checked in"). 📡 turns green once the driver's transponder has crossed the decoder today (on the computer running the decoder). **Remove no-shows** takes drivers not checked in out of the race and heats not yet run, after asking and only before qualifying starts; they stay in the drivers' register. **Print list** gives a sheet to tick off at the gate. Without a check-in everyone counts as present and nothing else in the race changes. - **Decoder alarm:** when the decoder disconnects during a heat (or its count-down), a red banner shows at the top of every page, "Decoder disconnected at 12:03 – laps are not being recorded", with **Reconnect** and **Silence**, and a warning sounds every 30 s. In qualifying, heats and finals it also alarms when the decoder is connected but no passing has come for 30 s (or three of the fastest laps), for example when the decoder box or loop has stopped working. Practice only alarms on a dropped link. When the decoder works again, the banner shows for 10 s how long timing was down, so the laps can be checked in Judging. It runs on the Race Controller Master computer and can be turned off under Settings → Audio → **Decoder alarm during heats**. - **Pause, resume and finish** work during the heat. Follow-up time lets the last lap finish after the clock. diff --git a/README.sv.md b/README.sv.md index 1614c3d..e858d46 100644 --- a/README.sv.md +++ b/README.sv.md @@ -148,6 +148,7 @@ Gränssnittet finns på svenska och engelska. - **Flygande start** (standard för kval): signalen och "Klockan går". Varje bils tid startar vid dess första passering, och en sen bil får klockan startad senast efter 150 % av ett varv (EFRA 9.3). - **Staggered start:** bilarna ropas ut en och en. - **Transponderkontroll:** varje förare i heatet får en grön bock när transpondern passerar under nedräkningen. Saknas någon kan transpondern bytas direkt i panelen, eller kopplas till en okänd transponder som just passerat. +- **Incheckning (frivilligt):** Hantera racet → **Incheckning** bockar av ✓ Närvarande och 💰 Betalt per förare, med sökning och räknare ("12 av 15 incheckade"). 📡 blir grön när förarens transponder passerat decodern i dag (på datorn som kör decodern). **Ta bort de som inte kommit** tar ut förare som inte är incheckade ur racet och heat som inte körts, efter en fråga och bara innan kvalet startat; de finns kvar i förarregistret. **Skriv ut lista** ger ett papper att bocka av vid grinden. Används inte incheckningen räknas alla som närvarande, och inget annat i racet påverkas. - **Decoderlarm:** tappar decodern anslutningen medan ett heat pågår (eller under nedräkningen) visas en röd banner överst på alla sidor, "Decodern tappade anslutningen 12:03 – varv registreras inte", med **Anslut igen** och **Tysta**, och ett varningsljud hörs var 30:e sekund. I kval, heat och finaler larmar det också när decodern är ansluten men ingen passering kommit på 30 s (eller tre av de snabbaste varven), till exempel när decoderboxen eller slingan slutat fungera. Träning larmar bara vid tappad anslutning. När decodern fungerar igen visas i 10 s hur länge tidtagningen var borta, så att varven kan kontrolleras i Domarvyn. Gäller datorn som är Race Controller Master och kan stängas av under Inställningar → Ljud → **Decoderlarm under heat**. - **Paus, fortsätt och avsluta** fungerar under heatet. Follow-up-tid låter sista varvet köras klart efter klockan. diff --git a/docs/javascript-architecture.md b/docs/javascript-architecture.md index c28f747..6ab7a4d 100644 --- a/docs/javascript-architecture.md +++ b/docs/javascript-architecture.md @@ -2961,6 +2961,8 @@ Dependency graph: `app.js -> decoder_runtime.js -> decoder_diagnostics.js`; `app `decoder_diagnostics_view.js` mounts inside a details element outside settingsForm. A one-second timer patches only its own text nodes; it skips closed/paused panels, clears the old timer on remount, and self-clears after detachment. Pause affects display, not collection. Clearing diagnostics preserves socket state and timestamps. Copy uses Clipboard API with a selectable readonly textarea fallback for HTTP. Untrusted payloads are assigned through textContent/value, never interpolated into HTML. No SQLite/localStorage writes, backend endpoint, or public overlay exposure is added. Refresh resets diagnostics independently of saved settings. +`check_in_logic.js` (pure) holds the optional race check-in: `raceConfig.checkIn = { driverId: { present, paid } }` (kept by `normalizeEvent` and `buildRaceFormatConfigFromForm`), `checkInRows()` (with today's decoder sightings from `prologue_logic.js`), `checkInSummary()`, `canRemoveNoShows()` (someone checked in, no non-practice session of the race started) and `removeNoShows()` (race participants and unstarted sessions only, never the register). `check_in_view.js` renders the Manage race tab; `app.js` `mountCheckIn()` fills it through the `renderCheckIn` context hook. + `decoder_watch.js` (pure) decides the decoder alarm: `decoderAlarm(decoder, session, { startPending, bestLapMs, now })` returns `ok`, `lost` (main link down 3 s or more during a running heat or start count-down, counted from `state.decoder.disconnectedAt`, set on the first `onclose` and cleared on `onopen`) or `silent` (connected, a non-practice heat past its first 30 s, no PASSING since `state.decoder.lastPassingAt` or the start for `silentLimitMs(bestLapMs)` = max(30 s, 3 × best lap)). `app.js` `checkDecoderAlarm()` runs every second on the race master with a configured `wsUrl` and `settings.raceAudio.decoderAlarm` on; it renders `#decoderAlarm`, plays `timing_disconnected` (or the WebAudio siren when race audio is off) every 30 s until silenced, and shows 10 s of "working again" after recovery. No backend or SQLite change. Reason codes: invalid_message (not an object), not_passing, no_running_session, missing_transponder, not_registered, already_in_pit, pit_exit_without_entry, split_without_reference, split_locktime, below_min (stored invalid lap). Handled events: pit_entry, pit_exit, split, start_reference, lap_counted or the existing validation warning. invalid_json means parsing failed before processing. The raw frame helps diagnose upstream protocol problems without changing parsing behavior. diff --git a/package-lock.json b/package-lock.json index 84466ed..1e33c99 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.89.28", + "version": "1.89.29", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.89.28", + "version": "1.89.29", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 58dc519..b1d18ee 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.89.28", + "version": "1.89.29", "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 49a73f8..1890f4b 100644 --- a/src/app.js +++ b/src/app.js @@ -23,6 +23,8 @@ import { normalizeSeries, buildSeriesStandings, getSeriesRoundStatus, getSeriesR import { renderSeriesView } from "./series_view.js"; import { decoderAlarm } from "./decoder_watch.js"; import { resultsAutosavePlan } from "./results_autosave.js"; +import { normalizeCheckIn, checkInRows, checkInSummary, canRemoveNoShows, removeNoShows } from "./check_in_logic.js"; +import { renderCheckInPanel, bindCheckInPanel, buildCheckInPrintHtml } from "./check_in_view.js"; import { RACE_AUDIO_EVENT_DEFINITIONS, createRaceAudioEngine, normalizeRaceAudioSettings, isSilencedDuringRace, formatSpokenLapTime, resolveDriverCallStyle, formatCarCall, formatHeatCallDrivers } from "./race_audio.js"; import { renderRaceFormatField, renderRaceFormatContextCard, getRaceSummaryItems, getRaceSummaryWarnings, renderManageStatusBadge, renderRaceWizardSteps, renderRaceWizardContent, renderRaceStandingsTable } from "./race_setup_ui.js"; @@ -3069,6 +3071,21 @@ const TRANSLATIONS = { "results.dismiss": "Stäng", "results.saved_title": "Sparade PDF:er", "results.saved_none": "Inga sparade resultat än. Slå på Spara resultat automatiskt som PDF under Inställningar → Utseende & overlay.", + "checkin.tab": "Incheckning", + "checkin.title": "Incheckning", + "checkin.hint": "Frivilligt: bocka av vilka som kommit och betalat. Utan incheckning räknas alla som närvarande.", + "checkin.present": "Närvarande", + "checkin.paid": "Betalt", + "checkin.seen": "Transponder", + "checkin.seen_yes": "Sedd", + "checkin.seen_hint": "Grön när transpondern passerat decodern i dag (visas på datorn som kör decodern).", + "checkin.count": "{present} av {total} incheckade · {paid} betalt · {seen} transponder sedda", + "checkin.search": "Sök förare", + "checkin.none": "Inga deltagare i racet än.", + "checkin.print": "Skriv ut lista", + "checkin.remove": "Ta bort de som inte kommit", + "checkin.remove_hint": "Tar bort förare som inte är incheckade ur racet och ur heat som inte körts. Går bara innan kvalet startat. Förarna finns kvar i förarregistret.", + "checkin.remove_confirm": "Ta bort {count} förare som inte är incheckade ur racet och heat som inte körts?\n\n{names}\n\nDe finns kvar i förarregistret.", "settings.pdf_footer": "PDF-footer", "settings.pdf_theme": "PDF-tema", "settings.pdf_theme_classic": "Classic", @@ -5399,6 +5416,21 @@ const TRANSLATIONS = { "results.dismiss": "Close", "results.saved_title": "Saved PDFs", "results.saved_none": "No saved results yet. Turn on Save results as PDF automatically under Settings → Appearance & overlay.", + "checkin.tab": "Check-in", + "checkin.title": "Check-in", + "checkin.hint": "Optional: tick who has arrived and paid. Without a check-in, everyone counts as present.", + "checkin.present": "Present", + "checkin.paid": "Paid", + "checkin.seen": "Transponder", + "checkin.seen_yes": "Seen", + "checkin.seen_hint": "Green when the transponder has crossed the decoder today (shown on the computer running the decoder).", + "checkin.count": "{present} of {total} checked in · {paid} paid · {seen} transponders seen", + "checkin.search": "Search driver", + "checkin.none": "No participants in the race yet.", + "checkin.print": "Print list", + "checkin.remove": "Remove no-shows", + "checkin.remove_hint": "Takes drivers not checked in out of the race and its heats not yet run. Only before qualifying starts. They stay in the drivers' register.", + "checkin.remove_confirm": "Remove {count} drivers not checked in from the race and heats not yet run?\n\n{names}\n\nThey stay in the drivers' register.", "settings.pdf_footer": "PDF footer", "settings.pdf_theme": "PDF theme", "settings.pdf_theme_classic": "Classic", @@ -7783,6 +7815,37 @@ function updateConnectionBadge() { dom.connectionBadge.className = `badge ${isOnline ? "badge-online" : "badge-offline"}`; } +// Optional morning check-in (check_in_logic.js / check_in_view.js) in Manage race. +function startOfTodayMs() { const d = new Date(); d.setHours(0, 0, 0, 0); return d.getTime(); } +function checkInRowsFor(event) { + return checkInRows({ participants: getEventDrivers(event), checkIn: event.raceConfig?.checkIn, sightings: transponderSightings, seenSince: startOfTodayMs(), getClassName }); +} +function mountCheckIn(panel, eventId) { + const event = state.events.find((item) => item.id === eventId); + if (!event || !panel) return; + const rows = checkInRowsFor(event); + panel.innerHTML = renderCheckInPanel({ rows, summary: checkInSummary(rows), canRemove: canRemoveNoShows(event, state.sessions, event.raceConfig?.checkIn), t, escapeHtml }); + bindCheckInPanel(panel, { + onToggle: (driverId, key, value) => { + const current = normalizeCheckIn(event.raceConfig.checkIn); + event.raceConfig.checkIn = normalizeCheckIn({ ...current, [driverId]: { ...(current[driverId] || {}), [key]: value } }); + saveState(); + const next = checkInRowsFor(event); + panel.querySelector("[data-check-in-count]").textContent = t("checkin.count", checkInSummary(next)); + const remove = panel.querySelector("[data-check-in-remove]"); + if (remove) remove.disabled = !canRemoveNoShows(event, state.sessions, event.raceConfig.checkIn); + }, + onRemove: () => { + const missing = checkInRowsFor(event).filter((row) => !row.present); + if (!missing.length || !window.confirm(t("checkin.remove_confirm", { count: missing.length, names: missing.map((row) => row.name).join(", ") }))) return; + removeNoShows(state, event.id); + saveState(); + renderView(); + }, + onPrint: () => openPrintWindow(`${event.name} - ${t("checkin.title")}`, buildCheckInPrintHtml({ title: event.name, rows: checkInRowsFor(event), t, escapeHtml })), + }); +} + // Autopilot print (results_autosave.js): 10 s after a heat finishes (late passings still count), // the race master saves its PDF on the server; after the last final, the full results and, when // asked for, a Print results button (a browser can't print without a click). @@ -7945,6 +8008,7 @@ function renderEventManager(eventId) { buildEventSchedule, getDayPlan, saveDayPlan: (plan) => saveDayPlan({ ...getDayPlan(plan.date), ...plan }), + renderCheckIn: (panel, event) => mountCheckIn(panel, event.id), getSelectedTeamEditId: () => selectedTeamEditId, setSelectedTeamEditId: (value) => { selectedTeamEditId = value; }, getSelectedSessionEditId: () => selectedSessionEditId, diff --git a/src/check_in_logic.js b/src/check_in_logic.js new file mode 100644 index 0000000..d116681 --- /dev/null +++ b/src/check_in_logic.js @@ -0,0 +1,65 @@ +// Morning check-in for a race: present / paid per driver, the transponder seen on the decoder, +// and taking the no-shows out before qualifying. Stored in event.raceConfig.checkIn +// ({ driverId: { present, paid } }); no check-in at all means everyone counts as present. +// Pure logic - the tab is in check_in_view.js. + +export function normalizeCheckIn(raw) { + const out = {}; + Object.entries(raw && typeof raw === "object" ? raw : {}).forEach(([id, item]) => { + if (!id || !item || typeof item !== "object") return; + const present = item.present === true; + const paid = item.paid === true; + if (present || paid) out[String(id)] = { present, paid }; + }); + return out; +} + +// One row per participant, by name. seenSince: sightings (Map transponder -> { lastSeenAt }) count from then. +export function checkInRows({ participants = [], checkIn = {}, sightings = new Map(), seenSince = 0, getClassName = () => "" }) { + const list = normalizeCheckIn(checkIn); + return participants.map((driver) => { + const sighting = driver.transponder ? sightings.get(String(driver.transponder).trim()) : null; + return { + driverId: driver.id, + name: driver.name || "", + className: getClassName(driver.classId), + transponder: String(driver.transponder || ""), + present: Boolean(list[driver.id]?.present), + paid: Boolean(list[driver.id]?.paid), + seen: Boolean(sighting && Number(sighting.lastSeenAt) >= seenSince), + }; + }).sort((a, b) => a.name.localeCompare(b.name, "sv", { sensitivity: "base" })); +} + +export function checkInSummary(rows) { + return { total: rows.length, present: rows.filter((row) => row.present).length, paid: rows.filter((row) => row.paid).length, seen: rows.filter((row) => row.seen).length }; +} + +const STARTED = new Set(["running", "paused", "finished"]); +// The no-shows can be taken out while no qualifying heat, heat or final of the race has started. +export function canRemoveNoShows(event, sessions, checkIn) { + const list = normalizeCheckIn(checkIn); + if (!Object.values(list).some((item) => item.present)) return false; // nobody checked in yet + return !sessions.some((session) => session.eventId === event.id && session.type !== "open_practice" && session.type !== "practice" && STARTED.has(session.status)); +} + +// Takes drivers not checked in out of the race and its heats not yet run. Returns their ids; +// they stay in the drivers' register. +export function removeNoShows(state, eventId) { + const event = state.events.find((item) => item.id === eventId); + if (!event?.raceConfig) return []; + const list = normalizeCheckIn(event.raceConfig.checkIn); + const ids = (event.raceConfig.driverIds || []).filter((id) => !list[id]?.present); + if (!ids.length || !canRemoveNoShows(event, state.sessions, list)) return []; + const gone = new Set(ids.map(String)); + const keep = (values) => (values || []).filter((id) => !gone.has(String(id))); + event.raceConfig.driverIds = keep(event.raceConfig.driverIds); + event.raceConfig.participantsConfigured = true; + state.sessions.forEach((session) => { + if (session.eventId !== eventId || STARTED.has(session.status)) return; + session.assignments = (session.assignments || []).filter((item) => !gone.has(String(item.driverId))); + session.driverIds = keep(session.driverIds); + session.manualGridIds = keep(session.manualGridIds); + }); + return ids; +} diff --git a/src/check_in_view.js b/src/check_in_view.js new file mode 100644 index 0000000..f777068 --- /dev/null +++ b/src/check_in_view.js @@ -0,0 +1,58 @@ +// The optional morning check-in tab in Manage race (logic in check_in_logic.js). Nothing else +// depends on it: no check-in means every participant counts as present. + +export function renderCheckInPanel({ rows, summary, canRemove, t, escapeHtml }) { + const tick = (row, key, label) => ``; + return ` +
${escapeHtml(t("checkin.hint"))}
| ${escapeHtml(t("table.driver"))} | ${escapeHtml(t("table.class"))} | ${escapeHtml(t("table.transponder"))} | ✓ ${escapeHtml(t("checkin.present"))} | 💰 ${escapeHtml(t("checkin.paid"))} | 📡 ${escapeHtml(t("checkin.seen"))} |
|---|---|---|---|---|---|
| ${escapeHtml(row.name)} | +${escapeHtml(row.className)} | +${escapeHtml(row.transponder || "-")} | +${tick(row, "present", t("checkin.present"))} | +${tick(row, "paid", t("checkin.paid"))} | +${row.seen ? `${escapeHtml(t("checkin.seen_yes"))}` : `-`} | +
| ${escapeHtml(t("checkin.none"))} | |||||
${escapeHtml(t("checkin.title"))}
+| ${escapeHtml(t("table.driver"))} | ${escapeHtml(t("table.class"))} | ${escapeHtml(t("table.transponder"))} | ✓ ${escapeHtml(t("checkin.present"))} | 💰 ${escapeHtml(t("checkin.paid"))} |
|---|---|---|---|---|
| ${escapeHtml(row.name)} | ${escapeHtml(row.className)} | ${escapeHtml(row.transponder || "")} | ${row.present ? "✓" : "☐"} | ${row.paid ? "✓" : "☐"} |