feat(results): save results as PDF automatically on the server and ask to print when the finals are done (1.89.28)
This commit is contained in:
1 parent
ae829123cc
commit
e98abd92d9
16 files changed
+253
-6
No files matched your search
+93
-3
@@ -22,6 +22,7 @@ import { beginSession as beginSessionControl, finishSession as finishSessionCont
|
||||
import { normalizeSeries, buildSeriesStandings, getSeriesRoundStatus, getSeriesRoundNextStep, getSeriesDayResult } from "./series_logic.js";
|
||||
import { renderSeriesView } from "./series_view.js";
|
||||
import { decoderAlarm } from "./decoder_watch.js";
|
||||
import { resultsAutosavePlan } from "./results_autosave.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";
|
||||
@@ -218,10 +219,15 @@ const printHeatResult = (event, sessionId) => {
|
||||
${renderRaceOverviewHeatsHtml(event, sessionId)}`);
|
||||
};
|
||||
async function exportHeatResultPdf(event, sessionId) {
|
||||
const payload = await buildHeatResultPdfPayload(event, sessionId);
|
||||
if (payload) await requestPdfExport(payload);
|
||||
}
|
||||
// The PDF of one heat's result (Export PDF and the automatic save share it); null without one.
|
||||
async function buildHeatResultPdfPayload(event, sessionId) {
|
||||
const heat = getOverviewHeats(event, sessionId)[0];
|
||||
if (!heat) return;
|
||||
if (!heat) return null;
|
||||
const branding = resolveEventBranding(event);
|
||||
await requestPdfExport({
|
||||
return ({
|
||||
filename: `${event.name.replaceAll(/\s+/g, "_")}_${heat.session.name.replaceAll(/\s+/g, "_")}.pdf`,
|
||||
title: event.name,
|
||||
subtitle: `${getClassName(event.classId)} • ${event.date || "-"}`,
|
||||
@@ -313,6 +319,7 @@ const announceRaceStarted = (session) => announceRaceStartedHelper(session, { t,
|
||||
const announceRaceFinished = (finished = null) => {
|
||||
const session = finished || getActiveSession();
|
||||
announceRaceFinishedHelper({ t, getActiveSession: () => session, pushOverlayEvent });
|
||||
scheduleResultsAutosave(session);
|
||||
if (!session || !state.settings.raceAudio?.enabled) return;
|
||||
triggerRaceAudio(session.type === "qualification" ? "qualifying_finished" : "race_finished", { interrupt: true, logData: { raceId: session.eventId, sessionId: session.id } });
|
||||
const podium = buildLeaderboard(session).slice(0, 3);
|
||||
@@ -1176,6 +1183,7 @@ const exportSeriesPdf = async (series, tables) => {
|
||||
};
|
||||
const renderSeries = () => renderSeriesView({ state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, deleteSeriesRaces, runSeriesSession, runSeriesSeeding, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound });
|
||||
const renderArchive = () => renderResultsArchiveView({
|
||||
getBackendUrl,
|
||||
state, dom, t, escapeHtml, formatLap, formatRaceClock, renderTable,
|
||||
getClassName, getEventName, buildLeaderboard, getCompetitorPassings,
|
||||
exportRaceResultsPdf, buildRacePackagePayload, downloadJsonFile, sanitizeFilenameSegment,
|
||||
@@ -1191,6 +1199,8 @@ const renderTraining = () => renderTrainingView({ addTrackLayout, state, dom, t,
|
||||
const saveCorrectionFor = (session) => () => {
|
||||
saveState();
|
||||
persistSessionResultToBackend(session?.id);
|
||||
// A correction to a finished heat saves its PDF again (the old one is overwritten).
|
||||
if (session?.status === "finished") scheduleResultsAutosave(session);
|
||||
};
|
||||
const applyCompetitorCorrection = (session, row, options = {}) => {
|
||||
const result = applyCompetitorCorrectionLogic(session, row, options, { ensureSessionResult, uid, t, formatLap, saveState: saveCorrectionFor(session) });
|
||||
@@ -3046,6 +3056,19 @@ const TRANSLATIONS = {
|
||||
"settings.save_branding": "Spara branding",
|
||||
"settings.club_name": "Klubbnamn",
|
||||
"settings.club_tagline": "Klubbtext",
|
||||
"settings.results_autosave": "Spara resultat automatiskt som PDF",
|
||||
"settings.results_autosave_hint": "Race Controller-datorn sparar resultatet som PDF på servern (data/results/<datum>) 10 s efter målgång. Listan finns i Resultatarkivet.",
|
||||
"settings.results_autosave_off": "Av",
|
||||
"settings.results_autosave_heats": "Varje heat (och slutresultatet)",
|
||||
"settings.results_autosave_finals": "Bara slutresultatet",
|
||||
"settings.results_auto_print": "Fråga om utskrift när finalerna är klara",
|
||||
"settings.results_auto_print_hint": "Visar en knapp Skriv ut resultat när sista finalen är klar (webbläsaren kan inte skriva ut helt utan klick).",
|
||||
"results.saved_notice": "📄 Resultat sparat: {name}",
|
||||
"results.finals_done": "🏁 Finalerna i {event} är klara",
|
||||
"results.print_now": "🖨 Skriv ut resultat",
|
||||
"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.",
|
||||
"settings.pdf_footer": "PDF-footer",
|
||||
"settings.pdf_theme": "PDF-tema",
|
||||
"settings.pdf_theme_classic": "Classic",
|
||||
@@ -5363,6 +5386,19 @@ const TRANSLATIONS = {
|
||||
"settings.save_branding": "Save branding",
|
||||
"settings.club_name": "Club name",
|
||||
"settings.club_tagline": "Club tagline",
|
||||
"settings.results_autosave": "Save results as PDF automatically",
|
||||
"settings.results_autosave_hint": "The race controller computer saves the result as a PDF on the server (data/results/<date>) 10 s after the finish. The list is in the Results archive.",
|
||||
"settings.results_autosave_off": "Off",
|
||||
"settings.results_autosave_heats": "Every heat (and the final results)",
|
||||
"settings.results_autosave_finals": "Final results only",
|
||||
"settings.results_auto_print": "Ask to print when the finals are done",
|
||||
"settings.results_auto_print_hint": "Shows a Print results button when the last final is done (a browser cannot print without a click).",
|
||||
"results.saved_notice": "📄 Result saved: {name}",
|
||||
"results.finals_done": "🏁 The finals of {event} are done",
|
||||
"results.print_now": "🖨 Print results",
|
||||
"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.",
|
||||
"settings.pdf_footer": "PDF footer",
|
||||
"settings.pdf_theme": "PDF theme",
|
||||
"settings.pdf_theme_classic": "Classic",
|
||||
@@ -6605,6 +6641,9 @@ function loadState() {
|
||||
clubTagline: parsed.settings?.clubTagline || "Live Timing & Race Control",
|
||||
pdfFooter: parsed.settings?.pdfFooter || "Generated by RC RaceCore",
|
||||
pdfTheme: parsed.settings?.pdfTheme || "classic",
|
||||
// Autopilot print: save results as PDF on the server by themselves ("off" | "heats" | "finals").
|
||||
resultsAutosave: ["heats", "finals"].includes(parsed.settings?.resultsAutosave) ? parsed.settings.resultsAutosave : "off",
|
||||
resultsAutoPrint: parsed.settings?.resultsAutoPrint === true,
|
||||
logoDataUrl: parsed.settings?.logoDataUrl || "",
|
||||
racePresets: Array.isArray(parsed.settings?.racePresets)
|
||||
? parsed.settings.racePresets.map((preset) => normalizeStoredRacePreset(preset)).filter((preset) => preset.name)
|
||||
@@ -6678,6 +6717,8 @@ function loadState() {
|
||||
clubTagline: "Live Timing & Race Control",
|
||||
pdfFooter: "Generated by RC RaceCore",
|
||||
pdfTheme: "classic",
|
||||
resultsAutosave: "off",
|
||||
resultsAutoPrint: false,
|
||||
logoDataUrl: "",
|
||||
racePresets: [],
|
||||
obsOverlay: normalizeObsOverlaySettings(),
|
||||
@@ -7742,6 +7783,51 @@ function updateConnectionBadge() {
|
||||
dom.connectionBadge.className = `badge ${isOnline ? "badge-online" : "badge-offline"}`;
|
||||
}
|
||||
|
||||
// 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).
|
||||
const resultsAutosaveTimers = new Map();
|
||||
const resultsPrintAsked = new Set(); // asked once per race, not again after a correction
|
||||
function scheduleResultsAutosave(session) {
|
||||
if (overlayMode || !session?.id || !isRaceMaster()) return;
|
||||
clearTimeout(resultsAutosaveTimers.get(session.id));
|
||||
resultsAutosaveTimers.set(session.id, setTimeout(() => { resultsAutosaveTimers.delete(session.id); runResultsAutosave(session.id).catch((error) => console.warn("results autosave failed", error)); }, 10000));
|
||||
}
|
||||
async function runResultsAutosave(sessionId) {
|
||||
const session = state.sessions.find((item) => item.id === sessionId);
|
||||
const event = state.events.find((item) => item.id === session?.eventId);
|
||||
const plan = resultsAutosavePlan({ mode: state.settings.resultsAutosave, autoPrint: state.settings.resultsAutoPrint, event, sessions: state.sessions, session });
|
||||
const save = async (payload) => {
|
||||
if (!payload) return;
|
||||
const response = await fetch(`${getBackendUrl()}/api/results/autosave`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ ...payload, date: event.date || "" }) });
|
||||
if (response.ok) showResultsNotice(t("results.saved_notice", { name: payload.filename.replace(/\.pdf$/i, "").replaceAll("_", " ") }));
|
||||
};
|
||||
if (plan.heat) await save(await buildHeatResultPdfPayload(event, session.id));
|
||||
if (plan.results) await save(await buildRaceResultsPdfPayload(event));
|
||||
if (plan.askPrint && !resultsPrintAsked.has(event.id)) resultsPrintAsked.add(event.id), showResultsNotice(t("results.finals_done", { event: event.name }), { printEventId: event.id });
|
||||
}
|
||||
let resultsNoticeTimer = null;
|
||||
function showResultsNotice(text, { printEventId = "" } = {}) {
|
||||
const el = document.getElementById("resultsNotice");
|
||||
if (!el) return;
|
||||
clearTimeout(resultsNoticeTimer);
|
||||
el.innerHTML = `<strong>${escapeHtml(text)}</strong>${printEventId ? `<button type="button" class="btn btn-primary btn-small" data-results-print="${escapeHtml(printEventId)}">${escapeHtml(t("results.print_now"))}</button>` : ""}<button type="button" class="btn btn-small" data-results-dismiss>${escapeHtml(t("results.dismiss"))}</button>`;
|
||||
el.hidden = false;
|
||||
// A saved-file note goes by itself; the print question stays until answered.
|
||||
if (!printEventId) resultsNoticeTimer = setTimeout(() => { if (!el.querySelector("[data-results-print]")) el.hidden = true; }, 8000);
|
||||
}
|
||||
if (!overlayMode) {
|
||||
document.addEventListener("click", (event) => {
|
||||
const target = event.target instanceof Element ? event.target : null;
|
||||
const printId = target?.closest("[data-results-print]")?.dataset.resultsPrint;
|
||||
if (printId) {
|
||||
const raceEvent = state.events.find((item) => item.id === printId);
|
||||
if (raceEvent) openPrintWindow(`${raceEvent.name} - ${t("events.results_overview")}`, buildRaceResultsHtml(raceEvent));
|
||||
}
|
||||
if (printId || target?.closest("[data-results-dismiss]")) document.getElementById("resultsNotice").hidden = true;
|
||||
});
|
||||
}
|
||||
|
||||
// Decoder alarm (decoder_watch.js): checked every second on the race master. Red banner, warning
|
||||
// sound repeated every 30 s until fixed or silenced, then 10 s of "working again, X s without timing".
|
||||
const decoderAlarmRuntime = { kind: "ok", since: 0, silenced: false, lastSoundAt: 0, backUntil: 0, backSeconds: 0 };
|
||||
@@ -8312,9 +8398,13 @@ async function exportRaceStartListsPdf(event) {
|
||||
}
|
||||
|
||||
async function exportRaceResultsPdf(event) {
|
||||
await requestPdfExport(await buildRaceResultsPdfPayload(event));
|
||||
}
|
||||
// The race's final results (standings and every heat) as a PDF payload.
|
||||
async function buildRaceResultsPdfPayload(event) {
|
||||
const branding = resolveEventBranding(event);
|
||||
const channelSections = getSessionsForEvent(event.id).flatMap((session) => buildSessionChannelPdfSections(session));
|
||||
await requestPdfExport({
|
||||
return ({
|
||||
filename: `${event.name.replaceAll(/\s+/g, "_")}_results.pdf`,
|
||||
title: event.name,
|
||||
subtitle: `${getClassName(event.classId)} • ${event.date || "-"}`,
|
||||
|
||||
Reference in new issue
Block a user