diff --git a/CHANGELOG.md b/CHANGELOG.md index bab733c..90c2eeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.69.0 + +- Speaker panel moved from Timing to Race Day (under the start controls) and Judging (on top), where the race is run: track call, track clear, red flag, pause, resume, false start and marshal warning. Under "Sound and calls" it also has quick switches that save at once: mute all sound, lap time calls, race leader calls, practice hype and the speaker cues. + ## 1.68.0 - Open Practice settings: the Open Practice row in Events has "Settings" (it was "Edit", with only name and date) with the lap window (shortest and longest lap) and the ranking: best lap (as before), best N laps in a row (e.g. 3), or best X minutes (most laps inside X minutes, then the shorter time - e.g. 5 min). The timing list, the overlay, Race Day and the results show the chosen result ("3 laps 52.341", "17 laps / 5:00.3"), the best lap stays in its own column. Laps only count as "in a row" within one run: a stop in the pits starts a new one. diff --git a/package-lock.json b/package-lock.json index c417d0f..8028309 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.68.0", + "version": "1.69.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.68.0", + "version": "1.69.0", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 3f234bb..42b4051 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.68.0", + "version": "1.69.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 788b9b1..574adc4 100644 --- a/src/app.js +++ b/src/app.js @@ -11,6 +11,7 @@ import { renderRaceDayView, refreshRaceDayWarmup, refreshRaceDayPrologueClock, u import { normalizeRaceDays, getRaceDay, upsertRaceDay, orderDaySessions, buildDaySchedule, getAutopilotAction, moveInDayOrder, pickBoardDate, getDueCall } from "./day_schedule_logic.js"; import { buildRaceOverview, buildRaceOverviewCsvRows } from "./race_overview_logic.js"; import { renderRaceOverviewPanel, bindRaceOverviewPanel } from "./race_overview_view.js"; +import { renderSpeakerPanel, bindSpeakerPanel } from "./speaker_panel_view.js"; import { renderDaySchedulePanel, bindDaySchedulePanel, buildDaySchedulePrintHtml, renderDriverBoard, formatClockTime, renderDayCallBanner, bindDayCallBanner } from "./day_schedule_view.js"; import { beginSession as beginSessionControl, finishSession as finishSessionControl, pauseSession as pauseSessionControl, resumeSession as resumeSessionControl } from "./session_control.js"; import { normalizeSeries, buildSeriesStandings, getSeriesRoundStatus, getSeriesRoundNextStep, getSeriesDayResult } from "./series_logic.js"; @@ -736,6 +737,7 @@ const renderRaceDay = () => renderRaceDayView({ buildLeaderboard, getSessionTargetMs, formatRaceClock, renderDaySchedule, bindDaySchedule, renderDayCall, bindDayCall, setCompetitorLapStatus, + ...speakerPanelDeps, renderRaceOverview: (session) => renderRaceOverviewFor(state.events.find((event) => event.id === session?.eventId)), bindRaceOverview: (root, session) => bindRaceOverviewFor(root, state.events.find((event) => event.id === session?.eventId)), addTrackLayout, renderView, state, dom, t, escapeHtml, formatLap, formatCountdown, formatElapsedClock, @@ -796,7 +798,12 @@ const refreshTimingDynamics = () => { if (currentView === "race_day") refreshRaceDayLive(); }; const renderTiming = () => renderTimingView({ renderSuspectLapsPanel: (session) => renderSuspectLapsPanelWithRelease(session), state, dom, t, escapeHtml, formatLap, formatCountdown, formatElapsedClock, formatRaceClock, renderTable, uid, getActiveSession, ensureSessionResult, buildLeaderboard, getSessionTiming, getVisiblePassings, getEventName, getSessionTypeLabel, getStatusLabel, normalizeStartMode, getStartModeLabel, renderPositionGrid, renderSessionChannelAnalysis, connectDecoder, disconnectDecoder, applyCompetitorCorrection, invalidateCompetitorLastLap, restoreCompetitorLastInvalidLap, startOperationalSession, finishOperationalSession, cancelRaceStart, triggerRaceAudio, getStartLightState: () => raceAudioEngine.getStartLightState(), saveState, updateHeaderState, renderView, normalizeDriver, normalizeCar, processDecoderMessage, getSelectedLeaderboardKey: () => selectedLeaderboardKey, setSelectedLeaderboardKey: (value) => { selectedLeaderboardKey = value; }, getQuickAddDraft: () => quickAddDraft, setQuickAddDraft: (value) => { quickAddDraft = value; }, getPassingValidationLabel, isCountedPassing, getCompetitorPassings, getManualCorrectionSummary, formatTeamActiveMemberLabel, lastFinishAnnouncementSessionId: () => lastFinishAnnouncementSessionId, setLastFinishAnnouncementSessionId: (value) => { lastFinishAnnouncementSessionId = value; }, lastOverlayLeaderKeyBySession, lastOverlayTop3BySession, overlayEvents: () => overlayEvents, setOverlayEvents: (value) => { overlayEvents = value; }, sessionReplay, syncTrainingLedger, setCompetitorLapStatus, getLiveSession, selectLiveSession: (id) => selectOperationalSession(id), openRaceDay: () => navigateToView("race_day"), openJudging: (rowKey) => { selectedJudgeKey = rowKey; selectedLeaderboardKey = null; navigateToView("judging"); } }); -const renderJudging = () => renderJudgingView({ state, dom, t, escapeHtml, formatLap, renderTable, getActiveSession, ensureSessionResult, buildLeaderboard, getSessionTypeLabel, getJudgeFilteredRows, getJudgeFilteredLog, getCompetitorPassings, isCountedPassing, getPassingValidationLabel, undoJudgingAdjustment, applyCompetitorCorrection, invalidateCompetitorLastLap, restoreCompetitorLastInvalidLap, renderView, getSelectedJudgeKey: () => selectedJudgeKey, setSelectedJudgeKey: (value) => { selectedJudgeKey = value; }, getJudgingCompetitorFilter: () => judgingCompetitorFilter, setJudgingCompetitorFilter: (value) => { judgingCompetitorFilter = value; }, getJudgingLogFilter: () => judgingLogFilter, setJudgingLogFilter: (value) => { judgingLogFilter = value; } , setCompetitorLapStatus }); +// Speaker panel (race-control calls, quick sound switches) on Race Day and Judging. +const speakerPanelDeps = { + renderSpeakerPanel: () => renderSpeakerPanel({ state, t, escapeHtml }), + bindSpeakerPanel: (root) => bindSpeakerPanel(root, { state, getActiveSession, cancelRaceStart, triggerRaceAudio, saveState, updateHeaderState, renderView }), +}; +const renderJudging = () => renderJudgingView({ ...speakerPanelDeps, state, dom, t, escapeHtml, formatLap, renderTable, getActiveSession, ensureSessionResult, buildLeaderboard, getSessionTypeLabel, getJudgeFilteredRows, getJudgeFilteredLog, getCompetitorPassings, isCountedPassing, getPassingValidationLabel, undoJudgingAdjustment, applyCompetitorCorrection, invalidateCompetitorLastLap, restoreCompetitorLastInvalidLap, renderView, getSelectedJudgeKey: () => selectedJudgeKey, setSelectedJudgeKey: (value) => { selectedJudgeKey = value; }, getJudgingCompetitorFilter: () => judgingCompetitorFilter, setJudgingCompetitorFilter: (value) => { judgingCompetitorFilter = value; }, getJudgingLogFilter: () => judgingLogFilter, setJudgingLogFilter: (value) => { judgingLogFilter = value; } , setCompetitorLapStatus }); const normalizeTrainingState = (training) => normalizeTrainingStateLogic(training, { uid }); const syncTrainingLedger = () => { state.training = syncTrainingLedgerLogic(state.training, state, { uid }); @@ -2848,6 +2855,8 @@ const TRANSLATIONS = { "race_overview.phase_practice": "Träning", "race_overview.phase_qualification": "Kval", "race_overview.phase_final": "Finaler", + "speaker.sound_settings": "Ljud och utrop", + "speaker.muted": "Tysta allt ljud", "practice_rank.settings": "Inställningar", "practice_rank.min_lap": "Kortaste varv (s)", "practice_rank.max_lap": "Längsta varv (s)", @@ -4934,6 +4943,8 @@ const TRANSLATIONS = { "race_overview.phase_practice": "Practice", "race_overview.phase_qualification": "Qualifying", "race_overview.phase_final": "Finals", + "speaker.sound_settings": "Sound and calls", + "speaker.muted": "Mute all sound", "practice_rank.settings": "Settings", "practice_rank.min_lap": "Shortest lap (s)", "practice_rank.max_lap": "Longest lap (s)", diff --git a/src/race_day_view.js b/src/race_day_view.js index e5e8b31..1c27d20 100644 --- a/src/race_day_view.js +++ b/src/race_day_view.js @@ -265,6 +265,7 @@ export function renderRaceDayView(deps) { buildLeaderboard = () => [], getSessionTargetMs = () => null, formatRaceClock = (ms) => String(ms), renderDaySchedule = () => "", bindDaySchedule = () => {}, renderDayCall = () => "", bindDayCall = () => {}, renderRaceOverview = () => "", bindRaceOverview = () => {}, + renderSpeakerPanel = () => "", bindSpeakerPanel = () => {}, } = deps; const queue = buildRaceDayQueue(state); const session = queue.current; @@ -368,6 +369,7 @@ export function renderRaceDayView(deps) { ${showsWarmupPanel(session) ? `
` : ""} + ${renderSpeakerPanel()} ${session ? renderSuspectLapsPanel(session) : ""}
@@ -446,6 +448,7 @@ export function renderRaceDayView(deps) { bindTrackLayoutBar(dom.view, { state, t, addTrackLayout, renderView }); bindDaySchedule(dom.view); bindRaceOverview(dom.view, session); + bindSpeakerPanel(dom.view); bindDayCall(dom.view); lastWarmupDeps = { t, escapeHtml, renderView, getRaceDayWarmupCheck, setDriverTransponder, getSession: () => buildRaceDayQueue(state).current }; paintWarmupPanel(); diff --git a/src/speaker_panel_view.js b/src/speaker_panel_view.js new file mode 100644 index 0000000..2a7835c --- /dev/null +++ b/src/speaker_panel_view.js @@ -0,0 +1,90 @@ +// Speaker panel: the race-control calls (track call, track clear, red flag, pause, resume, +// false start, marshal warning) and quick audio switches. Shown on Race Day and Judging, where +// the person running the race is - one render and one bind for both. +const CUES = [ + ["track_call", "audio.track_call", "btn-danger"], + ["track_clear", "audio.track_clear", ""], + ["red_flag", "audio.red_flag", "btn-danger"], + ["race_paused", "audio.race_pause", ""], + ["race_resumed", "audio.race_resume", ""], + ["false_start", "audio.false_start", ""], + ["marshal_warning", "audio.marshal_warning", ""], +]; +const TOGGLES = [ + ["speakerPassingCueEnabled", "settings.speaker_passing_cue"], + ["speakerLeaderCueEnabled", "settings.speaker_leader_cue"], + ["speakerBestLapCueEnabled", "settings.speaker_bestlap_cue"], + ["speakerTop3CueEnabled", "settings.speaker_top3_cue"], + ["speakerSessionStartCueEnabled", "settings.speaker_start_cue"], + ["speakerFinishCueEnabled", "settings.speaker_finish_cue"], +]; + +export function renderSpeakerPanel({ state, t, escapeHtml }) { + const audio = state.settings.raceAudio || {}; + const select = (key, values, labelKey, optionPrefix) => ` + `; + return ` +
+

