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
@@ -8,6 +8,13 @@ The application version is maintained in `package.json` and displayed in the adm
|
||||
|
||||
No changes recorded yet.
|
||||
|
||||
## 1.89.28 - 2026-11-14
|
||||
|
||||
### Added
|
||||
|
||||
- **Results as PDF automatically** (Settings → Appearance & overlay): every heat, or the final results only, saved on the server in `data/results/<date>/` 10 s after the finish by the race controller computer, again after a correction in Judging. The Results archive lists them under **📄 Saved PDFs**.
|
||||
- **Ask to print when the finals are done:** a **🖨 Print results** button appears when the last final is done.
|
||||
|
||||
## 1.89.27 - 2026-11-14
|
||||
|
||||
### Changed
|
||||
|
||||
@@ -322,6 +322,10 @@ The **Overlay** menu has leaderboard, speaker, results, TV and team modes, plus
|
||||
- automatic before every session start, plus manual ones;
|
||||
- the latest 30 are listed under Settings;
|
||||
- restore with `npm run backup:restore` (see [Installation](#restore-a-server-backup)).
|
||||
- **Results as PDF automatically** (Settings → Appearance & overlay → **Save results as PDF automatically**: Off / Every heat / Final results only):
|
||||
- The race controller computer saves the result 10 s after the finish in `data/results/<date>/`. After the last final the full results are saved too. A correction in Judging saves the file again.
|
||||
- Race Day shows "📄 Result saved", and the Results archive has the list **📄 Saved PDFs**. The files are not part of the server backup (that covers the database), so copy the folder to keep them long term.
|
||||
- **Ask to print when the finals are done** shows a **🖨 Print results** button when the last final is done. A browser cannot print without a click; for fully automatic printing start Chrome with `--kiosk-printing`, which prints straight to the default printer when the button is pressed.
|
||||
- **Export/import** (Settings → Storage):
|
||||
- full JSON, or the directory only (classes, drivers, cars);
|
||||
- CSV for drivers and cars (Excel/LibreOffice; comma, semicolon or tab). The CSV import merges: it matches on ID, then transponder, then name + class.
|
||||
|
||||
@@ -335,6 +335,10 @@ Menyn **Overlay** har lägena leaderboard, speaker, resultat, TV och lag, plus e
|
||||
- automatisk före varje sessionsstart, plus manuella;
|
||||
- de senaste 30 listas under Inställningar;
|
||||
- återställ med `npm run backup:restore` (se [Installation](#återställ-en-serverbackup)).
|
||||
- **Resultat som PDF automatiskt** (Inställningar → Utseende & overlay → **Spara resultat automatiskt som PDF**: Av / Varje heat / Bara slutresultatet):
|
||||
- Race Controller-datorn sparar resultatet 10 s efter målgång i `data/results/<datum>/`. Efter sista finalen sparas även hela slutresultatet. En rättning i Domarvyn sparar om filen.
|
||||
- Race Day visar "📄 Resultat sparat", och Resultatarkivet har listan **📄 Sparade PDF:er**. Filerna ingår inte i serverbackupen (den gäller databasen), så kopiera mappen om de ska sparas länge.
|
||||
- **Fråga om utskrift när finalerna är klara** visar knappen **🖨 Skriv ut resultat** när sista finalen är klar. En webbläsare kan inte skriva ut utan klick; vill du ha helt automatisk utskrift kan Chrome startas med `--kiosk-printing`, då skrivs det ut direkt på standardskrivaren när du trycker på knappen.
|
||||
- **Export/import** (Inställningar → Lagring):
|
||||
- full JSON, eller bara registret (klasser, förare, bilar);
|
||||
- CSV för förare och bilar (Excel/LibreOffice; komma, semikolon eller tab). CSV-importen slår ihop: den matchar på id, sedan transponder, sedan namn + klass.
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
<p id="syncWarning" class="sync-warning" role="status" hidden></p>
|
||||
<p id="controllerBanner" class="controller-banner" role="status" hidden></p>
|
||||
<div id="decoderAlarm" class="decoder-alarm" role="alert" hidden></div>
|
||||
<div id="resultsNotice" class="results-notice" role="status" hidden></div>
|
||||
<header class="topbar">
|
||||
<div>
|
||||
<h2 id="pageTitle">Dashboard</h2>
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.27",
|
||||
"version": "1.89.28",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.27",
|
||||
"version": "1.89.28",
|
||||
"hasInstallScript": true,
|
||||
"dependencies": {
|
||||
"better-sqlite3": "^12.11.1",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "rc-racecore",
|
||||
"version": "1.89.27",
|
||||
"version": "1.89.28",
|
||||
"private": true,
|
||||
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
|
||||
"engines": {
|
||||
|
||||
@@ -660,6 +660,46 @@ app.post("/api/passings/purge", (req, res) => {
|
||||
res.json({ ok: true, deleted: result.changes });
|
||||
});
|
||||
|
||||
// Results saved as PDF on their own (autopilot print): data/results/<date>/<file>.pdf. The race
|
||||
// browser sends the same payload as Export PDF; a newer version of a heat overwrites the old one.
|
||||
const RESULTS_PDF_DIR = path.join(DB_DIR, "results");
|
||||
const safeResultName = (value, fallback) => String(value || "").normalize("NFKD").replace(/[̀-ͯ]/g, "").replace(/[^A-Za-z0-9._-]+/g, "_").replace(/_{2,}/g, "_").replace(/^[._]+/, "").slice(0, 120) || fallback;
|
||||
app.post("/api/results/autosave", (req, res) => {
|
||||
try {
|
||||
const payload = normalizePdfExportPayload(req.body || {});
|
||||
const date = /^\d{4}-\d{2}-\d{2}$/.test(String(req.body?.date || "")) ? req.body.date : new Date().toISOString().slice(0, 10);
|
||||
const name = safeResultName(payload.filename.replace(/\.pdf$/i, ""), "results") + ".pdf";
|
||||
const dir = path.join(RESULTS_PDF_DIR, date);
|
||||
fs.mkdirSync(dir, { recursive: true });
|
||||
fs.writeFileSync(path.join(dir, name), buildStyledPdf(payload));
|
||||
res.json({ ok: true, date, name });
|
||||
} catch (error) {
|
||||
res.status(400).json({ error: error instanceof Error ? error.message : String(error) });
|
||||
}
|
||||
});
|
||||
app.get("/api/results/saved", (_req, res) => {
|
||||
const list = [];
|
||||
try {
|
||||
fs.readdirSync(RESULTS_PDF_DIR).filter((date) => /^\d{4}-\d{2}-\d{2}$/.test(date)).forEach((date) => {
|
||||
fs.readdirSync(path.join(RESULTS_PDF_DIR, date)).filter((name) => name.toLowerCase().endsWith(".pdf")).forEach((name) => {
|
||||
const stat = fs.statSync(path.join(RESULTS_PDF_DIR, date, name));
|
||||
list.push({ date, name, size: stat.size, savedAt: stat.mtimeMs });
|
||||
});
|
||||
});
|
||||
} catch { /* no results saved yet */ }
|
||||
res.json({ files: list.sort((a, b) => b.savedAt - a.savedAt).slice(0, 200) });
|
||||
});
|
||||
app.get("/api/results/saved/:date/:name", (req, res) => {
|
||||
const { date, name } = req.params;
|
||||
if (!/^\d{4}-\d{2}-\d{2}$/.test(date) || safeResultName(name, "") !== name || !name.toLowerCase().endsWith(".pdf")) {
|
||||
res.status(404).end();
|
||||
return;
|
||||
}
|
||||
const file = path.join(RESULTS_PDF_DIR, date, name);
|
||||
if (!fs.existsSync(file)) { res.status(404).end(); return; }
|
||||
res.type("application/pdf").sendFile(file);
|
||||
});
|
||||
|
||||
app.post("/api/export/pdf", (req, res) => {
|
||||
try {
|
||||
const payload = normalizePdfExportPayload(req.body || {});
|
||||
|
||||
+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 || "-"}`,
|
||||
|
||||
@@ -143,6 +143,7 @@ export function renderResultsArchiveView(deps) {
|
||||
getSelectedEventKey = () => "", setSelectedEventKey = () => {},
|
||||
getTrackLayoutLabel, renderRaceOverview = () => "", bindRaceOverview = () => {},
|
||||
getQualifyingPlaces = () => new Map(),
|
||||
getBackendUrl = () => "",
|
||||
} = deps;
|
||||
|
||||
const filters = getArchiveFilters();
|
||||
@@ -222,7 +223,26 @@ export function renderResultsArchiveView(deps) {
|
||||
</section>
|
||||
${selectedGroup.event ? renderRaceOverview(selectedGroup.event) : ""}` : ""}
|
||||
${shownRow ? renderArchiveDetail(shownRow, { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings, getQualifyingPlaces }) : ""}
|
||||
<section class="panel mt-16">
|
||||
<details id="archiveSavedPdfs" class="archive-saved-pdfs">
|
||||
<summary class="panel-header"><h3>📄 ${escapeHtml(t("results.saved_title"))}</h3></summary>
|
||||
<div class="panel-body" data-saved-pdfs>…</div>
|
||||
</details>
|
||||
</section>
|
||||
`;
|
||||
// The PDFs the autopilot saved on the server (results_autosave.js), loaded when opened.
|
||||
document.getElementById("archiveSavedPdfs")?.addEventListener("toggle", async (event) => {
|
||||
if (!event.currentTarget.open) return;
|
||||
const box = event.currentTarget.querySelector("[data-saved-pdfs]");
|
||||
try {
|
||||
const { files = [] } = await (await fetch(`${getBackendUrl()}/api/results/saved`)).json();
|
||||
box.innerHTML = files.length
|
||||
? `<ul class="archive-saved-list">${files.map((file) => `<li><a href="${escapeHtml(`${getBackendUrl()}/api/results/saved/${encodeURIComponent(file.date)}/${encodeURIComponent(file.name)}`)}" target="_blank" rel="noopener">${escapeHtml(file.name.replace(/\.pdf$/i, "").replaceAll("_", " "))}</a> <small>${escapeHtml(file.date)} · ${escapeHtml(new Date(file.savedAt).toLocaleTimeString())}</small></li>`).join("")}</ul>`
|
||||
: `<p class="hint">${escapeHtml(t("results.saved_none"))}</p>`;
|
||||
} catch {
|
||||
box.innerHTML = `<p class="hint">${escapeHtml(t("results.saved_none"))}</p>`;
|
||||
}
|
||||
});
|
||||
|
||||
const rerender = () => renderResultsArchiveView(deps);
|
||||
document.getElementById("archiveSearch")?.addEventListener("input", (event) => {
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
// Autopilot print: what to do when a heat finishes. Pure logic - the save, the notice and the
|
||||
// print button live in app.js. mode = settings.resultsAutosave ("off" | "heats" | "finals").
|
||||
// Only race events (and sponsor events) - not practice on the track.
|
||||
export function resultsAutosavePlan({ mode = "off", autoPrint = false, event = null, sessions = [], session = null } = {}) {
|
||||
const none = { heat: false, results: false, askPrint: false };
|
||||
if (!event || !session || session.status !== "finished" || (event.mode !== "race" && !event.sponsor)) return none;
|
||||
const finals = sessions.filter((item) => item.eventId === event.id && item.type === "final");
|
||||
const finalsDone = session.type === "final" && finals.length > 0 && finals.every((item) => item.status === "finished");
|
||||
return {
|
||||
heat: mode === "heats",
|
||||
results: finalsDone && mode !== "off",
|
||||
askPrint: finalsDone && autoPrint === true,
|
||||
};
|
||||
}
|
||||
@@ -166,6 +166,8 @@ export function applyPersistedStateHelper(persisted, deps) {
|
||||
clubTagline: migrateBrandDefault(persisted.settings?.clubTagline || state.settings.clubTagline, ["RC Timing System"], "Live Timing & Race Control"),
|
||||
pdfFooter: migrateBrandDefault(persisted.settings?.pdfFooter || state.settings.pdfFooter, ["Generated by JMK RB RaceController"], "Generated by RC RaceCore"),
|
||||
pdfTheme: persisted.settings?.pdfTheme || state.settings.pdfTheme || "classic",
|
||||
resultsAutosave: ["heats", "finals"].includes(persisted.settings?.resultsAutosave ?? state.settings.resultsAutosave) ? (persisted.settings?.resultsAutosave ?? state.settings.resultsAutosave) : "off",
|
||||
resultsAutoPrint: (persisted.settings?.resultsAutoPrint ?? state.settings.resultsAutoPrint) === true,
|
||||
logoDataUrl: persisted.settings?.logoDataUrl || state.settings.logoDataUrl || "",
|
||||
raceAudio: normalizeRaceAudioSettings(persisted.settings?.raceAudio || state.settings?.raceAudio),
|
||||
racePresets: Array.isArray(persisted.settings?.racePresets) ? persisted.settings.racePresets.map((preset) => normalizeStoredRacePreset(preset)).filter((preset) => preset.name) : Array.isArray(state.settings?.racePresets) ? state.settings.racePresets.map((preset) => normalizeStoredRacePreset(preset)).filter((preset) => preset.name) : [],
|
||||
|
||||
@@ -297,6 +297,8 @@ export function renderSettings(deps) {
|
||||
<label><span>${t("settings.club_name")}</span><input name="clubName" form="settingsForm" value="${escapeHtml(state.settings.clubName || "")}" placeholder="JMK RB" /></label>
|
||||
<label><span>${t("settings.club_tagline")}</span><input name="clubTagline" form="settingsForm" value="${escapeHtml(state.settings.clubTagline || "")}" placeholder="Live Timing & Race Control" /></label>
|
||||
<label><span>${t("settings.pdf_footer")}</span><input name="pdfFooter" form="settingsForm" value="${escapeHtml(state.settings.pdfFooter || "")}" placeholder="Generated by RC RaceCore" /></label>
|
||||
<label title="${t("settings.results_autosave_hint")}"><span>${t("settings.results_autosave")}</span><select name="resultsAutosave" form="settingsForm">${["off", "heats", "finals"].map((value) => `<option value="${value}" ${(state.settings.resultsAutosave || "off") === value ? "selected" : ""}>${t("settings.results_autosave_" + value)}</option>`).join("")}</select></label>
|
||||
<label class="toggle" title="${t("settings.results_auto_print_hint")}"><input type="checkbox" name="resultsAutoPrint" form="settingsForm" ${state.settings.resultsAutoPrint ? "checked" : ""} /><span>${t("settings.results_auto_print")}</span></label>
|
||||
<label><span>${t("settings.pdf_theme")}</span><select name="pdfTheme" form="settingsForm">
|
||||
<option value="classic" ${state.settings.pdfTheme === "classic" ? "selected" : ""}>${t("settings.pdf_theme_classic")}</option>
|
||||
<option value="minimal" ${state.settings.pdfTheme === "minimal" ? "selected" : ""}>${t("settings.pdf_theme_minimal")}</option>
|
||||
@@ -754,6 +756,8 @@ Erik Eriksson;654321;4WD;Associated;;</code></pre>
|
||||
state.settings.clubName = String(form.get("clubName") || "").trim() || "JMK RB";
|
||||
state.settings.clubTagline = String(form.get("clubTagline") || "").trim() || "Live Timing & Race Control";
|
||||
state.settings.pdfFooter = String(form.get("pdfFooter") || "").trim() || "Generated by RC RaceCore";
|
||||
state.settings.resultsAutosave = ["heats", "finals"].includes(String(form.get("resultsAutosave"))) ? String(form.get("resultsAutosave")) : "off";
|
||||
state.settings.resultsAutoPrint = form.get("resultsAutoPrint") === "on";
|
||||
state.settings.pdfTheme = ["classic", "minimal", "motorsport"].includes(String(form.get("pdfTheme") || "classic"))
|
||||
? String(form.get("pdfTheme"))
|
||||
: "classic";
|
||||
|
||||
@@ -5077,3 +5077,11 @@ tr.is-selected td { background: color-mix(in srgb, var(--danger) 12%, transparen
|
||||
/* A driver's country flag before the name (src/flags, local SVG). */
|
||||
.country-flag { display: inline-block; width: 1.25em; height: 0.94em; margin-right: 0.4em; vertical-align: -0.08em; border-radius: 2px; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.25); object-fit: cover; }
|
||||
.nowrap { white-space: nowrap; }
|
||||
|
||||
/* Autopilot print: "Result saved" / "Finals done - Print results" (results_autosave.js). */
|
||||
.results-notice { display: flex; flex-wrap: wrap; align-items: center; gap: 8px 12px; margin: 0 0 10px; padding: 10px 14px; border: 1px solid #2fa84f; border-radius: 8px; background: color-mix(in srgb, #2fa84f 14%, var(--panel)); color: var(--text); }
|
||||
.results-notice[hidden] { display: none; }
|
||||
.results-notice strong { flex: 1 1 240px; }
|
||||
.archive-saved-pdfs > summary { cursor: pointer; list-style: none; }
|
||||
.archive-saved-pdfs > summary::-webkit-details-marker { display: none; }
|
||||
.archive-saved-list { margin: 0; padding-left: 18px; display: grid; gap: 4px; }
|
||||
@@ -0,0 +1,23 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import { resultsAutosavePlan } from "../src/results_autosave.js";
|
||||
|
||||
const event = { id: "e1", mode: "race" };
|
||||
const heat = { id: "q1", eventId: "e1", type: "qualification", status: "finished" };
|
||||
const finals = [{ id: "a1", eventId: "e1", type: "final", status: "finished" }, { id: "a2", eventId: "e1", type: "final", status: "ready" }];
|
||||
|
||||
test("every heat: the heat's PDF; the last final also gives the full results and the print question", () => {
|
||||
assert.deepEqual(resultsAutosavePlan({ mode: "heats", event, sessions: [heat, ...finals], session: heat }), { heat: true, results: false, askPrint: false });
|
||||
assert.deepEqual(resultsAutosavePlan({ mode: "heats", autoPrint: true, event, sessions: [heat, ...finals], session: finals[0] }), { heat: true, results: false, askPrint: false }, "A2 still to run");
|
||||
const done = finals.map((item) => ({ ...item, status: "finished" }));
|
||||
assert.deepEqual(resultsAutosavePlan({ mode: "heats", autoPrint: true, event, sessions: [heat, ...done], session: done[1] }), { heat: true, results: true, askPrint: true });
|
||||
});
|
||||
|
||||
test("final results only, off, and practice on the track", () => {
|
||||
const done = finals.map((item) => ({ ...item, status: "finished" }));
|
||||
assert.deepEqual(resultsAutosavePlan({ mode: "finals", event, sessions: done, session: heat }), { heat: false, results: false, askPrint: false });
|
||||
assert.deepEqual(resultsAutosavePlan({ mode: "finals", event, sessions: done, session: done[1] }), { heat: false, results: true, askPrint: false });
|
||||
assert.deepEqual(resultsAutosavePlan({ mode: "off", autoPrint: true, event, sessions: done, session: done[1] }), { heat: false, results: false, askPrint: true }, "print question without saving");
|
||||
assert.equal(resultsAutosavePlan({ mode: "heats", event: { id: "t", mode: "track" }, sessions: [], session: { ...heat, eventId: "t" } }).heat, false);
|
||||
assert.equal(resultsAutosavePlan({ mode: "heats", event, sessions: [], session: { ...heat, status: "running" } }).heat, false);
|
||||
});
|
||||
@@ -58,3 +58,4 @@ import "./country_flags.test.js";
|
||||
import "./pdf_flags.test.js";
|
||||
import "./local_fonts.test.js";
|
||||
import "./decoder_watch.test.js";
|
||||
import "./results_autosave.test.js";
|
||||
@@ -567,6 +567,35 @@ test("PDF export renders Swedish åäö/ÅÄÖ correctly instead of mojibake", {
|
||||
}
|
||||
});
|
||||
|
||||
test("autopilot print: a result PDF is saved on the server, listed and served, a newer one overwrites it", { timeout: 20000 }, async () => {
|
||||
const dataDir = mkdtempSync(join(tmpdir(), "live-rc-test-autosave-"));
|
||||
const port = await reservePort();
|
||||
const baseUrl = `http://127.0.0.1:${port}`;
|
||||
const child = spawn(process.execPath, [join(projectRoot, "server.js")], {
|
||||
cwd: projectRoot,
|
||||
env: { ...process.env, HOST: "127.0.0.1", PORT: String(port), RC_TIMING_DATA_DIR: dataDir, RC_TIMING_PID_FILE: "" },
|
||||
stdio: ["ignore", "pipe", "pipe"],
|
||||
});
|
||||
try {
|
||||
await waitForServer(child);
|
||||
const save = (rows) => fetch(`${baseUrl}/api/results/autosave`, { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ date: "2026-11-14", title: "Klubbrace", filename: "Klubbrace_åäö_A_final_1.pdf", sections: [{ title: "A final 1", headers: ["Pos", "Förare"], rows }] }) });
|
||||
const first = await (await save([["1", "Roy"]])).json();
|
||||
assert.deepEqual(first, { ok: true, date: "2026-11-14", name: "Klubbrace_aao_A_final_1.pdf" });
|
||||
await save([["1", "Anders"]]);
|
||||
const { files } = await (await fetch(`${baseUrl}/api/results/saved`)).json();
|
||||
assert.equal(files.length, 1, "the newer version overwrote the old one");
|
||||
const pdf = await fetch(`${baseUrl}/api/results/saved/2026-11-14/Klubbrace_aao_A_final_1.pdf`);
|
||||
assert.equal(pdf.headers.get("content-type"), "application/pdf");
|
||||
assert.ok(Buffer.from(await pdf.arrayBuffer()).toString("latin1").includes("Anders"));
|
||||
assert.ok(existsSync(join(dataDir, "results", "2026-11-14", "Klubbrace_aao_A_final_1.pdf")));
|
||||
assert.equal((await fetch(`${baseUrl}/api/results/saved/2026-11-14/..%2F..%2Frc_timing.sqlite`)).status, 404, "no way out of the results folder");
|
||||
assert.equal((await fetch(`${baseUrl}/api/results/saved/x/a.pdf`)).status, 404);
|
||||
} finally {
|
||||
await stopServer(child);
|
||||
rmSync(dataDir, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
test("an admin PIN blocks unauthenticated writes, and the login cookie lets them through", { timeout: 20000 }, async () => {
|
||||
const dataDir = mkdtempSync(join(tmpdir(), "live-rc-test-auth-"));
|
||||
const port = await reservePort();
|
||||
|
||||
Reference in new issue
Block a user