feat(results): race overview on Race Day and an event-grouped results archive (1.66.0)
This commit is contained in:
1 parent
31ac04616a
commit
69a65748ce
12 files changed
+321
-30
No files matched your search
+60
-4
@@ -9,6 +9,8 @@ import { recordTransponderSighting, buildWarmupCheck, createPrologue, getPrologu
|
||||
import { findTransponderConflict, getDriverProfileId } from "./driver_profile_logic.js";
|
||||
import { renderRaceDayView, refreshRaceDayWarmup, refreshRaceDayPrologueClock, updateRaceDayStartDisplay, refreshRaceDayLive } from "./race_day_view.js";
|
||||
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 { 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";
|
||||
@@ -139,7 +141,23 @@ const getFinalMainLayouts = (event) => getFinalMainLayoutsHelper(event, { getSes
|
||||
const renderFinalMatrix = (event) => renderFinalMatrixHelper(event, { t, escapeHtml, getFinalMainLayouts, getStatusLabel });
|
||||
const buildPrintBrandBlock = (branding) => buildPrintBrandBlockHelper(branding, { escapeHtml });
|
||||
const buildRaceStartListsHtml = (event) => buildRaceStartListsHtmlHelper(event, { t, state, escapeHtml, resolveEventBranding, getSessionsForEvent, getSessionSortWeight, getClassName, buildPrintBrandBlock, getSessionGridEntries, getSessionTypeLabel, getStartModeLabel, renderTable, buildEventSchedule });
|
||||
const buildRaceResultsHtml = (event) => buildRaceResultsHtmlHelper(event, { t, escapeHtml, resolveEventBranding, getClassName, buildPrintBrandBlock, renderRaceStandingsTableView, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings, renderTeamRaceStandings, getSessionsForEvent, renderSessionChannelAnalysis });
|
||||
const buildRaceResultsHtml = (event) => buildRaceResultsHtmlHelper(event, { t, escapeHtml, resolveEventBranding, getClassName, buildPrintBrandBlock, renderRaceStandingsTableView, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings, renderTeamRaceStandings, getSessionsForEvent, renderSessionChannelAnalysis, renderHeatResults: (event) => renderRaceOverviewHeatsHtml(event) });
|
||||
// Race overview (Race Day and the results archive): the whole race, with print, PDF and CSV.
|
||||
const getRaceOverview = (event) => buildRaceOverview(event, { sessions: getSessionsForEvent(event?.id), cars: state.cars, buildLeaderboard, buildPracticeStandings, buildQualifyingStandings, buildFinalStandings });
|
||||
const raceOverviewPhaseLabel = (type) => t(`race_overview.phase_${type}`);
|
||||
const renderRaceOverviewFor = (event) => (event ? renderRaceOverviewPanel(getRaceOverview(event), { t, escapeHtml, formatLap, renderTable, renderRaceStandingsTableView, phaseLabel: raceOverviewPhaseLabel, getStatusLabel }) : "");
|
||||
const bindRaceOverviewFor = (root, event) => event && bindRaceOverviewPanel(root, getRaceOverview(event), {
|
||||
print: () => openPrintWindow(`${event.name} - ${t("events.results_overview")}`, buildRaceResultsHtml(event)),
|
||||
pdf: () => exportRaceResultsPdf(event),
|
||||
csv: (overview) => downloadCsvFile(`${sanitizeFilenameSegment(event.name)}_race_overview.csv`, buildRaceOverviewCsvRows(overview, { t, formatLap, phaseLabel: raceOverviewPhaseLabel })),
|
||||
});
|
||||
// Every heat's result, for the printed results overview.
|
||||
const renderRaceOverviewHeatsHtml = (event) => (getRaceOverview(event)?.phases || []).flatMap((phase) => phase.heats.map(({ session, rows }) => `
|
||||
<section class="print-block">
|
||||
<h2>${escapeHtml(raceOverviewPhaseLabel(phase.type))} • ${escapeHtml(session.name)}</h2>
|
||||
${renderTable([t("table.pos"), t("table.driver"), ...(rows.some((row) => row.car) ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")],
|
||||
rows.map((row) => `<tr><td>${row.pos}</td><td>${escapeHtml(row.name)}</td>${rows.some((item) => item.car) ? `<td>${escapeHtml(row.car || "-")}</td>` : ""}<td>${row.laps}</td><td>${escapeHtml(row.result)}</td><td>${row.bestLapMs ? escapeHtml(formatLap(row.bestLapMs)) : "-"}</td></tr>`))}
|
||||
</section>`)).join("");
|
||||
const getSessionsForEvent = (eventId) => getSessionsForEventHelper(state, eventId);
|
||||
const getModeLabel = (mode) => getModeLabelHelper(mode, { t });
|
||||
const normalizeStartMode = (mode) => normalizeStartModeHelper(mode);
|
||||
@@ -718,6 +736,8 @@ const renderRaceDay = () => renderRaceDayView({
|
||||
buildLeaderboard, getSessionTargetMs, formatRaceClock,
|
||||
renderDaySchedule, bindDaySchedule, renderDayCall, bindDayCall,
|
||||
setCompetitorLapStatus,
|
||||
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,
|
||||
getEventName, getSessionTypeLabel, getStatusLabel, getStartModeLabel,
|
||||
getSessionTiming, getSessionGridEntries, buildRaceDayQueue, buildRaceDayPreflight,
|
||||
@@ -1015,7 +1035,8 @@ const renderArchive = () => renderResultsArchiveView({
|
||||
exportRaceResultsPdf, buildRacePackagePayload, downloadJsonFile, sanitizeFilenameSegment,
|
||||
getArchiveFilters: () => archiveFilters, setArchiveFilters: (value) => { archiveFilters = value; },
|
||||
getSelectedSessionId: () => archiveSelectedSessionId, setSelectedSessionId: (value) => { archiveSelectedSessionId = value; },
|
||||
getTrackLayoutLabel,
|
||||
getSelectedEventKey: () => archiveSelectedEventKey, setSelectedEventKey: (value) => { archiveSelectedEventKey = value; },
|
||||
getTrackLayoutLabel, renderRaceOverview: renderRaceOverviewFor, bindRaceOverview: bindRaceOverviewFor,
|
||||
});
|
||||
const renderTraining = () => renderTrainingView({ addTrackLayout, state, dom, t, escapeHtml, formatLap, formatRaceClock, uid, saveState, syncStateToBackend, renderView, normalizeTrainingState, syncTrainingLedger, buildDriverTrainingStats, buildDriverTimingChannelStats: buildDriverTimingChannelStatsLogic, buildDriverActivePracticeStats, buildEvenLapsProgress, buildStepTrainingProgress, buildTrainingRecommendation, getTrainingGoalProgress, getNextTrainingMilestone, buildTrainingMissions: buildTrainingMissionsLogic, buildTrainingHighlights: buildTrainingHighlightsLogic, getClubTrainingGoalProgress: getClubTrainingGoalProgressLogic, countDriverExerciseSessions: countDriverExerciseSessionsLogic, countExerciseSessions: countExerciseSessionsLogic, buildTrainingPaceBuckets: buildTrainingPaceBucketsLogic, buildTrainingWeekdayStats: buildTrainingWeekdayStatsLogic, buildTrainingStintAnalysis: buildTrainingStintAnalysisLogic, buildTrainingMarkerComparisons: buildTrainingMarkerComparisonsLogic, isInitialLoadDone: () => initialLoadDone, openPublicAddressSettings: () => { openSettingsTab("system", "settingsPublicAddress"); navigateToView("settings"); }, getSelectedDriverId: () => selectedTrainingDriverId, setSelectedDriverId: (value) => { selectedTrainingDriverId = value; updateViewUrl("training", value, selectedTrainingClassId); }, getSelectedClassId: () => selectedTrainingClassId, setSelectedClassId: (value) => { selectedTrainingClassId = value; updateViewUrl("training", selectedTrainingDriverId, value); } });
|
||||
// Judge corrections are saved as usual and also pushed as this session's result, so the
|
||||
@@ -1352,7 +1373,8 @@ const TRANSLATIONS = {
|
||||
"nav.archive": "Resultatarkiv",
|
||||
"nav.archive_sub": "Sök avslutade race utan att gå via Race Setup",
|
||||
"archive.title": "Resultatarkiv",
|
||||
"archive.hint": "Sök bland alla avslutade sessioner efter datum, klass eller förare.",
|
||||
"archive.hint": "Ett race per rad. Välj ett race för att se hela översikten, alla heat och exportera.",
|
||||
"archive.heats": "Heat",
|
||||
"archive.search": "Sök",
|
||||
"archive.search_placeholder": "Event- eller sessionsnamn",
|
||||
"archive.class": "Klass",
|
||||
@@ -2812,6 +2834,18 @@ const TRANSLATIONS = {
|
||||
"session.qualification": "kval",
|
||||
"session.heat": "heat",
|
||||
"session.final": "final",
|
||||
"race_overview.title": "Race-översikt – {name}",
|
||||
"race_overview.hint": "Hela racet på ett ställe: ställning och varje heat för träning, kval och finaler.",
|
||||
"race_overview.print": "Skriv ut",
|
||||
"race_overview.car": "Bil",
|
||||
"race_overview.total": "Total",
|
||||
"race_overview.standings": "Ställning",
|
||||
"race_overview.heats_done": "{done} av {total} heat klara",
|
||||
"race_overview.no_results": "Inga resultat än.",
|
||||
"race_overview.not_run": "Inte körd än.",
|
||||
"race_overview.phase_practice": "Träning",
|
||||
"race_overview.phase_qualification": "Kval",
|
||||
"race_overview.phase_final": "Finaler",
|
||||
"session.team_race": "lagrace",
|
||||
"validation.no_assignments": "Ingen förar-/biltilldelning i denna session.",
|
||||
"validation.missing_tp": "En eller flera tilldelade bilar saknar transponder-ID.",
|
||||
@@ -3384,7 +3418,8 @@ const TRANSLATIONS = {
|
||||
"nav.archive": "Results archive",
|
||||
"nav.archive_sub": "Search completed races without going through Race Setup",
|
||||
"archive.title": "Results archive",
|
||||
"archive.hint": "Search all completed sessions by date, class or driver.",
|
||||
"archive.hint": "One race per row. Pick a race to see the whole overview, every heat and export.",
|
||||
"archive.heats": "Heats",
|
||||
"archive.search": "Search",
|
||||
"archive.search_placeholder": "Event or session name",
|
||||
"archive.class": "Class",
|
||||
@@ -4844,6 +4879,18 @@ const TRANSLATIONS = {
|
||||
"session.qualification": "qualification",
|
||||
"session.heat": "heat",
|
||||
"session.final": "final",
|
||||
"race_overview.title": "Race overview – {name}",
|
||||
"race_overview.hint": "The whole race in one place: standings and every heat for practice, qualifying and finals.",
|
||||
"race_overview.print": "Print",
|
||||
"race_overview.car": "Car",
|
||||
"race_overview.total": "Total",
|
||||
"race_overview.standings": "Standings",
|
||||
"race_overview.heats_done": "{done} of {total} heats done",
|
||||
"race_overview.no_results": "No results yet.",
|
||||
"race_overview.not_run": "Not run yet.",
|
||||
"race_overview.phase_practice": "Practice",
|
||||
"race_overview.phase_qualification": "Qualifying",
|
||||
"race_overview.phase_final": "Finals",
|
||||
"session.team_race": "team race",
|
||||
"validation.no_assignments": "No driver/car assignments in this session.",
|
||||
"validation.missing_tp": "One or more assigned cars are missing transponder ID.",
|
||||
@@ -5375,6 +5422,7 @@ let raceWizardStep = 1;
|
||||
let raceWizardDraft = null;
|
||||
let archiveFilters = { search: "", classId: "", driverId: "", dateFrom: "", dateTo: "" };
|
||||
let archiveSelectedSessionId = "";
|
||||
let archiveSelectedEventKey = "";
|
||||
let overlaySyncTimer = null;
|
||||
let overlayRotationTimer = null;
|
||||
let overlayLiveRefreshTimer = null;
|
||||
@@ -7339,6 +7387,14 @@ async function exportRaceResultsPdf(event) {
|
||||
[t("table.pos"), t("table.driver"), t("table.score")],
|
||||
buildFinalStandings(event).map((row) => [String(row.rank), row.driverName || "-", row.score || "-"])
|
||||
),
|
||||
...(getRaceOverview(event)?.phases || []).flatMap((phase) => phase.heats.map(({ session, rows }) => {
|
||||
const withCar = rows.some((row) => row.car);
|
||||
return buildPdfSection(
|
||||
`${raceOverviewPhaseLabel(phase.type)} • ${session.name}`,
|
||||
[t("table.pos"), t("table.driver"), ...(withCar ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")],
|
||||
rows.map((row) => [String(row.pos), row.name, ...(withCar ? [row.car || "-"] : []), String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "-"])
|
||||
);
|
||||
})),
|
||||
...buildTeamRaceStandings(event).map(({ session, rows }) =>
|
||||
buildPdfSection(
|
||||
`${t("events.team_standings")} • ${session.name}`,
|
||||
|
||||
Reference in new issue
Block a user