From bea428313047aeba7520ce6e1b1862e814b50487 Mon Sep 17 00:00:00 2001 From: larssand Date: Fri, 6 Nov 2026 23:43:42 +0100 Subject: [PATCH] fix(archive): show qualifying place and TQ when viewing a final heat (1.74.1) --- CHANGELOG.md | 5 +++++ package-lock.json | 4 ++-- package.json | 2 +- src/app.js | 3 ++- src/results_archive_view.js | 13 +++++++++---- tests/browser_archive_qual.js | 34 ++++++++++++++++++++++++++++++++++ tests/browser_smoke.js | 2 ++ 7 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 tests/browser_archive_qual.js diff --git a/CHANGELOG.md b/CHANGELOG.md index 96c8734..678fb51 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.74.1 + +### Fixed +- Results archive: "View" on a single final heat now also shows the Qual. column with TQ, not only the race overview. + ## 1.74.0 ### Added diff --git a/package-lock.json b/package-lock.json index 72a0487..6a9dc5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.74.0", + "version": "1.74.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.74.0", + "version": "1.74.1", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index dc672d5..3f82430 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.74.0", + "version": "1.74.1", "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 be18b59..e764d02 100644 --- a/src/app.js +++ b/src/app.js @@ -10,7 +10,7 @@ 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, withQualifyingPlaces } from "./race_overview_logic.js"; +import { buildRaceOverview, buildRaceOverviewCsvRows, withQualifyingPlaces, qualifyingPlaces } 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"; @@ -1057,6 +1057,7 @@ const renderArchive = () => renderResultsArchiveView({ getSelectedSessionId: () => archiveSelectedSessionId, setSelectedSessionId: (value) => { archiveSelectedSessionId = value; }, getSelectedEventKey: () => archiveSelectedEventKey, setSelectedEventKey: (value) => { archiveSelectedEventKey = value; }, getTrackLayoutLabel, renderRaceOverview: renderRaceOverviewFor, bindRaceOverview: bindRaceOverviewFor, + getQualifyingPlaces: (session, event) => (session?.type === "final" && event ? qualifyingPlaces(buildQualifyingStandings(event)) : new Map()), }); 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 diff --git a/src/results_archive_view.js b/src/results_archive_view.js index 75a31be..6ba85c0 100644 --- a/src/results_archive_view.js +++ b/src/results_archive_view.js @@ -1,4 +1,4 @@ -import { medal } from "./medal.js"; +import { medal, qualCell } from "./medal.js"; import { sortableTable, sortValuesAttribute } from "./list_sorting.js"; export function buildArchiveRows(state, { getEventName, getClassName, getTrackLayoutLabel, buildLeaderboard }) { @@ -56,9 +56,12 @@ function matchesArchiveFilters(row, filters) { } function renderArchiveDetail(row, deps) { - const { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings } = deps; + const { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings, getQualifyingPlaces = () => new Map() } = deps; const { session, event, result } = row; const leaderboard = buildLeaderboard(session); + // A final heat shows where each driver qualified ("TQ" for the top qualifier). + const qualPlaces = getQualifyingPlaces(session, event); + const withQual = leaderboard.some((rowItem) => qualPlaces.get(rowItem.driverId)); const adjustments = result?.adjustments || []; return `
@@ -74,10 +77,11 @@ function renderArchiveDetail(row, deps) {

${t("archive.standings")}

${leaderboard.length ? renderTable( - [t("table.pos"), t("table.driver"), t("table.laps"), t("table.best_lap"), t("timing.total_time")], + [t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), t("table.laps"), t("table.best_lap"), t("timing.total_time")], leaderboard.map((rowItem, index) => ` ${medal(index + 1)} + ${withQual ? qualCell(qualPlaces.get(rowItem.driverId), escapeHtml) : ""} ${escapeHtml(rowItem.displayName || rowItem.driverName || t("common.unknown_driver"))} ${rowItem.laps} ${formatLap(rowItem.bestLapMs)} @@ -138,6 +142,7 @@ export function renderResultsArchiveView(deps) { getArchiveFilters, setArchiveFilters, getSelectedSessionId, setSelectedSessionId, getSelectedEventKey = () => "", setSelectedEventKey = () => {}, getTrackLayoutLabel, renderRaceOverview = () => "", bindRaceOverview = () => {}, + getQualifyingPlaces = () => new Map(), } = deps; const filters = getArchiveFilters(); @@ -216,7 +221,7 @@ export function renderResultsArchiveView(deps) {

${t("archive.heats")}

${heatList}
${selectedGroup.event ? renderRaceOverview(selectedGroup.event) : ""}` : ""} - ${shownRow ? renderArchiveDetail(shownRow, { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings }) : ""} + ${shownRow ? renderArchiveDetail(shownRow, { t, escapeHtml, formatLap, formatRaceClock, renderTable, buildLeaderboard, getCompetitorPassings, getQualifyingPlaces }) : ""} `; const rerender = () => renderResultsArchiveView(deps); diff --git a/tests/browser_archive_qual.js b/tests/browser_archive_qual.js new file mode 100644 index 0000000..0c4633f --- /dev/null +++ b/tests/browser_archive_qual.js @@ -0,0 +1,34 @@ +import assert from "node:assert/strict"; + +// Results archive: "View" on a race shows the race overview, "View" on a final heat shows the +// heat - both with each driver's qualifying place and TQ for the top qualifier. +export async function runArchiveQualifyingSmoke({ evaluate, navigate, savedState, waitFor, base }) { + const seeded = await savedState(); + const startedAt = Date.now() - 30 * 86400000; + const event = { id: "aq_event", name: "AQ Cup", mode: "race", date: new Date(startedAt).toISOString().slice(0, 10), raceConfig: {} }; + const heat = (id, name, type, offset) => ({ id, eventId: event.id, name, type, mode: "race", status: "finished", durationMin: 5, startedAt: startedAt + offset, endedAt: startedAt + offset + 300000, driverIds: ["AQ Pole", "AQ Winner"] }); + const competitor = (id, laps, offset) => ({ key: id, driverId: id, driverName: id, displayName: id, transponder: id, laps, bestLapMs: 18000, lastLapMs: 18000, startTimestamp: startedAt + offset, lastTimestamp: startedAt + offset + 300000 }); + const sessions = [heat("aq_q1", "Q1 H1", "qualification", 0), heat("aq_f1", "A Final", "final", 1200000)]; + await fetch(base + "/api/state", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify({ + ...seeded, + drivers: [...seeded.drivers, { id: "AQ Pole", name: "AQ Pole", transponder: "8560001" }, { id: "AQ Winner", name: "AQ Winner", transponder: "8560002" }], + events: [...seeded.events, event], + sessions: [...seeded.sessions.map((session) => (["running", "paused"].includes(session.status) ? { ...session, status: "finished", endedAt: Date.now() } : session)), ...sessions], + resultsBySession: { + ...seeded.resultsBySession, + aq_q1: { passings: [], adjustments: [], competitors: { "AQ Pole": competitor("AQ Pole", 17, 0), "AQ Winner": competitor("AQ Winner", 16, 0) } }, + aq_f1: { passings: [], adjustments: [], competitors: { "AQ Winner": competitor("AQ Winner", 17, 1200000), "AQ Pole": competitor("AQ Pole", 16, 1200000) } }, + }, + activeSessionId: null, + }) }); + + await navigate("archive", "archiveDriverFilter"); + await waitFor(async () => evaluate(`Boolean(document.querySelector('[data-archive-event="aq_event"]'))`), "the race is in the archive"); + await evaluate(`document.querySelector('[data-archive-event="aq_event"]').click()`); + await waitFor(async () => evaluate(`Boolean(document.querySelector('[data-archive-open="aq_f1"]'))`), "the final heat is listed"); + await evaluate(`document.querySelector('[data-archive-open="aq_f1"]').click()`); + await waitFor(async () => evaluate(`Boolean(document.querySelector(".archive-detail .tq-badge"))`), "the final heat shows TQ"); + const rows = await evaluate(`[...document.querySelectorAll(".archive-detail tbody tr")].slice(0, 2).map((row) => [...row.children].slice(0, 3).map((cell) => cell.textContent.trim()))`); + assert.deepEqual(rows, [["1", "2", "AQ Winner"], ["2", "TQ", "AQ Pole"]], "winner qualified 2nd, the pole sitter finished 2nd"); + console.log("PASS results archive: a final heat shows each driver's qualifying place with TQ for the top qualifier"); +} diff --git a/tests/browser_smoke.js b/tests/browser_smoke.js index 27a360a..9b40fb3 100644 --- a/tests/browser_smoke.js +++ b/tests/browser_smoke.js @@ -14,6 +14,7 @@ import { runPrologueSmoke } from "./browser_prologue.js"; import { runPracticeResetSmoke } from "./browser_practice_reset.js"; import { runPracticeRankingSmoke, runSpeakerPanelSmoke } from "./browser_practice_ranking.js"; import { runJudgingAfterRaceSmoke } from "./browser_judging_after.js"; +import { runArchiveQualifyingSmoke } from "./browser_archive_qual.js"; import { runSuspectLapsSmoke } from "./browser_suspect_laps.js"; import { runOverlayDriverLinkSmoke } from "./browser_overlay_driver_link.js"; import { runProfileClassSmoke } from "./browser_profile_class.js"; @@ -171,6 +172,7 @@ try { await runPracticeRankingSmoke({ evaluate, navigate, savedState, waitFor, base }); await runSpeakerPanelSmoke({ evaluate, navigate, savedState, waitFor }); await runJudgingAfterRaceSmoke({ evaluate, navigate, savedState, waitFor, base, dialogs }); + await runArchiveQualifyingSmoke({ evaluate, navigate, savedState, waitFor, base }); await runSuspectLapsSmoke({ evaluate, navigate, savedState, waitFor, base, dialogs }); await runOverlayDriverLinkSmoke({ evaluate, navigate, savedState, waitFor, base, send }); await runDecoderClockSmoke({ evaluate, navigate, savedState, waitFor, base });