feat(audio): speaker panel on Race Day and Judging with quick sound switches (1.69.0)
This commit is contained in:
1 parent
299fb45c6e
commit
eb4c472ef9
9 files changed
+134
-71
No files matched your search
+12
-1
@@ -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)",
|
||||
|
||||
@@ -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) {
|
||||
</section>
|
||||
|
||||
${showsWarmupPanel(session) ? `<section class="panel mt-16" id="raceDayWarmup"></section>` : ""}
|
||||
${renderSpeakerPanel()}
|
||||
${session ? renderSuspectLapsPanel(session) : ""}
|
||||
|
||||
<section class="panel" ${isLiveSession ? "hidden" : ""}>
|
||||
@@ -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();
|
||||
|
||||
@@ -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) => `
|
||||
<label><span>${t(labelKey)}</span><select data-speaker-audio="${key}">${values.map((value) => `<option value="${value}" ${String(audio[key]) === value ? "selected" : ""}>${escapeHtml(t(optionPrefix + value))}</option>`).join("")}</select></label>`;
|
||||
return `
|
||||
<section class="panel mt-16 speaker-panel" id="speakerPanel">
|
||||
<div class="panel-header"><h3>${t("timing.speaker_panel")}</h3></div>
|
||||
<div class="panel-body">
|
||||
<div class="race-control-cues">
|
||||
${CUES.map(([cue, labelKey, tone]) => `<button class="btn ${tone}" type="button" data-race-audio-cue="${cue}">${t(labelKey)}</button>`).join("")}
|
||||
</div>
|
||||
<details class="speaker-panel-settings mt-8">
|
||||
<summary>${t("speaker.sound_settings")}</summary>
|
||||
<div class="form-grid cols-3 mt-8">
|
||||
<label class="toggle"><input type="checkbox" data-speaker-audio="muted" ${audio.muted ? "checked" : ""} /><span>${t("speaker.muted")}</span></label>
|
||||
${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_")}
|
||||
<label class="toggle"><input type="checkbox" data-speaker-audio="practiceHype" ${audio.practiceHype ? "checked" : ""} /><span>${t("audio.practice_hype")}</span></label>
|
||||
</div>
|
||||
<div class="check-grid mt-8">
|
||||
${TOGGLES.map(([key, labelKey]) => `<label class="check-card"><input type="checkbox" data-speaker-setting="${key}" ${state.settings[key] ? "checked" : ""} /><span>${t(labelKey)}</span></label>`).join("")}
|
||||
</div>
|
||||
</details>
|
||||
</div>
|
||||
</section>`;
|
||||
}
|
||||
|
||||
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();
|
||||
}));
|
||||
}
|
||||
+5
-66
@@ -111,14 +111,6 @@ function renderSessionReplayPanel(runtime, deps) {
|
||||
`;
|
||||
}
|
||||
|
||||
function renderSpeakerToggle(settingKey, labelKey, { state, t }) {
|
||||
return `
|
||||
<label class="check-card">
|
||||
<input type="checkbox" data-speaker-setting="${settingKey}" ${state.settings[settingKey] ? "checked" : ""} />
|
||||
<span>${t(labelKey)}</span>
|
||||
</label>
|
||||
`;
|
||||
}
|
||||
|
||||
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 })}
|
||||
|
||||
<section class="panel mt-16">
|
||||
<div class="panel-header"><h3>${t("timing.speaker_panel")}</h3></div>
|
||||
<div class="panel-body">
|
||||
<p class="hint">${t("timing.speaker_panel_hint")}</p>
|
||||
<div class="race-control-cues">
|
||||
<button class="btn btn-danger" type="button" data-race-audio-cue="track_call">${t("audio.track_call")}</button>
|
||||
<button class="btn" type="button" data-race-audio-cue="track_clear">${t("audio.track_clear")}</button>
|
||||
<button class="btn btn-danger" type="button" data-race-audio-cue="red_flag">${t("audio.red_flag")}</button>
|
||||
<button class="btn" type="button" data-race-audio-cue="race_paused">${t("audio.race_pause")}</button>
|
||||
<button class="btn" type="button" data-race-audio-cue="race_resumed">${t("audio.race_resume")}</button>
|
||||
<button class="btn" type="button" data-race-audio-cue="false_start">${t("audio.false_start")}</button>
|
||||
<button class="btn" type="button" data-race-audio-cue="marshal_warning">${t("audio.marshal_warning")}</button>
|
||||
</div>
|
||||
<div class="check-grid">
|
||||
${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 })}
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
${active ? (deps.renderSuspectLapsPanel ? deps.renderSuspectLapsPanel(active) : renderSuspectLapsPanel(active, { t, escapeHtml, formatLap, ensureSessionResult })) : ""}
|
||||
<section class="panel mt-16">
|
||||
@@ -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) {
|
||||
<div class="panel-header"><h3>${t("judging.title")}</h3></div>
|
||||
<div class="panel-body"><p>${t("judging.no_active_session")}</p></div>
|
||||
</section>
|
||||
${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()}
|
||||
<section class="panel">
|
||||
<div class="panel-header">
|
||||
<h3>${t("judging.title")}</h3>
|
||||
@@ -959,6 +897,7 @@ export function renderJudgingView(deps) {
|
||||
</section>
|
||||
`;
|
||||
|
||||
bindSpeakerPanel(dom.view);
|
||||
leaderboard.forEach((row) => {
|
||||
document.getElementById(`judge-select-${row.key}`)?.addEventListener("click", () => {
|
||||
setSelectedJudgeKey(row.key);
|
||||
|
||||
Reference in new issue
Block a user