feat(drivers): country flag before the driver's name in timing, overlay, results, printouts and PDF (1.89.20)
This commit is contained in:
1 parent
da20a7e978
commit
6e45918e74
101 files changed
+2898
-45
No files matched your search
+31
-13
@@ -11,6 +11,7 @@ import { findHouseOfRcAutoSends } from "./houseofrc_logic.js";
|
||||
import { sendHouseOfRcResults, renderHouseOfRcSendStatus } from "./houseofrc_view.js";
|
||||
import { recordTransponderSighting, buildWarmupCheck, createPrologue, getPrologueRemainingMs, holdPrologue, resumePrologue, setPrologueRemaining, takeDuePrologueCall, formatPrologueTime, getPrologueHandoverMs, normalizePrologueSec, getPrologueMarks } from "./prologue_logic.js";
|
||||
import { findTransponderConflict, getDriverProfileId } from "./driver_profile_logic.js";
|
||||
import { flagHtml, driverCountryCode, countryChoices, setDriverCountryResolver, rowFlag } from "./country_flags.js";
|
||||
import { renderRaceDayView, refreshRaceDayWarmup, refreshRaceDayPrologueClock, updateRaceDayStartDisplay, refreshRaceDayLive } from "./race_day_view.js";
|
||||
import { normalizeRaceDays, getRaceDay, upsertRaceDay, orderDaySessions, buildDaySchedule, getAutopilotAction, moveInDayOrder, pickBoardDate, getDueCall, withRaceSetupStart, eventScheduleFromDayRows } from "./day_schedule_logic.js";
|
||||
import { buildRaceOverview, buildRaceOverviewCsvRows, withQualifyingPlaces, qualifyingPlaces } from "./race_overview_logic.js";
|
||||
@@ -121,7 +122,10 @@ const getCompetitorElapsedMs = (session, row) => getCompetitorElapsedMsLogic(ses
|
||||
const getCompetitorPassings = (session, row, options = {}) => getCompetitorPassingsLogic(session, row, options, { ensureSessionResult, isCountedPassing });
|
||||
const getCompetitorSeedMetric = (session, row) => getCompetitorSeedMetricLogic(session, row, { getCompetitorPassings });
|
||||
const getSessionEntrants = (session) => getSessionEntrantsLogic(session, { state, getEventDrivers });
|
||||
const buildLeaderboard = (session) => buildLeaderboardLogic(session, { ensureSessionResult, getSessionTargetMs, getCompetitorPassings, isCountedPassing, getCompetitorElapsedMs, getCompetitorSeedMetric, getSessionLapWindow, getPassingValidationLabel, formatSeedMetric, formatRaceClock, formatLeaderboardGap, formatLapDelta, formatLap, t });
|
||||
// Each row carries the driver's country code for the small flag (team rows have none).
|
||||
const getDriverCountry = (driverId) => driverCountryCode(state.drivers, driverId, getDriverProfileId);
|
||||
setDriverCountryResolver(getDriverCountry);
|
||||
const buildLeaderboard = (session) => buildLeaderboardLogic(session, { ensureSessionResult, getSessionTargetMs, getCompetitorPassings, isCountedPassing, getCompetitorElapsedMs, getCompetitorSeedMetric, getSessionLapWindow, getPassingValidationLabel, formatSeedMetric, formatRaceClock, formatLeaderboardGap, formatLapDelta, formatLap, t }).map((row) => ({ ...row, countryCode: row.driverId ? getDriverCountry(row.driverId) : "" }));
|
||||
const buildPracticeStandings = (event) => buildPracticeStandingsLogic(event, { getSessionsForEvent, buildLeaderboard, getCompetitorSeedMetric, formatSeedMetric, formatRaceClock });
|
||||
const getQualifyingPointsValue = (place, fieldSize, tableType) => getQualifyingPointsValueLogic(place, fieldSize, tableType);
|
||||
const isHighPointsTable = (tableType) => isHighPointsTableLogic(tableType);
|
||||
@@ -185,7 +189,7 @@ const renderRaceOverviewHeatsHtml = (event, onlySessionId = "") => getOverviewHe
|
||||
<section class="print-block">
|
||||
<h2>${escapeHtml(raceOverviewPhaseLabel(phase.type))} • ${escapeHtml(session.name)}</h2>
|
||||
${renderTable([t("table.pos"), ...(rows.some((row) => row.qual) ? [t("table.qual")] : []), 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>${medal(row.pos)}</td>${rows.some((item) => item.qual) ? qualCell(row.qual, escapeHtml) : ""}<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>`))}
|
||||
rows.map((row) => `<tr><td>${medal(row.pos)}</td>${rows.some((item) => item.qual) ? qualCell(row.qual, escapeHtml) : ""}<td>${rowFlag(row)}${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 buildHeatPdfSection = ({ session, rows, phase }) => {
|
||||
const withCar = rows.some((row) => row.car);
|
||||
@@ -193,7 +197,8 @@ const buildHeatPdfSection = ({ session, rows, phase }) => {
|
||||
return buildPdfSection(
|
||||
`${raceOverviewPhaseLabel(phase.type)} • ${session.name}`,
|
||||
[t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), ...(withCar ? [t("race_overview.car")] : []), t("table.laps"), t("table.result"), t("table.best_lap")],
|
||||
rows.map((row) => [String(row.pos), ...(withQual ? [row.qual || "-"] : []), row.name, ...(withCar ? [row.car || "-"] : []), String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "-"])
|
||||
rows.map((row) => [String(row.pos), ...(withQual ? [row.qual || "-"] : []), row.name, ...(withCar ? [row.car || "-"] : []), String(row.laps), row.result, row.bestLapMs ? formatLap(row.bestLapMs) : "-"]),
|
||||
pdfFlags(rows)
|
||||
);
|
||||
};
|
||||
// One finished heat or final on its own page: for the board in the pits right after it.
|
||||
@@ -3386,7 +3391,7 @@ const TRANSLATIONS = {
|
||||
"guide.dashboard_3": "Det gör det lättare att se om tävlingsdagen ligger före eller efter schema direkt från dashboarden.",
|
||||
"guide.dashboard_4": "Kom igång-korten och den grupperade sidomenyn följer samma ordning: anslut systemet, registrera vid behov, skapa körning och öppna sedan Tidtagning/Overlay.",
|
||||
"guide.training_title": "Träning, utveckling och belöningar",
|
||||
"guide.training_1": "1. Registrera föraren och transpondern under Förare. Klubb och land är valfria profilfält. Har personen flera klasser väljer du samma Träningsprofil på varje förarpost.",
|
||||
"guide.training_1": "1. Registrera föraren och transpondern under Förare. Klubb och land är valfria profilfält; med land får föraren en liten flagga före namnet i tidtagning, overlay, resultat och PDF. Har personen flera klasser väljer du samma Träningsprofil på varje förarpost.",
|
||||
"guide.training_2": "2. Kör Free Practice eller Open Practice. Giltiga varv kopieras automatiskt till en beständig träningslogg; korta/långa ogiltiga varv räknas inte. Varv från kval, heat och final sparas också men räknas bara när du väljer Underlag: Race eller Alla - de märks 🏁 med tävling, pass och serie, och visas per racepass i stället för stints.",
|
||||
"guide.training_3": "3. Öppna Träning och välj förare. Grundvyn visar bara totalvarv, träningsdagar, personbästa, jämnhet, nästa mål och dagens pass. Öppna Mer statistik eller Klubbens träningsöversikt bara när det behövs. I Klubbens träningsöversikt längst ner kan du söka förare, välja en klass, visa bara förare som tränat och gruppera per klass.",
|
||||
"guide.training_4": "4. Nästa automatiska nivå räknas utan konfiguration. Skapa egna delmål om klubben eller en förälder vill koppla en fysisk belöning till exempelvis 500, 1000 eller 1500 varv.",
|
||||
@@ -3506,6 +3511,7 @@ const TRANSLATIONS = {
|
||||
"overlay.obs_show_last": "Visa senaste varv",
|
||||
"overlay.col_last": "Senaste",
|
||||
"overlay.obs_show_gap": "Visa gap",
|
||||
"overlay.obs_show_flags": "Visa flaggor",
|
||||
"overlay.obs_copy_url": "Kopiera OBS-url",
|
||||
"overlay.obs_layout": "OBS-layout",
|
||||
"overlay.obs_theme": "OBS-tema",
|
||||
@@ -5689,7 +5695,7 @@ const TRANSLATIONS = {
|
||||
"guide.dashboard_3": "That makes it easier to see whether the race day is running ahead or behind schedule directly from the dashboard.",
|
||||
"guide.dashboard_4": "The Getting started cards and grouped side navigation follow the same order: connect the system, register entries when needed, create a run, then open Timing/Overlay.",
|
||||
"guide.training_title": "Practice, development and rewards",
|
||||
"guide.training_1": "1. Register the driver and transponder under Drivers. Club and country are optional profile fields. If the person races several classes, select the same Practice profile on every driver entry.",
|
||||
"guide.training_1": "1. Register the driver and transponder under Drivers. Club and country are optional profile fields; with a country the driver gets a small flag before the name in timing, the overlay, results and PDFs. If the person races several classes, select the same Practice profile on every driver entry.",
|
||||
"guide.training_2": "2. Run Free Practice or Open Practice. Valid laps are copied automatically to a durable training ledger; invalid short or long laps do not count. Laps from qualifying, heats and finals are kept too but only count when you pick Based on: Races or All - they are marked 🏁 with race, session and series, and shown per race session instead of as stints.",
|
||||
"guide.training_3": "3. Open Training and select a driver. The default view only shows total laps, practice days, personal best, consistency, the next target and today's session. Open More statistics or Club practice overview only when needed. In the club practice overview at the bottom you can search for a driver, pick one class, show only drivers who trained and group by class.",
|
||||
"guide.training_4": "4. The next automatic level needs no configuration. Add custom milestones when the club or a parent wants to attach a physical reward to targets such as 500, 1000 or 1500 laps.",
|
||||
@@ -5809,6 +5815,7 @@ const TRANSLATIONS = {
|
||||
"overlay.obs_show_last": "Show last lap",
|
||||
"overlay.col_last": "Last",
|
||||
"overlay.obs_show_gap": "Show gap",
|
||||
"overlay.obs_show_flags": "Show flags",
|
||||
"overlay.obs_copy_url": "Copy OBS URL",
|
||||
"overlay.obs_layout": "OBS layout",
|
||||
"overlay.obs_theme": "OBS theme",
|
||||
@@ -5968,6 +5975,7 @@ function createDefaultObsOverlaySettings() {
|
||||
showResult: true,
|
||||
showBest: true,
|
||||
showGap: true,
|
||||
showFlags: true,
|
||||
showPositionChange: true,
|
||||
showStart: true,
|
||||
layout: "leaderboard",
|
||||
@@ -5996,6 +6004,7 @@ function normalizeObsOverlaySettings(raw = {}) {
|
||||
showResult: raw?.showResult !== false,
|
||||
showBest: raw?.showBest !== false,
|
||||
showGap: raw?.showGap !== false,
|
||||
showFlags: raw?.showFlags !== false,
|
||||
showPositionChange: raw?.showPositionChange !== false,
|
||||
showStart: raw?.showStart !== false,
|
||||
layout,
|
||||
@@ -6109,6 +6118,7 @@ function getObsOverlayConfig() {
|
||||
showResult: parseOverlayBooleanParam("showResult", base.showResult),
|
||||
showBest: parseOverlayBooleanParam("showBest", base.showBest),
|
||||
showGap: parseOverlayBooleanParam("showGap", base.showGap),
|
||||
showFlags: parseOverlayBooleanParam("showFlags", base.showFlags),
|
||||
showPositionChange: parseOverlayBooleanParam("showPositionChange", base.showPositionChange),
|
||||
showStart: parseOverlayBooleanParam("showStart", base.showStart),
|
||||
layout: getObsLayouts().includes(String(urlParams.get("layout") || "").toLowerCase()) ? String(urlParams.get("layout")).toLowerCase() : base.layout,
|
||||
@@ -6128,6 +6138,7 @@ function writeObsOverlayParams(url, config) {
|
||||
url.searchParams.set("showResult", normalized.showResult ? "1" : "0");
|
||||
url.searchParams.set("showBest", normalized.showBest ? "1" : "0");
|
||||
url.searchParams.set("showGap", normalized.showGap ? "1" : "0");
|
||||
url.searchParams.set("showFlags", normalized.showFlags ? "1" : "0");
|
||||
url.searchParams.set("showPositionChange", normalized.showPositionChange ? "1" : "0");
|
||||
url.searchParams.set("showStart", normalized.showStart ? "1" : "0");
|
||||
url.searchParams.set("layout", normalized.layout);
|
||||
@@ -8117,9 +8128,11 @@ function openPrintWindow(title, bodyHtml) {
|
||||
}, 150);
|
||||
}
|
||||
|
||||
function buildPdfSection(title, headers, rows) {
|
||||
return { title, headers, rows };
|
||||
// flags: the country code per row ("" for none); the PDF draws it before the driver's name.
|
||||
function buildPdfSection(title, headers, rows, flags) {
|
||||
return flags && flags.some(Boolean) ? { title, headers, rows, flags } : { title, headers, rows };
|
||||
}
|
||||
const pdfFlags = (items) => items.map((item) => item?.countryCode || (item?.driverId ? getDriverCountry(item.driverId) : ""));
|
||||
|
||||
async function requestPdfExport(payload) {
|
||||
try {
|
||||
@@ -8197,9 +8210,10 @@ async function exportRaceStartListsPdf(event) {
|
||||
`${session.name} • ${getSessionTypeLabel(session.type)}`,
|
||||
[t("events.slot"), t("table.driver"), t("table.brand"), t("table.transponder")],
|
||||
getSessionGridEntries(session).map((entry) => {
|
||||
const driver = state.drivers.find((item) => item.id === entry.id);
|
||||
const driver = state.drivers.find((item) => item.id === entry.driverId);
|
||||
return [String(entry.slot), entry.name, driver?.brand || "-", entry.meta || "-"];
|
||||
})
|
||||
}),
|
||||
pdfFlags(getSessionGridEntries(session))
|
||||
)
|
||||
);
|
||||
|
||||
@@ -8237,6 +8251,7 @@ async function exportRaceResultsPdf(event) {
|
||||
return [
|
||||
[t("table.pos"), ...(withQual ? [t("table.qual")] : []), t("table.driver"), t("table.score")],
|
||||
rows.map((row) => [String(row.rank), ...(withQual ? [row.qual || "-"] : []), row.driverName || "-", row.score || "-"]),
|
||||
pdfFlags(rows),
|
||||
];
|
||||
})()
|
||||
),
|
||||
@@ -8247,12 +8262,14 @@ async function exportRaceResultsPdf(event) {
|
||||
String(row.rank),
|
||||
row.driverName || "-",
|
||||
row.scoreNote ? `${row.score || "-"} | ${row.scoreNote}` : row.score || "-",
|
||||
])
|
||||
]),
|
||||
pdfFlags(buildQualifyingStandings(event))
|
||||
),
|
||||
buildPdfSection(
|
||||
t("events.practice_standings"),
|
||||
[t("table.pos"), t("table.driver"), t("table.score")],
|
||||
buildPracticeStandings(event).map((row) => [String(row.rank), row.driverName || "-", row.score || "-"])
|
||||
buildPracticeStandings(event).map((row) => [String(row.rank), row.driverName || "-", row.score || "-"]),
|
||||
pdfFlags(buildPracticeStandings(event))
|
||||
),
|
||||
...getOverviewHeats(event).map(buildHeatPdfSection),
|
||||
...buildTeamRaceStandings(event).map(({ session, rows }) =>
|
||||
@@ -8397,9 +8414,10 @@ async function exportSessionHeatSheetPdf(session) {
|
||||
`${session.name} • ${getSessionTypeLabel(session.type)}`,
|
||||
[t("events.slot"), t("table.driver"), t("table.brand"), t("table.transponder")],
|
||||
getSessionGridEntries(session).map((entry) => {
|
||||
const driver = state.drivers.find((item) => item.id === entry.id);
|
||||
const driver = state.drivers.find((item) => item.id === entry.driverId);
|
||||
return [String(entry.slot), entry.name, driver?.brand || "-", entry.meta || "-"];
|
||||
})
|
||||
}),
|
||||
pdfFlags(getSessionGridEntries(session))
|
||||
),
|
||||
],
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user