${t("timing.speaker_panel")}

+
+
+ ${CUES.map(([cue, labelKey, tone]) => ``).join("")} +
+
+ ${t("speaker.sound_settings")} +
+ + ${select("lapTimeCalls", ["practice", "always", "off"], "audio.lap_time_calls", "audio.lap_time_calls_")} + ${select("raceLeaderCalls", ["both", "change", "off"], "audio.race_leader_calls", "audio.race_leader_")} + +
+
+ ${TOGGLES.map(([key, labelKey]) => ``).join("")} +
+
+
+
`; +} + +export function bindSpeakerPanel(root, { state, getActiveSession, cancelRaceStart, triggerRaceAudio, saveState, updateHeaderState, renderView }) { + if (!root) return; + root.querySelectorAll("#speakerPanel [data-race-audio-cue]").forEach((node) => { + node.addEventListener("click", () => { + const cue = node.dataset.raceAudioCue; + const session = getActiveSession(); + if (cue === "false_start") { + cancelRaceStart(); + } else if (cue === "race_paused" && session?.status === "running") { + session.status = "paused"; + session.pausedAt = Date.now(); + saveState(); + } else if (cue === "race_resumed" && session?.status === "paused") { + const pausedDuration = Math.max(0, Date.now() - Number(session.pausedAt || Date.now())); + session.totalPausedMs = Math.max(0, Number(session.totalPausedMs || 0)) + pausedDuration; + if (session.followUpStartedAt) session.followUpPausedMs = Math.max(0, Number(session.followUpPausedMs || 0)) + pausedDuration; + session.pausedAt = null; + session.status = "running"; + saveState(); + } + triggerRaceAudio(cue, { interrupt: true, force: true, logData: { raceId: session?.eventId, sessionId: session?.id } }); + // Persist after dispatch so the audio-event log includes this manual race-control call. + saveState(); + if (["race_paused", "race_resumed"].includes(cue)) { updateHeaderState(); renderView(); } + }); + }); + // Open/closed is kept across re-renders (Race Day re-renders often). + const details = root.querySelector(".speaker-panel-settings"); + if (details) { + details.open = Boolean(bindSpeakerPanel.settingsOpen); + details.addEventListener("toggle", () => { bindSpeakerPanel.settingsOpen = details.open; }); + } + root.querySelectorAll("#speakerPanel [data-speaker-setting]").forEach((input) => input.addEventListener("change", () => { + state.settings[input.dataset.speakerSetting] = input.checked; + saveState(); + })); + root.querySelectorAll("#speakerPanel [data-speaker-audio]").forEach((input) => input.addEventListener("change", () => { + const key = input.dataset.speakerAudio; + state.settings.raceAudio = { ...(state.settings.raceAudio || {}), [key]: input.type === "checkbox" ? input.checked : input.value }; + saveState(); + })); +} diff --git a/src/timing_views.js b/src/timing_views.js index 83d515b..f4a1227 100644 --- a/src/timing_views.js +++ b/src/timing_views.js @@ -111,14 +111,6 @@ function renderSessionReplayPanel(runtime, deps) { `; } -function renderSpeakerToggle(settingKey, labelKey, { state, t }) { - return ` - - `; -} function getQuickAddState(transponder, { state }) { const normalized = String(transponder || "").trim(); @@ -542,29 +534,6 @@ export function renderTimingView(deps) { ${renderSessionReplayPanel(sessionReplay, { state, t, escapeHtml, getEventName, formatLap, formatElapsedClock })} -
-

${t("timing.speaker_panel")}

-
-

${t("timing.speaker_panel_hint")}

-
- - - - - - - -
-
- ${renderSpeakerToggle("speakerPassingCueEnabled", "settings.speaker_passing_cue", { state, t })} - ${renderSpeakerToggle("speakerLeaderCueEnabled", "settings.speaker_leader_cue", { state, t })} - ${renderSpeakerToggle("speakerBestLapCueEnabled", "settings.speaker_bestlap_cue", { state, t })} - ${renderSpeakerToggle("speakerTop3CueEnabled", "settings.speaker_top3_cue", { state, t })} - ${renderSpeakerToggle("speakerSessionStartCueEnabled", "settings.speaker_start_cue", { state, t })} - ${renderSpeakerToggle("speakerFinishCueEnabled", "settings.speaker_finish_cue", { state, t })} -
-
-
${active ? (deps.renderSuspectLapsPanel ? deps.renderSuspectLapsPanel(active) : renderSuspectLapsPanel(active, { t, escapeHtml, formatLap, ensureSessionResult })) : ""}
@@ -759,41 +728,6 @@ export function renderTimingView(deps) { if (session && setCompetitorLapStatus(session, button.dataset.lapRow, Number(button.dataset.lapTs), button.dataset.lapAction)) renderView(); })); - document.querySelectorAll("[data-race-audio-cue]").forEach((node) => { - node.addEventListener("click", () => { - const cue = node.dataset.raceAudioCue; - const session = getActiveSession(); - if (cue === "false_start") { - cancelRaceStart(); - } else if (cue === "race_paused" && session?.status === "running") { - session.status = "paused"; - session.pausedAt = Date.now(); - saveState(); - } else if (cue === "race_resumed" && session?.status === "paused") { - const pausedDuration = Math.max(0, Date.now() - Number(session.pausedAt || Date.now())); - session.totalPausedMs = Math.max(0, Number(session.totalPausedMs || 0)) + pausedDuration; - if (session.followUpStartedAt) session.followUpPausedMs = Math.max(0, Number(session.followUpPausedMs || 0)) + pausedDuration; - session.pausedAt = null; - session.status = "running"; - saveState(); - } - triggerRaceAudio(cue, { interrupt: true, force: true, logData: { raceId: session?.eventId, sessionId: session?.id } }); - // Persist after dispatch so the audio-event log includes this manual race-control call. - saveState(); - if (["race_paused", "race_resumed"].includes(cue)) { updateHeaderState(); renderView(); } - }); - }); - - document.querySelectorAll("[data-speaker-setting]").forEach((node) => { - node.addEventListener("change", (event) => { - const input = event.currentTarget; - if (!(input instanceof HTMLInputElement)) { - return; - } - state.settings[input.dataset.speakerSetting] = input.checked; - saveState(); - }); - }); } export function renderJudgingView(deps) { @@ -804,6 +738,7 @@ export function renderJudgingView(deps) { restoreCompetitorLastInvalidLap, renderView, getSelectedJudgeKey, setSelectedJudgeKey, getJudgingCompetitorFilter, setJudgingCompetitorFilter, getJudgingLogFilter, setJudgingLogFilter, setCompetitorLapStatus = () => false, + renderSpeakerPanel = () => "", bindSpeakerPanel = () => {}, } = deps; const active = getActiveSession(); @@ -813,7 +748,9 @@ export function renderJudgingView(deps) {

${t("judging.title")}

${t("judging.no_active_session")}

+ ${renderSpeakerPanel()} `; + bindSpeakerPanel(dom.view); return; } @@ -832,6 +769,7 @@ export function renderJudgingView(deps) { const latestUndoable = (result.adjustments || []).slice().reverse().find((entry) => !entry.undoneAt && entry.undo); dom.view.innerHTML = ` + ${renderSpeakerPanel()}

${t("judging.title")}

@@ -959,6 +897,7 @@ export function renderJudgingView(deps) {
`; + bindSpeakerPanel(dom.view); leaderboard.forEach((row) => { document.getElementById(`judge-select-${row.key}`)?.addEventListener("click", () => { setSelectedJudgeKey(row.key); diff --git a/tests/browser_practice_ranking.js b/tests/browser_practice_ranking.js index 4896dfd..638461b 100644 --- a/tests/browser_practice_ranking.js +++ b/tests/browser_practice_ranking.js @@ -52,3 +52,18 @@ export async function runPracticeRankingSmoke({ evaluate, navigate, savedState, assert.match(await firstOnOverlay(), /2 (laps|varv)/); console.log("PASS open practice settings: ranking by best N laps in a row re-sorts the overlay"); } + +// The speaker panel lives on Race Day and Judging now (not Timing): its switches save at once. +export async function runSpeakerPanelSmoke({ evaluate, navigate, savedState, waitFor }) { + await navigate("race_day", "speakerPanel"); + assert.ok(await evaluate(`Boolean(document.querySelector('#speakerPanel [data-race-audio-cue="track_call"]'))`), "track call on Race Day"); + await evaluate(`(() => { const select = document.querySelector('#speakerPanel [data-speaker-audio="lapTimeCalls"]'); select.value = "off"; select.dispatchEvent(new Event("change")); })()`); + await waitFor(async () => (await savedState()).settings.raceAudio.lapTimeCalls === "off", "lap time calls switched off from Race Day"); + await evaluate(`(() => { const select = document.querySelector('#speakerPanel [data-speaker-audio="lapTimeCalls"]'); select.value = "practice"; select.dispatchEvent(new Event("change")); })()`); + await waitFor(async () => (await savedState()).settings.raceAudio.lapTimeCalls === "practice", "and back on"); + await navigate("judging", "speakerPanel"); + assert.ok(await evaluate(`Boolean(document.querySelector('#speakerPanel [data-race-audio-cue="marshal_warning"]'))`), "marshal warning on Judging"); + await navigate("timing", "activeSessionSelect"); + assert.equal(await evaluate(`Boolean(document.getElementById("speakerPanel"))`), false, "no longer on Timing"); + console.log("PASS speaker panel on Race Day and Judging, sound switches save at once"); +} diff --git a/tests/browser_smoke.js b/tests/browser_smoke.js index 4e530e2..e90e90f 100644 --- a/tests/browser_smoke.js +++ b/tests/browser_smoke.js @@ -12,7 +12,7 @@ import { runTtsSettingsSmoke } from "./browser_tts_settings.js"; import { runTrackLayoutsSmoke } from "./browser_track_layouts.js"; import { runPrologueSmoke } from "./browser_prologue.js"; import { runPracticeResetSmoke } from "./browser_practice_reset.js"; -import { runPracticeRankingSmoke } from "./browser_practice_ranking.js"; +import { runPracticeRankingSmoke, runSpeakerPanelSmoke } from "./browser_practice_ranking.js"; import { runSuspectLapsSmoke } from "./browser_suspect_laps.js"; import { runOverlayDriverLinkSmoke } from "./browser_overlay_driver_link.js"; import { runProfileClassSmoke } from "./browser_profile_class.js"; @@ -168,6 +168,7 @@ try { await runPrologueSmoke({ evaluate, navigate, savedState, waitFor, base, dialogs }); await runPracticeResetSmoke({ evaluate, navigate, savedState, waitFor, base, dialogs }); await runPracticeRankingSmoke({ evaluate, navigate, savedState, waitFor, base }); + await runSpeakerPanelSmoke({ evaluate, navigate, savedState, waitFor }); await runSuspectLapsSmoke({ evaluate, navigate, savedState, waitFor, base, dialogs }); await runOverlayDriverLinkSmoke({ evaluate, navigate, savedState, waitFor, base, send }); await runDecoderClockSmoke({ evaluate, navigate, savedState, waitFor, base });