feat(training): search, class filter and grouping in the club practice overview (1.89.18)
This commit is contained in:
1 parent
f8080ffaeb
commit
eefef11aaa
11 files changed
+129
-13
No files matched your search
@@ -8,6 +8,12 @@ The application version is maintained in `package.json` and displayed in the adm
|
|||||||
|
|
||||||
No changes recorded yet.
|
No changes recorded yet.
|
||||||
|
|
||||||
|
## 1.89.18 - 2026-11-13
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- Training stats: the club practice overview at the bottom gets a search box, a class filter, "Only drivers who trained" (on by default) and "Group by class", like the driver list, so it is no longer one long list.
|
||||||
|
|
||||||
## 1.89.17 - 2026-11-13
|
## 1.89.17 - 2026-11-13
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
|||||||
@@ -229,6 +229,8 @@ Rookie gets its own standings with the series' points table, count rule and club
|
|||||||
- **Settings** on the Open Practice row in Race Setup: the shortest and longest lap and the **ranking** - best lap (default), **best N laps in a row** (e.g. 3) or **best X minutes** (most laps inside X minutes, then the shorter time, e.g. 5). Timing, the overlay, Race Day and the results show e.g. "3 laps 52.341" or "17 laps / 5:00.3"; the best lap keeps its own column. A stop in the pits breaks "in a row".
|
- **Settings** on the Open Practice row in Race Setup: the shortest and longest lap and the **ranking** - best lap (default), **best N laps in a row** (e.g. 3) or **best X minutes** (most laps inside X minutes, then the shorter time, e.g. 5). Timing, the overlay, Race Day and the results show e.g. "3 laps 52.341" or "17 laps / 5:00.3"; the best lap keeps its own column. A stop in the pits breaks "in a row".
|
||||||
- **Start practice** on the Dashboard or Race Day continues the running Open Practice, or creates and starts one. **Reset – new practice day** on Race Day clears the day's laps for a new evening; every lap stays in the training statistics.
|
- **Start practice** on the Dashboard or Race Day continues the running Open Practice, or creates and starts one. **Reset – new practice day** on Race Day clears the day's laps for a new evening; every lap stays in the training statistics.
|
||||||
|
|
||||||
|
**Club practice overview** (bottom of Training stats): search for a driver, pick one class, **Only drivers who trained** (on by default) and **Group by class**. Click a column heading to sort.
|
||||||
|
|
||||||
**Track layouts:**
|
**Track layouts:**
|
||||||
- Press **New layout** (on Training stats, Race Day or the Dashboard) when the track is rebuilt. A running practice moves onto the new layout, and best laps start over.
|
- Press **New layout** (on Training stats, Race Day or the Dashboard) when the track is rebuilt. A running practice moves onto the new layout, and best laps start over.
|
||||||
- Each layout can have its own **min/max lap time** for practice. Races always use the event's values.
|
- Each layout can have its own **min/max lap time** for practice. Races always use the event's values.
|
||||||
|
|||||||
@@ -242,6 +242,8 @@ Rookie får en egen ställning med seriens poängtabell, räkneregel och klubbre
|
|||||||
- **Inställningar** på Open Practice-raden i Race Setup: kortaste och längsta varv och **rankning** – bästa varv (standard), **bästa N varv i följd** (t.ex. 3) eller **bästa X minuter** (flest varv inom X minuter, sedan kortast tid, t.ex. 5). Tidtagning, overlayn, Race Day och resultaten visar t.ex. "3 varv 52.341" eller "17 varv / 5:00.3"; bästa varv har kvar sin egen kolumn. Ett stopp i depån bryter "i följd".
|
- **Inställningar** på Open Practice-raden i Race Setup: kortaste och längsta varv och **rankning** – bästa varv (standard), **bästa N varv i följd** (t.ex. 3) eller **bästa X minuter** (flest varv inom X minuter, sedan kortast tid, t.ex. 5). Tidtagning, overlayn, Race Day och resultaten visar t.ex. "3 varv 52.341" eller "17 varv / 5:00.3"; bästa varv har kvar sin egen kolumn. Ett stopp i depån bryter "i följd".
|
||||||
- **Starta träning** på Översikten eller Race Day fortsätter pågående Open Practice, eller skapar och startar en. **Nollställ – ny träningsdag** på Race Day nollställer dagens varv inför en ny kväll; alla varv finns kvar i träningsstatistiken.
|
- **Starta träning** på Översikten eller Race Day fortsätter pågående Open Practice, eller skapar och startar en. **Nollställ – ny träningsdag** på Race Day nollställer dagens varv inför en ny kväll; alla varv finns kvar i träningsstatistiken.
|
||||||
|
|
||||||
|
**Klubbens träningsöversikt** (längst ner på Träningsstatistik): sök förare, välj en klass, **Bara förare som tränat** (på som standard) och **Gruppera per klass**. Klicka på en kolumnrubrik för att sortera.
|
||||||
|
|
||||||
**Banlayouter:**
|
**Banlayouter:**
|
||||||
- Tryck **Ny layout** (på Träningsstatistik, Race Day eller Översikt) när banan byggs om. Ett pågående träningspass flyttas till den nya layouten, och bästa varven börjar om.
|
- Tryck **Ny layout** (på Träningsstatistik, Race Day eller Översikt) när banan byggs om. Ett pågående träningspass flyttas till den nya layouten, och bästa varven börjar om.
|
||||||
- Varje layout kan ha egen **min/max-varvtid** för träning. Race använder alltid tävlingens värden.
|
- Varje layout kan ha egen **min/max-varvtid** för träning. Race använder alltid tävlingens värden.
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "rc-racecore",
|
"name": "rc-racecore",
|
||||||
"version": "1.89.17",
|
"version": "1.89.18",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "rc-racecore",
|
"name": "rc-racecore",
|
||||||
"version": "1.89.17",
|
"version": "1.89.18",
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"better-sqlite3": "^12.11.1",
|
"better-sqlite3": "^12.11.1",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "rc-racecore",
|
"name": "rc-racecore",
|
||||||
"version": "1.89.17",
|
"version": "1.89.18",
|
||||||
"private": true,
|
"private": true,
|
||||||
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
|
"description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence",
|
||||||
"engines": {
|
"engines": {
|
||||||
|
|||||||
+6
-2
@@ -1978,6 +1978,8 @@ const TRANSLATIONS = {
|
|||||||
"drivers.name_placeholder": "Förarnamn",
|
"drivers.name_placeholder": "Förarnamn",
|
||||||
"drivers.brand_placeholder": "Team / märke (valfritt)",
|
"drivers.brand_placeholder": "Team / märke (valfritt)",
|
||||||
"drivers.class_filter": "Klass",
|
"drivers.class_filter": "Klass",
|
||||||
|
"training.list_search": "Sök förare...",
|
||||||
|
"training.list_active_only": "Bara förare som tränat",
|
||||||
"drivers.all_classes": "Alla klasser",
|
"drivers.all_classes": "Alla klasser",
|
||||||
"drivers.no_class": "Utan klass",
|
"drivers.no_class": "Utan klass",
|
||||||
"drivers.sort_by": "Sortera på",
|
"drivers.sort_by": "Sortera på",
|
||||||
@@ -3386,7 +3388,7 @@ const TRANSLATIONS = {
|
|||||||
"guide.training_title": "Träning, utveckling och belöningar",
|
"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. 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_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.",
|
"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.",
|
"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.",
|
||||||
"guide.training_5": "5. När målet nåtts kan belöningen markeras som utdelad. Direktlänken `/?view=training&driver=<id>` kan bokmärkas på förarens mobil.",
|
"guide.training_5": "5. När målet nåtts kan belöningen markeras som utdelad. Direktlänken `/?view=training&driver=<id>` kan bokmärkas på förarens mobil.",
|
||||||
"guide.training_6": "6. Träningsloggen uppdateras av domarkorrigeringar medan sessionen finns, men behålls när sessionen senare raderas. Full dataexport i Inställningar inkluderar både logg och mål.",
|
"guide.training_6": "6. Träningsloggen uppdateras av domarkorrigeringar medan sessionen finns, men behålls när sessionen senare raderas. Full dataexport i Inställningar inkluderar både logg och mål.",
|
||||||
@@ -4279,6 +4281,8 @@ const TRANSLATIONS = {
|
|||||||
"drivers.name_placeholder": "Driver name",
|
"drivers.name_placeholder": "Driver name",
|
||||||
"drivers.brand_placeholder": "Team / brand (optional)",
|
"drivers.brand_placeholder": "Team / brand (optional)",
|
||||||
"drivers.class_filter": "Class",
|
"drivers.class_filter": "Class",
|
||||||
|
"training.list_search": "Search drivers...",
|
||||||
|
"training.list_active_only": "Only drivers who trained",
|
||||||
"drivers.all_classes": "All classes",
|
"drivers.all_classes": "All classes",
|
||||||
"drivers.no_class": "No class",
|
"drivers.no_class": "No class",
|
||||||
"drivers.sort_by": "Sort by",
|
"drivers.sort_by": "Sort by",
|
||||||
@@ -5687,7 +5691,7 @@ const TRANSLATIONS = {
|
|||||||
"guide.training_title": "Practice, development and rewards",
|
"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. 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_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.",
|
"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.",
|
"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.",
|
||||||
"guide.training_5": "5. When a target is reached, mark its reward as delivered. Bookmark `/?view=training&driver=<id>` on the driver's phone for direct access.",
|
"guide.training_5": "5. When a target is reached, mark its reward as delivered. Bookmark `/?view=training&driver=<id>` on the driver's phone for direct access.",
|
||||||
"guide.training_6": "6. The training ledger follows judging corrections while the source session exists, but remains when that session is later deleted. Full data export in Settings includes both ledger and goals.",
|
"guide.training_6": "6. The training ledger follows judging corrections while the source session exists, but remains when that session is later deleted. Full data export in Settings includes both ledger and goals.",
|
||||||
|
|||||||
@@ -56,3 +56,12 @@ export function removeDrivers(state, ids) {
|
|||||||
});
|
});
|
||||||
return before - state.drivers.length;
|
return before - state.drivers.length;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The training stats' club table (one row per driver and class): search on the name, one class,
|
||||||
|
// and only drivers who have trained.
|
||||||
|
export function trainingRowVisible(row, { search = "", classId = "", activeOnly = false } = {}) {
|
||||||
|
const needle = String(search || "").trim().toLowerCase();
|
||||||
|
if (needle && !String(row?.name || "").toLowerCase().includes(needle)) return false;
|
||||||
|
if (classId && String(row?.classId || "") !== String(classId)) return false;
|
||||||
|
return !activeOnly || Number(row?.laps || 0) > 0;
|
||||||
|
}
|
||||||
@@ -5043,6 +5043,8 @@ body[data-theme="light"] .overlay-pit-badge.is-done { color: #7a4a00; }
|
|||||||
.race-overview-heat-actions { display: inline-flex; gap: 4px; margin-left: 8px; vertical-align: middle; }
|
.race-overview-heat-actions { display: inline-flex; gap: 4px; margin-left: 8px; vertical-align: middle; }
|
||||||
.driver-list-toolbar { display: flex; flex-wrap: wrap; gap: 10px 14px; align-items: flex-end; }
|
.driver-list-toolbar { display: flex; flex-wrap: wrap; gap: 10px 14px; align-items: flex-end; }
|
||||||
.driver-list-toolbar #driverBrandFilter { flex: 1 1 220px; }
|
.driver-list-toolbar #driverBrandFilter { flex: 1 1 220px; }
|
||||||
|
.training-list-toolbar #trainingListSearch { flex: 1 1 220px; width: auto; }
|
||||||
|
.training-list-grouped .training-club-table th:nth-child(2), .training-list-grouped .training-club-table td:nth-child(2) { display: none; }
|
||||||
.driver-list-toolbar label:not(.toggle) { display: grid; gap: 4px; font-size: 0.85rem; color: var(--muted); }
|
.driver-list-toolbar label:not(.toggle) { display: grid; gap: 4px; font-size: 0.85rem; color: var(--muted); }
|
||||||
.driver-list-count { color: var(--muted); font-size: 0.85rem; margin-left: auto; }
|
.driver-list-count { color: var(--muted); font-size: 0.85rem; margin-left: auto; }
|
||||||
.driver-list-bulk { display: flex; flex-wrap: wrap; gap: 12px; align-items: center; padding-top: 0; }
|
.driver-list-bulk { display: flex; flex-wrap: wrap; gap: 12px; align-items: center; padding-top: 0; }
|
||||||
|
|||||||
+76
-8
@@ -1,4 +1,5 @@
|
|||||||
import { sortValuesAttribute } from "./list_sorting.js";
|
import { sortValuesAttribute } from "./list_sorting.js";
|
||||||
|
import { trainingRowVisible } from "./driver_list_logic.js";
|
||||||
import { getDriverProfileGroups, getDriverProfileReferences } from "./driver_profile_logic.js";
|
import { getDriverProfileGroups, getDriverProfileReferences } from "./driver_profile_logic.js";
|
||||||
import { normalizeTrackLayouts } from "./track_layouts_logic.js";
|
import { normalizeTrackLayouts } from "./track_layouts_logic.js";
|
||||||
import { renderTrackLayoutBar, bindTrackLayoutBar } from "./track_layout_bar.js";
|
import { renderTrackLayoutBar, bindTrackLayoutBar } from "./track_layout_bar.js";
|
||||||
@@ -1121,6 +1122,40 @@ export function buildTrainingProgressFeed(rows, limit = 6) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The club table's search, class and "only trained" filters. Grouping and "only trained" are
|
||||||
|
// remembered in this browser; search and class last while the page is open.
|
||||||
|
const TRAINING_LIST_PREFS_KEY = "rcTrainingListPrefs";
|
||||||
|
const trainingList = (() => {
|
||||||
|
let prefs = {};
|
||||||
|
try { prefs = JSON.parse(localStorage.getItem(TRAINING_LIST_PREFS_KEY) || "{}") || {}; } catch { prefs = {}; }
|
||||||
|
return { search: "", classId: "", grouped: prefs.grouped === true, activeOnly: prefs.activeOnly !== false, collapsed: new Set() };
|
||||||
|
})();
|
||||||
|
const saveTrainingListPrefs = () => {
|
||||||
|
try { localStorage.setItem(TRAINING_LIST_PREFS_KEY, JSON.stringify({ grouped: trainingList.grouped, activeOnly: trainingList.activeOnly })); } catch { /* private window */ }
|
||||||
|
};
|
||||||
|
|
||||||
|
// Shows/hides the rows in place (no re-render, so typing keeps focus) and updates the count.
|
||||||
|
function applyTrainingListFilter(root, t) {
|
||||||
|
if (!root) return;
|
||||||
|
const rows = [...root.querySelectorAll("tr[data-training-row]")];
|
||||||
|
let shown = 0;
|
||||||
|
rows.forEach((tr) => {
|
||||||
|
const visible = trainingRowVisible({ name: tr.dataset.name, classId: tr.dataset.classId, laps: Number(tr.dataset.laps) }, trainingList);
|
||||||
|
tr.hidden = !visible;
|
||||||
|
if (visible) shown += 1;
|
||||||
|
});
|
||||||
|
root.querySelectorAll("[data-training-group]").forEach((group) => {
|
||||||
|
const count = group.querySelectorAll("tr[data-training-row]:not([hidden])").length;
|
||||||
|
group.hidden = count === 0;
|
||||||
|
const label = group.querySelector("[data-training-group-count]");
|
||||||
|
if (label) label.textContent = t("drivers.group_count", { count });
|
||||||
|
});
|
||||||
|
const counter = root.querySelector("[data-training-list-count]");
|
||||||
|
if (counter) counter.textContent = t("drivers.count", { shown, total: rows.length });
|
||||||
|
const none = root.querySelector("[data-training-list-none]");
|
||||||
|
if (none) none.hidden = shown > 0;
|
||||||
|
}
|
||||||
|
|
||||||
function renderTrainingOverview({ addTrackLayout, state, dom, t, escapeHtml, formatLap, uid, saveState, profiles, buildDriverTrainingStats, getNextTrainingMilestone, getClubTrainingGoalProgress, countExerciseSessions, setSelectedDriverId, setSelectedClassId, renderView }) {
|
function renderTrainingOverview({ addTrackLayout, state, dom, t, escapeHtml, formatLap, uid, saveState, profiles, buildDriverTrainingStats, getNextTrainingMilestone, getClubTrainingGoalProgress, countExerciseSessions, setSelectedDriverId, setSelectedClassId, renderView }) {
|
||||||
const rows = buildTrainingOverviewRows(state, profiles, buildDriverTrainingStats);
|
const rows = buildTrainingOverviewRows(state, profiles, buildDriverTrainingStats);
|
||||||
const progressFeed = buildTrainingProgressFeed(rows);
|
const progressFeed = buildTrainingProgressFeed(rows);
|
||||||
@@ -1151,13 +1186,13 @@ function renderTrainingOverview({ addTrackLayout, state, dom, t, escapeHtml, for
|
|||||||
`;
|
`;
|
||||||
}).join("")
|
}).join("")
|
||||||
: `<p class="hint">${escapeHtml(t("training.feed_empty"))}</p>`;
|
: `<p class="hint">${escapeHtml(t("training.feed_empty"))}</p>`;
|
||||||
const tableRows = rows.map((row) => {
|
const rowMarkup = (row) => {
|
||||||
const milestone = getNextTrainingMilestone(row.stats);
|
const milestone = getNextTrainingMilestone(row.stats);
|
||||||
const lastActivity = row.stats.lastLapAt
|
const lastActivity = row.stats.lastLapAt
|
||||||
? new Date(row.stats.lastLapAt).toLocaleString(undefined, { dateStyle: "medium", timeStyle: "short" })
|
? new Date(row.stats.lastLapAt).toLocaleString(undefined, { dateStyle: "medium", timeStyle: "short" })
|
||||||
: "-";
|
: "-";
|
||||||
return `
|
return `
|
||||||
<tr data-sort-values="${sortValuesAttribute([row.driver?.name, row.className, row.stats.totalLaps, row.stats.trainingDays, row.stats.bestLapMs || null, row.stats.lastLapAt || null, milestone.targetLaps])}">
|
<tr data-training-row data-name="${escapeHtml(row.driver?.name || "")}" data-class-id="${escapeHtml(row.classId)}" data-laps="${Number(row.stats.totalLaps || 0)}" ${trainingRowVisible({ name: row.driver?.name, classId: row.classId, laps: row.stats.totalLaps }, trainingList) ? "" : "hidden"} data-sort-values="${sortValuesAttribute([row.driver?.name, row.className, row.stats.totalLaps, row.stats.trainingDays, row.stats.bestLapMs || null, row.stats.lastLapAt || null, milestone.targetLaps])}">
|
||||||
<td><button class="training-club-driver" data-driver-id="${escapeHtml(row.profile.id)}" data-class-id="${escapeHtml(row.classId)}" type="button">${escapeHtml(row.driver?.name || "-")}</button></td>
|
<td><button class="training-club-driver" data-driver-id="${escapeHtml(row.profile.id)}" data-class-id="${escapeHtml(row.classId)}" type="button">${escapeHtml(row.driver?.name || "-")}</button></td>
|
||||||
<td>${escapeHtml(row.className)}</td>
|
<td>${escapeHtml(row.className)}</td>
|
||||||
<td>${row.stats.totalLaps}</td>
|
<td>${row.stats.totalLaps}</td>
|
||||||
@@ -1167,7 +1202,25 @@ function renderTrainingOverview({ addTrackLayout, state, dom, t, escapeHtml, for
|
|||||||
<td>${milestone.targetLaps}</td>
|
<td>${milestone.targetLaps}</td>
|
||||||
</tr>
|
</tr>
|
||||||
`;
|
`;
|
||||||
}).join("");
|
};
|
||||||
|
const classChoices = [...new Map(rows.map((row) => [String(row.classId || ""), row.className])).entries()]
|
||||||
|
.sort((a, b) => String(a[1]).localeCompare(String(b[1]), "sv", { numeric: true }));
|
||||||
|
if (trainingList.classId && !classChoices.some(([id]) => id === trainingList.classId)) trainingList.classId = "";
|
||||||
|
const clubTable = (list) => `
|
||||||
|
<div class="table-wrap training-history-wrap">
|
||||||
|
<table data-sort-id="training-overview" data-sort-text-columns="0,1" class="training-history-table training-club-table">
|
||||||
|
<thead><tr>${clubTableHead}</tr></thead>
|
||||||
|
<tbody>${list.map(rowMarkup).join("")}</tbody>
|
||||||
|
</table>
|
||||||
|
</div>`;
|
||||||
|
const clubTableHead = `<th>${escapeHtml(t("training.driver"))}</th><th>${escapeHtml(t("training.class"))}</th><th>${escapeHtml(t("training.laps"))}</th><th>${escapeHtml(t("training.training_days"))}</th><th>${escapeHtml(t("training.best_lap"))}</th><th>${escapeHtml(t("training.last_activity"))}</th><th>${escapeHtml(t("training.next_target"))}</th>`;
|
||||||
|
const clubListMarkup = trainingList.grouped
|
||||||
|
? classChoices.map(([classId, className]) => `
|
||||||
|
<details class="driver-class-group" data-training-group="${escapeHtml(classId)}" ${trainingList.collapsed.has(classId) ? "" : "open"}>
|
||||||
|
<summary><strong>${escapeHtml(className)}</strong> <small data-training-group-count></small></summary>
|
||||||
|
${clubTable(rows.filter((row) => String(row.classId || "") === classId))}
|
||||||
|
</details>`).join("")
|
||||||
|
: clubTable(rows);
|
||||||
const clubGoalIsSessions = clubGoal?.metric === "sessions";
|
const clubGoalIsSessions = clubGoal?.metric === "sessions";
|
||||||
const clubGoalEmoji = clubGoalIsSessions ? EXERCISE_KIND_EMOJI[clubGoal.exerciseKind] || "" : "";
|
const clubGoalEmoji = clubGoalIsSessions ? EXERCISE_KIND_EMOJI[clubGoal.exerciseKind] || "" : "";
|
||||||
const clubGoalUnitLabel = clubGoalIsSessions ? t(`training.exercise_kind_${clubGoal.exerciseKind}`) : "";
|
const clubGoalUnitLabel = clubGoalIsSessions ? t(`training.exercise_kind_${clubGoal.exerciseKind}`) : "";
|
||||||
@@ -1253,17 +1306,32 @@ function renderTrainingOverview({ addTrackLayout, state, dom, t, escapeHtml, for
|
|||||||
<div class="panel-header"><h3>${escapeHtml(t("training.club_progress"))}</h3><span class="badge">${rows.length}</span></div>
|
<div class="panel-header"><h3>${escapeHtml(t("training.club_progress"))}</h3><span class="badge">${rows.length}</span></div>
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<p class="hint">${escapeHtml(t("training.overview_class_hint"))}</p>
|
<p class="hint">${escapeHtml(t("training.overview_class_hint"))}</p>
|
||||||
<div class="table-wrap training-history-wrap">
|
<div class="driver-list-toolbar training-list-toolbar">
|
||||||
<table data-sort-id="training-overview" data-sort-text-columns="0,1" class="training-history-table training-club-table">
|
<input id="trainingListSearch" type="search" value="${escapeHtml(trainingList.search)}" placeholder="${escapeHtml(t("training.list_search"))}" />
|
||||||
<thead><tr><th>${escapeHtml(t("training.driver"))}</th><th>${escapeHtml(t("training.class"))}</th><th>${escapeHtml(t("training.laps"))}</th><th>${escapeHtml(t("training.training_days"))}</th><th>${escapeHtml(t("training.best_lap"))}</th><th>${escapeHtml(t("training.last_activity"))}</th><th>${escapeHtml(t("training.next_target"))}</th></tr></thead>
|
<label>${escapeHtml(t("drivers.class_filter"))}<select id="trainingListClass">
|
||||||
<tbody>${tableRows}</tbody>
|
<option value="">${escapeHtml(t("drivers.all_classes"))}</option>
|
||||||
</table>
|
${classChoices.map(([id, name]) => `<option value="${escapeHtml(id)}" ${id === trainingList.classId ? "selected" : ""}>${escapeHtml(name)}</option>`).join("")}
|
||||||
|
</select></label>
|
||||||
|
<label class="toggle"><input type="checkbox" id="trainingListActive" ${trainingList.activeOnly ? "checked" : ""} /><span>${escapeHtml(t("training.list_active_only"))}</span></label>
|
||||||
|
<label class="toggle"><input type="checkbox" id="trainingListGrouped" ${trainingList.grouped ? "checked" : ""} /><span>${escapeHtml(t("drivers.group_by_class"))}</span></label>
|
||||||
|
<span class="driver-list-count" data-training-list-count></span>
|
||||||
</div>
|
</div>
|
||||||
|
<p class="hint" data-training-list-none hidden>${escapeHtml(t("drivers.none_found"))}</p>
|
||||||
|
<div class="${trainingList.grouped ? "training-list-grouped" : ""}">${clubListMarkup}</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
`;
|
`;
|
||||||
|
|
||||||
bindTrainingLayoutControls({ state, t, addTrackLayout, renderView });
|
bindTrainingLayoutControls({ state, t, addTrackLayout, renderView });
|
||||||
|
const clubPanel = document.getElementById("trainingListSearch")?.closest(".panel-body");
|
||||||
|
applyTrainingListFilter(clubPanel, t);
|
||||||
|
document.getElementById("trainingListSearch")?.addEventListener("input", (event) => { trainingList.search = event.currentTarget.value; applyTrainingListFilter(clubPanel, t); });
|
||||||
|
document.getElementById("trainingListClass")?.addEventListener("change", (event) => { trainingList.classId = event.currentTarget.value; applyTrainingListFilter(clubPanel, t); });
|
||||||
|
document.getElementById("trainingListActive")?.addEventListener("change", (event) => { trainingList.activeOnly = event.currentTarget.checked; saveTrainingListPrefs(); applyTrainingListFilter(clubPanel, t); });
|
||||||
|
document.getElementById("trainingListGrouped")?.addEventListener("change", (event) => { trainingList.grouped = event.currentTarget.checked; saveTrainingListPrefs(); renderView(); });
|
||||||
|
clubPanel?.querySelectorAll("[data-training-group]").forEach((group) => group.addEventListener("toggle", () => {
|
||||||
|
if (group.open) trainingList.collapsed.delete(group.dataset.trainingGroup); else trainingList.collapsed.add(group.dataset.trainingGroup);
|
||||||
|
}));
|
||||||
document.getElementById("training-overview-driver")?.addEventListener("change", (event) => {
|
document.getElementById("training-overview-driver")?.addEventListener("change", (event) => {
|
||||||
if (!event.currentTarget.value) return;
|
if (!event.currentTarget.value) return;
|
||||||
setSelectedDriverId(event.currentTarget.value);
|
setSelectedDriverId(event.currentTarget.value);
|
||||||
|
|||||||
@@ -58,6 +58,18 @@ export async function runTrainingSourceSmoke({ evaluate, navigate, savedState, w
|
|||||||
assert.equal(row[1], "🏁 TS Winter #3 TS 2WD · Kval 2 · TS Winter Cup", "race, session and series");
|
assert.equal(row[1], "🏁 TS Winter #3 TS 2WD · Kval 2 · TS Winter Cup", "race, session and series");
|
||||||
assert.equal(row[2], "3");
|
assert.equal(row[2], "3");
|
||||||
console.log("PASS training stats: practice by default; races shown per race session with 🏁 race · session · series, never as stints");
|
console.log("PASS training stats: practice by default; races shown per race session with 🏁 race · session · series, never as stints");
|
||||||
|
|
||||||
|
// The club table at the bottom of the overview: search and only drivers who trained.
|
||||||
|
await evaluate(`location.href = ${JSON.stringify(`${base}/?view=training`)}`);
|
||||||
|
await waitFor(async () => Boolean(await evaluate(`document.getElementById("trainingListSearch") && document.querySelector('tr[data-training-row][data-name="TS Driver"]')`)), "the club table with its toolbar");
|
||||||
|
const visibleNames = () => evaluate(`[...document.querySelectorAll("tr[data-training-row]:not([hidden])")].map((tr) => tr.dataset.name)`);
|
||||||
|
assert.ok((await visibleNames()).includes("TS Driver"), "a driver who trained is listed");
|
||||||
|
await evaluate(`(() => { const input = document.getElementById("trainingListSearch"); input.value = "no such driver"; input.dispatchEvent(new Event("input")); })()`);
|
||||||
|
assert.deepEqual(await visibleNames(), [], "the search hides the others");
|
||||||
|
assert.equal(await evaluate(`document.querySelector("[data-training-list-none]").hidden`), false, "and says nothing matches");
|
||||||
|
await evaluate(`(() => { const input = document.getElementById("trainingListSearch"); input.value = "ts dri"; input.dispatchEvent(new Event("input")); })()`);
|
||||||
|
assert.deepEqual(await visibleNames(), ["TS Driver"]);
|
||||||
|
console.log("PASS training stats: the club table has a search box that filters the drivers");
|
||||||
} finally {
|
} finally {
|
||||||
const current = await savedState();
|
const current = await savedState();
|
||||||
const results = { ...current.resultsBySession };
|
const results = { ...current.resultsBySession };
|
||||||
|
|||||||
@@ -47,3 +47,14 @@ test("deleting several drivers removes them from heats, participant lists and te
|
|||||||
assert.deepEqual(state.events[0].raceConfig.driverIds, ["a"]);
|
assert.deepEqual(state.events[0].raceConfig.driverIds, ["a"]);
|
||||||
assert.deepEqual(state.events[0].raceConfig.teams[0].driverIds, []);
|
assert.deepEqual(state.events[0].raceConfig.teams[0].driverIds, []);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("training stats table: search, one class and only drivers who trained", async () => {
|
||||||
|
const { trainingRowVisible } = await import("../src/driver_list_logic.js");
|
||||||
|
const row = { name: "Roy Andersson", classId: "c1", laps: 12 };
|
||||||
|
assert.equal(trainingRowVisible(row), true);
|
||||||
|
assert.equal(trainingRowVisible(row, { search: "roy" }), true);
|
||||||
|
assert.equal(trainingRowVisible(row, { search: "eddie" }), false);
|
||||||
|
assert.equal(trainingRowVisible(row, { classId: "c2" }), false);
|
||||||
|
assert.equal(trainingRowVisible({ ...row, laps: 0 }, { activeOnly: true }), false);
|
||||||
|
assert.equal(trainingRowVisible({ ...row, laps: 0 }), true);
|
||||||
|
});
|
||||||
Reference in new issue
Block a user