feat(day): fixed-time break such as lunch 12-13 in the day schedule (1.89.15)
This commit is contained in:
1 parent
10a0dd49bd
commit
5b34317bcb
10 files changed
+113
-19
No files matched your search
+13
-5
@@ -654,7 +654,7 @@ const bindDaySchedule = (root) => {
|
||||
const date = getRaceDayDate();
|
||||
bindDaySchedulePanel(root, {
|
||||
date,
|
||||
onSavePlan: ({ startAt, gapMin, roundGapMin, finalsGapMin, callMin }) => { saveDayPlan({ ...getDayPlan(date), startAt, gapMin, roundGapMin, finalsGapMin, callMin }); renderView(); },
|
||||
onSavePlan: (plan) => { saveDayPlan({ ...getDayPlan(date), ...plan }); renderView(); },
|
||||
onBreak: (sessionId) => {
|
||||
const day = getDayPlan(date);
|
||||
const answer = window.prompt(t("day.break_prompt"), String(day.breaks?.[sessionId] || ""));
|
||||
@@ -666,7 +666,7 @@ const bindDaySchedule = (root) => {
|
||||
renderView();
|
||||
},
|
||||
onMove: (sessionId, step) => moveDaySession(date, sessionId, step),
|
||||
onPrint: () => openPrintWindow(t("day.print_title", { date }), buildDaySchedulePrintHtml({ t, escapeHtml, date, rows: buildDayRows(date), getClassLabel: getDayClassLabel, getSessionGridEntries })),
|
||||
onPrint: () => openPrintWindow(t("day.print_title", { date }), buildDaySchedulePrintHtml({ t, escapeHtml, date, rows: buildDayRows(date), getClassLabel: getDayClassLabel, getSessionGridEntries, day: getDayPlan(date) })),
|
||||
onBoard: () => window.open(buildOverlayUrl("schedule", { public: true }), "_blank"),
|
||||
onAutopilot: (on) => {
|
||||
if (on && !window.confirm(t("day.autopilot_confirm"))) return;
|
||||
@@ -680,7 +680,7 @@ const bindDaySchedule = (root) => {
|
||||
const renderBoard = () => {
|
||||
const date = pickBoardDate({ events: state.events, sessions: state.sessions, today: todayKey() });
|
||||
dom.view.innerHTML = renderDriverBoard({
|
||||
t, escapeHtml, date, rows: buildDayRows(date), getClassLabel: getDayClassLabel, getSessionGridEntries,
|
||||
t, escapeHtml, date, rows: buildDayRows(date), getClassLabel: getDayClassLabel, getSessionGridEntries, day: getDayPlan(date),
|
||||
getRemainingLabel: (session) => { const timing = getSessionTiming(session); return timing.untimed ? formatElapsedClock(timing.elapsedMs) : formatCountdown(timing.remainingMs); },
|
||||
});
|
||||
};
|
||||
@@ -3373,7 +3373,7 @@ const TRANSLATIONS = {
|
||||
"guide.race_day_8": "8. Redan när du registrerar eller ändrar en förare under Förare varnar systemet om transpondern redan används av en annan förare (t.ex. i fel klass) och namnger vem - ett komplement till förkontrollens kontroll av dubbla transpondrar inom samma heat. Samma person som kör flera klasser med sin egen transponder flaggas aldrig.",
|
||||
"guide.race_day_9": "9. Kör ni på ett nät där fler har åtkomst (t.ex. arenans WiFi)? Slå på Admin-PIN under Inställningar -> System & backup. Då kräver alla ändringar PIN - resultat, inställningar och uppdatering - medan visning och publika overlay-/träningslänkar fungerar som vanligt. Varje webbläsare loggar in en gång och kommer ihåg det i 30 dagar.",
|
||||
"guide.race_day_10": "10. Start med nedräkning (som EFRA/IFMAR): välj längd (Go, 30 s, 1, 1:30, 2, 3 eller 5 min - standard per tävling under Race Setup) och tryck Starta. Banan är öppen, speakern ropar ut tiden (varje minut, 30 s, 10 s; vid gridstart även \"bilarna till startplatsen\" vid 30 s och 10, 9 … 3). Pausa medan bilarna ställs upp, +1 min, Till 30 s (omstart av gridet), Till 10 s, Go nu eller Avbryt. När tiden går ut startar heatet av sig själv: gridstart får tystnad efter \"3\", startljus och tutan 1-3 s senare, flygande start ger signalen och \"Klockan går\". Transponderkontrollen visar grön bock för alla som passerat sedan nedräkningen började - saknas någon, byt transponder direkt i panelen eller välj en okänd transponder som passerat. Go nu varnar om någon inte setts.",
|
||||
"guide.race_day_11": "11. Dagens schema (längst ned på Race Day) visar alla klasser den dagen i en körordning med tider. Ange första start, paus mellan heaten, paus mellan omgångar (träning → kval, omgång → omgång) och paus före finaler (t.ex. lunch, räknas från att kvalet tog slut). ☕ på ett heat lägger in en extra paus före just det. ▲▼ ändrar ordningen. Ett heat som startar sent eller pausas flyttar resten av dagen. 🖨 Skriv ut körordning ger en lista med tider och förare att sätta upp på tavlan, och 📺 Förarvy (/public-overlay/schedule) visar förarna nästa heat och vilka som kör. Upprop: när ett heat har 10 minuter kvar (ändras under Upprop) frågar Race Day om du vill ropa upp det – 📢 Ropa ut läser upp heatet och förarna i högtalarna och markerar det Uppropad i förarvyn; Senare frågar igen om 2 minuter. ▶ Kör dagen automatiskt startar varje heats nedräkning själv när det är dags och ropar då upp heaten själv (den här webbläsaren måste vara öppen). Alla klasser samma dag körs i samma ordning: träning, kvalomgång för kvalomgång, sist finalerna. När kvalet är klart i en klass väntar den tills du har tryckt 🏁 Skapa finaler; ■ Stoppa automatiken låter dig köra för hand och sedan slå på den igen; ⏸ Pausa dagen pausar heatet på banan och automatiken tills du fortsätter.",
|
||||
"guide.race_day_11": "11. Dagens schema (längst ned på Race Day) visar alla klasser den dagen i en körordning med tider. Ange första start, paus mellan heaten, paus mellan omgångar (träning → kval, omgång → omgång) och paus före finaler (t.ex. lunch, räknas från att kvalet tog slut). ☕ på ett heat lägger in en extra paus före just det. Fast paus med klockslag (t.ex. Lunch 12:00–13:00): inget heat startar eller körs inom den, och den syns i utskriften och på förartavlan. ▲▼ ändrar ordningen. Ett heat som startar sent eller pausas flyttar resten av dagen. 🖨 Skriv ut körordning ger en lista med tider och förare att sätta upp på tavlan, och 📺 Förarvy (/public-overlay/schedule) visar förarna nästa heat och vilka som kör. Upprop: när ett heat har 10 minuter kvar (ändras under Upprop) frågar Race Day om du vill ropa upp det – 📢 Ropa ut läser upp heatet och förarna i högtalarna och markerar det Uppropad i förarvyn; Senare frågar igen om 2 minuter. ▶ Kör dagen automatiskt startar varje heats nedräkning själv när det är dags och ropar då upp heaten själv (den här webbläsaren måste vara öppen). Alla klasser samma dag körs i samma ordning: träning, kvalomgång för kvalomgång, sist finalerna. När kvalet är klart i en klass väntar den tills du har tryckt 🏁 Skapa finaler; ■ Stoppa automatiken låter dig köra för hand och sedan slå på den igen; ⏸ Pausa dagen pausar heatet på banan och automatiken tills du fortsätter.",
|
||||
"guide.race_day_12": "12. Race-översikt (under heatkön): hela racet på ett ställe – pallen från A-finalen, sedan träning, kval och finaler med ställning och varje heats resultat (i sponsorheat även bilen). Skriv ut, PDF och CSV exporterar hela racet med finalerna överst (A-finalen först), sedan kval och sist träning. Ett avslutat heat eller en final har egna knappar 🖨 och PDF för bara det heatet, t.ex. till tavlan i depån. Samma översikt finns i Resultatarkivet.",
|
||||
"guide.dashboard_title": "Schemaavvikelse på Översikt",
|
||||
"guide.dashboard_1": "Översikt visar nu skillnaden mellan planerad tid och faktisk körtid för alla startade sessioner.",
|
||||
@@ -3442,6 +3442,10 @@ const TRANSLATIONS = {
|
||||
"day.add_break": "Lägg in extra paus före detta heat (t.ex. lunch)",
|
||||
"day.break_prompt": "Extra paus före detta heat i minuter (0 = ingen):",
|
||||
"day.break_before": "{min} min paus före",
|
||||
"day.fixed_break": "Fast paus (klockslag)",
|
||||
"day.fixed_break_label": "Namn, t.ex. Lunch",
|
||||
"day.fixed_break_from": "Paus från",
|
||||
"day.fixed_break_to": "Paus till",
|
||||
"day.show_done": "✓ {count} heat körda – visa",
|
||||
"day.hide_done": "Dölj körda heat ({count})",
|
||||
"day.next": "Nästa",
|
||||
@@ -5669,7 +5673,7 @@ const TRANSLATIONS = {
|
||||
"guide.race_day_8": "8. Already when you register or edit a driver under Drivers, the system warns if the transponder is already used by a different driver (e.g. in the wrong class) and names who - a complement to the preflight's duplicate-transponder check within a single heat. The same person racing multiple classes on their own transponder is never flagged.",
|
||||
"guide.race_day_9": "9. Running on a network others can reach (e.g. the venue WiFi)? Turn on the Admin PIN under Settings -> System & backup. Every change then needs the PIN - results, settings and updates - while viewing and public overlay/training links work as usual. Each browser logs in once and is remembered for 30 days.",
|
||||
"guide.race_day_10": "10. Start with a count-down (as EFRA/IFMAR): pick a length (Go, 30 s, 1, 1:30, 2, 3 or 5 min - the default per event is set in Race Setup) and press Start. The track is open and the announcer calls the time (every minute, 30 s, 10 s; for a grid start also \"cars to the grid\" at 30 s and 10, 9 … 3). Hold while cars are placed on the grid, +1 min, To 30 s (grid restart), To 10 s, Go now or Cancel. When the time runs out the heat starts by itself: a grid start gets quiet after \"3\", the start lights and the horn 1-3 s later, a flying start gets the signal and \"Clock is running\". The transponder check shows a green tick for everyone who has crossed since the count-down began - if someone is missing, change their transponder right in the panel or pick an unknown transponder that crossed. Go now warns if someone wasn't seen.",
|
||||
"guide.race_day_11": "11. Today's schedule (at the bottom of Race Day) shows every class that day in one running order with times. Set the first start, the break between heats, the break between rounds (practice → qualifying, round → round) and the break before the finals (e.g. lunch, counted from the end of qualifying). ☕ on a heat adds an extra break before just that heat. ▲▼ change the order. A heat that starts late or is paused moves the rest of the day. 🖨 Print running order gives a list with times and drivers for the board in the pits, and 📺 Drivers' board (/public-overlay/schedule) shows drivers the next heats and who drives them. Calls: when a heat is 10 minutes away (set under Call), Race Day asks whether to call it – 📢 Call now reads the heat and its drivers over the speakers and marks it Called on the drivers' board; Later asks again in 2 minutes. ▶ Run the day automatically starts each heat's count-down on its own when it is due and then calls the heats itself (keep this browser open). Every class on the day runs in the same order: practice, qualifying round by round, finals last. When a class's qualifying is done it waits until you press 🏁 Create finals; ■ Stop autopilot lets you run heats by hand and turn it back on later; ⏸ Pause the day pauses the heat on track and the autopilot until you resume.",
|
||||
"guide.race_day_11": "11. Today's schedule (at the bottom of Race Day) shows every class that day in one running order with times. Set the first start, the break between heats, the break between rounds (practice → qualifying, round → round) and the break before the finals (e.g. lunch, counted from the end of qualifying). ☕ on a heat adds an extra break before just that heat. Fixed break at clock times (e.g. Lunch 12:00–13:00): no heat starts or runs inside it, and it shows in the printout and on the drivers' board. ▲▼ change the order. A heat that starts late or is paused moves the rest of the day. 🖨 Print running order gives a list with times and drivers for the board in the pits, and 📺 Drivers' board (/public-overlay/schedule) shows drivers the next heats and who drives them. Calls: when a heat is 10 minutes away (set under Call), Race Day asks whether to call it – 📢 Call now reads the heat and its drivers over the speakers and marks it Called on the drivers' board; Later asks again in 2 minutes. ▶ Run the day automatically starts each heat's count-down on its own when it is due and then calls the heats itself (keep this browser open). Every class on the day runs in the same order: practice, qualifying round by round, finals last. When a class's qualifying is done it waits until you press 🏁 Create finals; ■ Stop autopilot lets you run heats by hand and turn it back on later; ⏸ Pause the day pauses the heat on track and the autopilot until you resume.",
|
||||
"guide.race_day_12": "12. Race overview (under the heat queue): the whole race in one place - the podium from the A final, then practice, qualifying and finals with the standings and every heat's result (with the car in sponsor heats). Print, PDF and CSV export the whole race with the finals on top (A final first), then qualifying, then practice. A finished heat or final has its own 🖨 and PDF buttons for just that heat, e.g. for the board in the pits. The same overview is in the Results archive.",
|
||||
"guide.dashboard_title": "Schedule drift on overview",
|
||||
"guide.dashboard_1": "Overview now shows the difference between planned time and actual elapsed time for all started sessions.",
|
||||
@@ -5738,6 +5742,10 @@ const TRANSLATIONS = {
|
||||
"day.add_break": "Add an extra break before this heat (e.g. lunch)",
|
||||
"day.break_prompt": "Extra break before this heat in minutes (0 = none):",
|
||||
"day.break_before": "{min} min break before",
|
||||
"day.fixed_break": "Fixed break (clock time)",
|
||||
"day.fixed_break_label": "Name, e.g. Lunch",
|
||||
"day.fixed_break_from": "Break from",
|
||||
"day.fixed_break_to": "Break to",
|
||||
"day.show_done": "✓ {count} heats run – show",
|
||||
"day.hide_done": "Hide run heats ({count})",
|
||||
"day.next": "Next",
|
||||
|
||||
@@ -11,7 +11,17 @@ export const DEFAULT_CALL_MIN = 10;
|
||||
// gapMin = break between heats of one round; roundGapMin = between rounds (practice -> qualifying,
|
||||
// round 1 -> round 2, final leg 1 -> leg 2); finalsGapMin = before the finals (lunch). Empty
|
||||
// round / finals gaps fall back to the one before. breaks = { sessionId: minutes } of extra
|
||||
// break before that heat. callMin = how long before its start a heat is called.
|
||||
// break before that heat. breakFrom / breakTo = a break at fixed clock times ("12:00"-"13:00",
|
||||
// lunch): no heat starts or runs inside it. callMin = how long before its start a heat is called.
|
||||
const clockTime = (value) => { const match = String(value || "").trim().match(/^(\d{1,2}):(\d{2})$/); return match && Number(match[1]) < 24 && Number(match[2]) < 60 ? `${match[1].padStart(2, "0")}:${match[2]}` : null; };
|
||||
// The fixed-time break of a day as timestamps, or null.
|
||||
export function fixedBreakWindow(day) {
|
||||
const plan = normalizeRaceDay(day || {});
|
||||
if (!plan.breakFrom || !/^\d{4}-\d{2}-\d{2}$/.test(plan.date)) return null;
|
||||
const start = new Date(`${plan.date}T${plan.breakFrom}:00`).getTime();
|
||||
const end = new Date(`${plan.date}T${plan.breakTo}:00`).getTime();
|
||||
return Number.isFinite(start) && Number.isFinite(end) && end > start ? { start, end, from: plan.breakFrom, to: plan.breakTo, label: plan.breakLabel } : null;
|
||||
}
|
||||
const optionalMin = (value) => (value === null || value === undefined || value === "" || !Number.isFinite(Number(value)) ? null : Math.max(0, Number(value)));
|
||||
export function normalizeRaceDay(day = {}) {
|
||||
const breaks = Object.fromEntries(Object.entries(day.breaks && typeof day.breaks === "object" ? day.breaks : {})
|
||||
@@ -23,6 +33,11 @@ export function normalizeRaceDay(day = {}) {
|
||||
roundGapMin: optionalMin(day.roundGapMin),
|
||||
finalsGapMin: optionalMin(day.finalsGapMin),
|
||||
breaks,
|
||||
...(() => {
|
||||
const from = clockTime(day.breakFrom);
|
||||
const to = clockTime(day.breakTo);
|
||||
return from && to && to > from ? { breakFrom: from, breakTo: to, breakLabel: String(day.breakLabel || "").trim().slice(0, 40) } : { breakFrom: null, breakTo: null, breakLabel: "" };
|
||||
})(),
|
||||
callMin: Number(day.callMin) > 0 ? Math.min(60, Number(day.callMin)) : DEFAULT_CALL_MIN,
|
||||
sessionOrder: [...new Set((Array.isArray(day.sessionOrder) ? day.sessionOrder : []).map(String).filter(Boolean))],
|
||||
autopilot: day.autopilot === true,
|
||||
@@ -111,13 +126,16 @@ export function buildDaySchedule(ordered, day, now = Date.now()) {
|
||||
let cursor = Number(day?.startAt || 0) || firstStart || now;
|
||||
let upcomingIndex = 0;
|
||||
let previous = null;
|
||||
const fixed = fixedBreakWindow(day);
|
||||
const overlapsFixed = (start, durationMs) => Boolean(fixed && start < fixed.end && start + durationMs > fixed.start);
|
||||
return ordered.map((session) => {
|
||||
const durationMs = sessionDurationMs(session);
|
||||
const actualStart = Number(session.startedAt || 0) || null;
|
||||
const actualEnd = isDone(session) ? Number(session.endedAt || 0) || null : null;
|
||||
// The first heat starts at the day's start time; an extra break before it still counts.
|
||||
const breakMin = breakBeforeMin(previous, session, day);
|
||||
const planned = cursor + breakMin * 60000;
|
||||
let planned = cursor + breakMin * 60000;
|
||||
let afterFixedBreak = false;
|
||||
previous = session;
|
||||
let state = "upcoming";
|
||||
let start = planned;
|
||||
@@ -132,13 +150,17 @@ export function buildDaySchedule(ordered, day, now = Date.now()) {
|
||||
const pausedMs = Number(session.totalPausedMs || 0) + (session.status === "paused" && session.pausedAt ? Math.max(0, now - Number(session.pausedAt)) : 0);
|
||||
end = Math.max(now, actualStart + durationMs + pausedMs);
|
||||
} else {
|
||||
// A heat that would start or run into the fixed break (lunch) waits until it is over.
|
||||
if (overlapsFixed(planned, durationMs)) { planned = fixed.end; afterFixedBreak = true; }
|
||||
start = Math.max(planned, now);
|
||||
if (overlapsFixed(start, durationMs)) { start = fixed.end; afterFixedBreak = true; }
|
||||
end = start + durationMs;
|
||||
}
|
||||
cursor = end;
|
||||
return {
|
||||
session,
|
||||
breakMin,
|
||||
afterFixedBreak,
|
||||
state,
|
||||
plannedStart: planned,
|
||||
start,
|
||||
|
||||
@@ -38,6 +38,13 @@ export function renderDaySchedulePanel({ t, escapeHtml, date, day, rows, autopil
|
||||
<label>${escapeHtml(t("day.gap"))}<input type="number" min="0" step="1" name="gapMin" value="${escapeHtml(String(day.gapMin))}" /></label>
|
||||
<label>${escapeHtml(t("day.round_gap"))}<input type="number" min="0" step="1" name="roundGapMin" placeholder="${escapeHtml(String(day.gapMin))}" value="${day.roundGapMin ?? ""}" /></label>
|
||||
<label>${escapeHtml(t("day.finals_gap"))}<input type="number" min="0" step="1" name="finalsGapMin" placeholder="${escapeHtml(String(day.roundGapMin ?? day.gapMin))}" value="${day.finalsGapMin ?? ""}" /></label>
|
||||
<fieldset class="day-fixed-break">
|
||||
<legend>${escapeHtml(t("day.fixed_break"))}</legend>
|
||||
<input type="text" name="breakLabel" maxlength="40" placeholder="${escapeHtml(t("day.fixed_break_label"))}" value="${escapeHtml(day.breakLabel || "")}" />
|
||||
<input type="time" name="breakFrom" value="${escapeHtml(day.breakFrom || "")}" aria-label="${escapeHtml(t("day.fixed_break_from"))}" />
|
||||
<span>–</span>
|
||||
<input type="time" name="breakTo" value="${escapeHtml(day.breakTo || "")}" aria-label="${escapeHtml(t("day.fixed_break_to"))}" />
|
||||
</fieldset>
|
||||
<label>${escapeHtml(t("day.call_min"))}<input type="number" min="1" max="60" step="1" name="callMin" value="${escapeHtml(String(day.callMin))}" /></label>
|
||||
<button class="btn btn-primary btn-mini" type="submit">${escapeHtml(t("common.save"))}</button>
|
||||
</form>
|
||||
@@ -56,7 +63,7 @@ export function renderDaySchedulePanel({ t, escapeHtml, date, day, rows, autopil
|
||||
${doneCount ? `<tr class="day-done-toggle"><td colspan="5"><button class="btn btn-mini" type="button" id="dayToggleDone">${escapeHtml(t(showDone ? "day.hide_done" : "day.show_done", { count: doneCount }))}</button></td></tr>` : ""}
|
||||
${rows.map((row, index) => row.state === "done" && !showDone ? "" : `
|
||||
<tr class="is-${row.state} ${row.session.id === nextId ? "is-next" : ""} ${row.delayed ? "is-delayed" : ""}" data-day-row="${escapeHtml(row.session.id)}">
|
||||
<td><strong>${formatClockTime(row.start)}</strong>${row.delayed && row.state !== "done" ? ` <small class="day-planned">(${formatClockTime(row.plannedStart)})</small>` : ""}${row.breakMin > day.gapMin && index > 0 ? `<br><small class="day-break">☕ ${escapeHtml(t("day.break_before", { min: row.breakMin }))}</small>` : ""}</td>
|
||||
<td><strong>${formatClockTime(row.start)}</strong>${row.delayed && row.state !== "done" ? ` <small class="day-planned">(${formatClockTime(row.plannedStart)})</small>` : ""}${row.afterFixedBreak ? `<br><small class="day-break">🍽 ${escapeHtml(day.breakLabel || t("day.fixed_break"))} ${escapeHtml(day.breakFrom)}–${escapeHtml(day.breakTo)}</small>` : row.breakMin > day.gapMin && index > 0 ? `<br><small class="day-break">☕ ${escapeHtml(t("day.break_before", { min: row.breakMin }))}</small>` : ""}</td>
|
||||
<td>${row.session.id === nextId ? `<span class="pill">${escapeHtml(t("day.next"))}</span> ` : ""}${escapeHtml(rowLabel(row, getClassLabel))}</td>
|
||||
<td>${row.driverCount ?? ""}</td>
|
||||
<td><small>${escapeHtml(stateLabel(row, t, now))}</small></td>
|
||||
@@ -105,7 +112,7 @@ export function bindDaySchedulePanel(root, { date, onSavePlan, onBreak = () => {
|
||||
const time = String(form.get("startTime") || "").trim();
|
||||
const startAt = time ? new Date(`${date}T${time}`).getTime() : null;
|
||||
const optional = (name) => (String(form.get(name) ?? "").trim() === "" ? null : Math.max(0, Number(form.get(name)) || 0));
|
||||
onSavePlan({ startAt: Number.isFinite(startAt) ? startAt : null, gapMin: Math.max(0, Number(form.get("gapMin")) || 0), roundGapMin: optional("roundGapMin"), finalsGapMin: optional("finalsGapMin"), callMin: Math.max(1, Number(form.get("callMin")) || 10) });
|
||||
onSavePlan({ startAt: Number.isFinite(startAt) ? startAt : null, gapMin: Math.max(0, Number(form.get("gapMin")) || 0), roundGapMin: optional("roundGapMin"), finalsGapMin: optional("finalsGapMin"), breakFrom: String(form.get("breakFrom") || ""), breakTo: String(form.get("breakTo") || ""), breakLabel: String(form.get("breakLabel") || ""), callMin: Math.max(1, Number(form.get("callMin")) || 10) });
|
||||
});
|
||||
root.querySelectorAll("[data-day-break]").forEach((button) => button.addEventListener("click", () => onBreak(button.dataset.dayBreak)));
|
||||
root.querySelectorAll("[data-day-move]").forEach((button) => button.addEventListener("click", () => onMove(button.dataset.dayMove, Number(button.dataset.step))));
|
||||
@@ -118,7 +125,17 @@ export function bindDaySchedulePanel(root, { date, onSavePlan, onBreak = () => {
|
||||
}
|
||||
|
||||
// For the board in the pits: time, class, session and the drivers in grid order.
|
||||
export function buildDaySchedulePrintHtml({ t, escapeHtml, date, rows, getClassLabel, getSessionGridEntries }) {
|
||||
// "🍽 Lunch 12:00–13:00" for the heat right after the fixed break.
|
||||
const fixedBreakText = (day, t) => `🍽 ${day?.breakLabel || t("day.fixed_break")} ${day?.breakFrom}–${day?.breakTo}`;
|
||||
|
||||
const inFixedBreak = (day, date, now) => {
|
||||
if (!day?.breakFrom || !day?.breakTo) return false;
|
||||
const start = new Date(`${date}T${day.breakFrom}:00`).getTime();
|
||||
const end = new Date(`${date}T${day.breakTo}:00`).getTime();
|
||||
return now >= start && now < end;
|
||||
};
|
||||
|
||||
export function buildDaySchedulePrintHtml({ t, escapeHtml, date, rows, getClassLabel, getSessionGridEntries, day = null }) {
|
||||
return `
|
||||
<style>
|
||||
.day-print h1 { margin: 0 0 4px; }
|
||||
@@ -135,7 +152,7 @@ export function buildDaySchedulePrintHtml({ t, escapeHtml, date, rows, getClassL
|
||||
<table>
|
||||
<thead><tr><th>${escapeHtml(t("day.col_time"))}</th><th>${escapeHtml(t("day.col_session"))}</th><th>${escapeHtml(t("day.col_drivers"))}</th></tr></thead>
|
||||
<tbody>
|
||||
${rows.map((row) => `<tr>
|
||||
${rows.map((row) => `${row.afterFixedBreak ? `<tr class="break"><td colspan="3"><strong>${escapeHtml(fixedBreakText(day, t))}</strong></td></tr>` : ""}<tr>
|
||||
<td class="time">${formatClockTime(row.start)}</td>
|
||||
<td class="session">${escapeHtml(rowLabel(row, getClassLabel))}</td>
|
||||
<td><ol>${getSessionGridEntries(row.session).map((entry) => `<li>${escapeHtml(entry.name)}</li>`).join("")}</ol></td>
|
||||
@@ -147,7 +164,7 @@ export function buildDaySchedulePrintHtml({ t, escapeHtml, date, rows, getClassL
|
||||
|
||||
// The drivers' board: what is on track, the next heats with who drives them (highlighted once called),
|
||||
// then the rest of the day.
|
||||
export function renderDriverBoard({ t, escapeHtml, date, rows, getClassLabel, getSessionGridEntries, getRemainingLabel, now = Date.now() }) {
|
||||
export function renderDriverBoard({ t, escapeHtml, date, rows, getClassLabel, getSessionGridEntries, getRemainingLabel, day = null, now = Date.now() }) {
|
||||
const live = rows.find((row) => row.state === "live");
|
||||
const next = rows.filter((row) => row.state === "upcoming").slice(0, 3);
|
||||
const later = rows.filter((row) => row.state === "upcoming").slice(3);
|
||||
@@ -161,6 +178,7 @@ export function renderDriverBoard({ t, escapeHtml, date, rows, getClassLabel, ge
|
||||
<strong class="board-time">${formatClockTime(row.start)}</strong>
|
||||
<span class="board-when">${escapeHtml(minutes <= 0 ? t("day.board_now") : t("day.in_min", { min: minutes }))}</span>
|
||||
</header>
|
||||
${row.afterFixedBreak ? `<p class="board-break-note">${escapeHtml(fixedBreakText(day, t))}</p>` : ""}
|
||||
<h3>${escapeHtml(rowLabel(row, getClassLabel))}</h3>
|
||||
${called ? `<p class="board-heads-up">📢 ${escapeHtml(t("day.board_heads_up"))}</p>` : ""}
|
||||
<ol>${getSessionGridEntries(row.session).map((entry) => `<li>${escapeHtml(entry.name)}</li>`).join("") || `<li>${escapeHtml(t("race_day.no_start_list"))}</li>`}</ol>
|
||||
@@ -172,8 +190,9 @@ export function renderDriverBoard({ t, escapeHtml, date, rows, getClassLabel, ge
|
||||
<h1>${escapeHtml(t("day.board_title", { date }))}</h1>
|
||||
<strong class="driver-board-clock">${formatClockTime(now)}</strong>
|
||||
</header>
|
||||
${!live && inFixedBreak(day, date, now) ? `<div class="board-live board-break">${escapeHtml(fixedBreakText(day, t))}</div>` : ""}
|
||||
${live ? `<div class="board-live"><span class="live-dot" aria-hidden="true"></span> ${escapeHtml(t("day.board_on_track"))}: <strong>${escapeHtml(rowLabel(live, getClassLabel))}</strong> <span>${escapeHtml(getRemainingLabel(live.session))}</span></div>` : ""}
|
||||
${next.length ? `<div class="board-next-list">${next.map(card).join("")}</div>` : `<p class="board-empty">${escapeHtml(t(rows.length ? "day.board_all_done" : "day.board_none"))}</p>`}
|
||||
${later.length ? `<table class="board-later"><tbody>${later.map((row) => `<tr><td>${formatClockTime(row.start)}</td><td>${escapeHtml(rowLabel(row, getClassLabel))}</td></tr>`).join("")}</tbody></table>` : ""}
|
||||
${later.length ? `<table class="board-later"><tbody>${later.map((row) => `${row.afterFixedBreak ? `<tr class="board-break-row"><td colspan="2">${escapeHtml(fixedBreakText(day, t))}</td></tr>` : ""}<tr><td>${formatClockTime(row.start)}</td><td>${escapeHtml(rowLabel(row, getClassLabel))}</td></tr>`).join("")}</tbody></table>` : ""}
|
||||
</section>`;
|
||||
}
|
||||
@@ -5051,3 +5051,7 @@ body[data-theme="light"] .overlay-pit-badge.is-done { color: #7a4a00; }
|
||||
tr.is-selected td { background: color-mix(in srgb, var(--danger) 12%, transparent); }
|
||||
.driver-list-toolbar label.toggle, .driver-list-bulk label.toggle { display: inline-flex; align-items: center; gap: 8px; white-space: nowrap; width: auto; }
|
||||
.driver-list-toolbar label.toggle input, .driver-list-bulk label.toggle input { width: auto; margin: 0; }
|
||||
.day-fixed-break { display: flex; align-items: center; gap: 6px; border: 1px solid var(--line, rgba(255,255,255,0.15)); border-radius: 8px; padding: 4px 8px 6px; margin: 0; }
|
||||
.day-fixed-break legend { font-size: 0.85rem; color: var(--muted); padding: 0 4px; }
|
||||
.day-fixed-break input[name="breakLabel"] { width: 9em; }
|
||||
.board-break, .board-break-note, .board-break-row td { color: var(--gold, #d9a441); font-weight: 700; }
|
||||
Reference in new issue
Block a user