Bind player rankings and fair play to recorded season events (by Codex)

This commit is contained in:
Codex committed 2026-10-28 23:46:35 +01:00
1 parent 6b4aa9772d
commit 738ecc7a09
27 files changed
+436 -36

No files matched your search

+1 -1
View File
@@ -52,7 +52,7 @@ jobs:
- name: Configure opt-in UI without external assets
run: cmake -S . -B build-ui -G Ninja -DCMAKE_BUILD_TYPE=Release -DOPENBMH_BUILD_MODERN_UI=ON -DOPENBMH_BUILD_EDITOR=OFF -DBMH_DATA=
- name: Compile native frontend and synthetic checks
run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_stadium_ui_tests modern_statistics_ui_tests modern_news_ui_tests modern_settings_ui_tests modern_desktop_ui_tests modern_files_ui_tests modern_mods_ui_tests modern_entry_ui_tests modern_opening_ui_tests modern_select_menu_tests modern_career_ui_tests modern_live_ui_tests modern_national_ui_tests modern_news_catalog_tests modern_post_match_ui_tests modern_engine_dto_tests modern_report_read_tests modern_other_read_tests --parallel 2
run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_stadium_ui_tests modern_statistics_ui_tests modern_news_ui_tests modern_settings_ui_tests modern_desktop_ui_tests modern_files_ui_tests modern_mods_ui_tests modern_entry_ui_tests modern_opening_ui_tests modern_select_menu_tests modern_career_ui_tests modern_live_ui_tests modern_national_ui_tests modern_news_catalog_tests modern_post_match_ui_tests modern_engine_dto_tests modern_report_read_tests modern_other_read_tests modern_rankings_read_tests --parallel 2
- name: Check controls, fonts, density and draft cancellation
run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_|statistics_ui_|news_ui_|settings_ui_|desktop_ui_|files_ui_|mods_ui_|entry_ui_|opening_ui_|select_menu_|career_ui_|live_ui_|national_ui_|news_catalog_|post_match_ui_|engine_dto_|report_read_)" -LE external-data --output-on-failure --output-junit modern-ui-results.xml
- name: Upload test report
+4
View File
@@ -1217,6 +1217,10 @@ add_test(NAME modern_camp_tests COMMAND modern_camp_tests)
add_executable(modern_almanac_tests tests/modern_almanac_tests.cpp)
target_link_libraries(modern_almanac_tests PRIVATE bmh_modern_content)
add_test(NAME modern_almanac_tests COMMAND modern_almanac_tests)
add_executable(modern_rankings_read_tests tests/modern_rankings_read_tests.cpp)
target_link_libraries(modern_rankings_read_tests PRIVATE bmh_modern_content)
add_test(NAME modern_rankings_read_tests COMMAND modern_rankings_read_tests)
add_executable(modern_other_read_tests tests/modern_other_read_tests.cpp)
target_link_libraries(modern_other_read_tests PRIVATE bmh_modern_content)
add_test(NAME modern_other_read_tests COMMAND modern_other_read_tests)
+2
View File
@@ -130,3 +130,5 @@ body.midnight .rankings-scorer-list .rankings-club-button.current,body.midnight
body.silver .rankings-fair-list,body.matchday .rankings-fair-list {background-color:var(--panel);}
body.silver .rankings-row.striped,body.silver .rankings-fair-row.striped {background-color:#42627d09;}
body.matchday .rankings-row.striped,body.matchday .rankings-fair-row.striped {background-color:#f8e7e00a;}
/* Match the selected footer caption in the open menu, at every UI density. */
.rankings-footer .report-picker-popup .report-picker-option {font-size:30dp;}
+1 -1
View File
@@ -57,7 +57,7 @@ Für 0.3 gilt außerdem:
| M3 | Modern-Weltlader, Namen (Vor-/Nachname, UTF-8), Asset-Schlüssel | Weltlader erledigt: Modern-Datensatz spielt zwei Saisons; Namen/Assets für die UI liegen in `ModernState`, Spielstände folgen mit M6 |
| M4 | Trainingslager: 18 Lager, drei Karten, 6-Sterne-Wirkung | Engine erledigt (Katalog, Preis, 6-Sterne-Wirkung, Test); Saisonwirkung wird in M7 gemessen |
| M5 | Datenrevision 1.4 des Modern-Datensatzes (privat), Wirtschaftsprüfung | erledigt: Revision 1.4 abgenommen (Lager, 100 Schiedsrichter, Geburtsdaten; siehe Phasen) |
| M6 | Modern-Spielstände (`modern-career-v1`), Projektionen für die UI | Spielstände erledigt (Rundreise identisch); UI-Projektionen schrittweise angebunden (u. a. Tabellen, Stärken, Liga-/Pokalspiele, Almanach) |
| M6 | Modern-Spielstände (`modern-career-v1`), Projektionen für die UI | Spielstände erledigt (Rundreise identisch); UI-Projektionen schrittweise angebunden (u. a. Tabellen, Stärken, Liga-/Pokalspiele, Spielerstatistiken/Fairplay, Almanach) |
| M7 | Balance-Läufe und Anpassungen | erledigt: Spielerwerte nach Rangfolge, Langläufe über 12 Saisons ohne Drift gegenüber Classic ([Balance](balance.md)); offen nur Läufe mit aktivem Manager |
| M8 | Fußball-Almanach: alle Spiele mit Ereignissen und Aufstellungen ([Almanach](almanach.md)) | Engine und Leseprojektionen vorhanden; nativer Almanach angeschlossen; Elfmeterschuss-Aufzeichnung und belegte Altarchive korrigiert (#18) |
| M9 | Nationalteams mit echten Kadern ([Nationalteams](nationalteams.md)) | Engine erledigt: 24 von 61 Nationen des Diamond-Datensatzes spielen mit Spielern |
+12
View File
@@ -146,3 +146,15 @@ Keine Änderung an Spielregeln, Zufallsverbrauch, Spielstand- oder OBW-Format;
keine Editoranpassung nötig. Tests decken offene/gespielte Spiele, Zukunftsrunden,
vertauschte Zweitspielwerte und Kontextgrenzen ab. Private Belege:
`bmh_4k_ui/docs/qa/engine-other-2026-10-28/`.
### M6 · Spielerstatistiken/Fairplay, 28. Oktober 2026
`player-rankings` und `fairplay` liefern aktuelle Saisonereignisse aus dem
Almanach. Die vorhandene Spielerstatistik-Auswertung erhält einen optionalen
internen Vereinsfilter vor der Aggregation; bestehende öffentliche Abfragen
bleiben unverändert. Profilbezüge verwenden stabile IDs und heutige Runtime-Kader,
keine historischen Kaderpositionen. Fairplay zählt Kartenereignisse inklusive
Gelb-Rot und liefert die bekannten Darstellungsgewichte. Keine Regel-, OBW-,
Spielstand- oder Editoränderung. Synthetische Tests prüfen Saison-/Vereinsgrenzen,
Transfers, Tore/Assists, Einsätze, Karten und Gleichstände. Private QA:
`bmh_4k_ui/docs/qa/engine-rankings-2026-10-28/`.
+22
View File
@@ -58,3 +58,25 @@ liegt. `phase` ist der gespeicherte Pokalmarker (0 normal, 1 Verlängerung,
2 Elfmeterschießen), kein rekonstruierter Phasen-Teilstand. `available: false`
enthält keine Paarungen; `reason` ist `round_pending` oder `stage_pending`.
Ungültige Ansichten/Runden und fehlende Core-Daten werden abgewiesen.
## Spielerstatistiken und Fairplay
`ui_read {kind: "player-rankings", leagueId, scope: 0|1}` liefert `kind`,
`requestLeagueId`, tatsächliche `leagueId`, `scope`, `season`, `team` und
`categories` (Tore, Vorlagen, Gelb, Rot). Jede Liste enthält nur positive Werte
und wird vom Engine-Provider sortiert, einschließlich Gleichstandsplätzen.
Zeilen: `rank`, `player {id,name}`, `club {id,name}`, `appearances`, `goals`,
`assists`, `yellow`, `second_yellow`, `red`, `value`, `photoAssetId`, `currentTeam`.
`currentTeam` ist eine aktuelle Teamreferenz oder null; club bezeichnet den Verein
des letzten ausgewerteten Einsatzes. scope 1 zählt nur Beiträge für den eigenen
Verein und verwendet dessen Liga; requestLeagueId bewahrt die UI-Ligavorliebe.
`ui_read {kind: "fairplay"}` liefert die laufende Saison und erste deutsche
Liga, `weights {yellow:1,red:4}`, `recordedMatches` und `rows` mit `rank`,
`team {id,name}`, `yellow`, `red`, `points`. Rot zählt Rot plus Gelb-Rot;
Gelb zählt ausdrücklich aufgezeichnete Gelbereignisse. Alle aktuellen Vereine
sind enthalten. Die Gewichtung ist eine Anzeigeauswertung, keine Disziplinarregel.
Beide Reads sind rein und revisionsgebunden. Es gibt keinen Demoersatz bei
leeren Kategorien und keine erfundenen Fotos/Profilwerte. OBW und Editor bleiben
unverändert.
+1 -1
View File
@@ -6,7 +6,7 @@ Die normale Classic-Konfiguration bleibt unverändert; die neue Oberfläche
wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut.
Der [opt-in Engine-Einstieg](integration/ENGINE_ENTRY.md) lädt inzwischen eine
echte Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung, Spielerverträge, Vereinskalender, Spielverlegung, Vereins-/Nationalfreundschaftsspiele, den Almanach sowie Tabellen, Stärken, Ligaspiele und übrige Spiele an die
echte Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung, Spielerverträge, Vereinskalender, Spielverlegung, Vereins-/Nationalfreundschaftsspiele, den Almanach sowie Tabellen, Stärken, Ligaspiele, übrige Spiele, Spielerstatistiken und Fairplay an die
Session. Kader und Profile zeigen die tatsächlichen Sessionwerte; Spielertausch
verwendet die bestätigte Engineaktion. Preisbestätigung, Buchung und Speichern als neue OBS-Datei sind echte
Engineoperationen. Dieser Einstieg ist auf diesen Umfang begrenzt; die übrigen
+2 -2
View File
@@ -46,8 +46,8 @@ Implementierung in der Spiel-Engine.
| Hallentabellen | [16 Vereine, Sortierung und Hallenmasters-Info](desktop/indoor/README.md) |
| Transfermarkt | [Suche, Angebote, Listings und Vormerkungen](desktop/transfer/README.md) |
| Erfolge | [Saisonverläufe, Ligafarben und Vereinsgeschichte](desktop/achievements/README.md) |
| Spielerstatistiken | [Tore, Vorlagen, Karten, Fotokarten und Bereichsauswahl](desktop/scorers/README.md) |
| Fairplay | [Strafpunkte, Karten und Vereinsprofile](desktop/fairplay/README.md) |
| Spielerstatistiken | [Echte Saisonwerte, Fotokarten, aktueller/archivierter Profilbezug und Vereinsbereich](desktop/scorers/README.md) |
| Fairplay | [Echte Saison-Karten, Strafpunkte und aktuelle Vereinsprofile](desktop/fairplay/README.md) |
| Highscore | [Manager-Rangliste und zentrierte Kennzahlen](desktop/highscore/README.md) |
| Stadion | [Blöcke A–H, Ausstattung, kalibriertes Stadionumfeld und Stadiondaten](desktop/stadium/README.md) |
| Statistiken | [Neun Auswertungen, Siegerlisten, Analytics und Pokalbilder](desktop/statistics/README.md) |
+31
View File
@@ -25,6 +25,37 @@ die drei Zahlenspalten jeweils 15 Prozent. Der Tabellenkopf verwendet
Schriftgröße 30, der Körper 36. Midnight, Silver und Matchday übernehmen
ihre jeweiligen belegten Farben.
## Tatsächliche Karten · Engine-Anschluss 28. Oktober 2026
Ausgangsstand `0.3` / `6b4aa97`. Der vorhandene Presenter liest im echten Einstieg
`fairplay` über die revisionsgebundene Modern-Session. Maßgeblich sind die
Kartenereignisse des Almanachs aus der laufenden Saison und ersten deutschen
Liga. Damit bleibt die feste Ligaauswahl der Vorlage erhalten; ein anderweitiger
Tabellen-/Spielerstatistikfilter ändert diese Liste nicht.
Alle aktuellen Ligavereine erscheinen, auch mit null Karten. Gelb zählt die
aufgezeichneten Gelbereignisse; Rot umfasst Rot und Gelb-Rot. Die Antwort liefert
die Darstellungsgewichte 1 und 4 sowie die daraus gebildeten Strafpunkte. Diese
Gewichtung ändert keine Sperren oder Disziplinarentscheidungen. Gleichstände
behalten die aktuelle Engine-Vereinsreihenfolge und fortlaufende Plätze.
`recordedMatches` nennt die Zahl der ausgewerteten archivierten Ligapartien;
fehlende Ereignisse werden nicht durch fiktive Karten ersetzt.
Vereins- und Spielerprofile verwenden die bestehenden aktuellen Kader-Reads.
Reine Navigation bewahrt Spielzustand, RNG und Archivbytes. Nach einer tatsächlichen
Sessionänderung wird der Cache verworfen und neu an die Revision gebunden.
Private Nachweise: `bmh_4k_ui/docs/qa/engine-rankings-2026-10-28/`.
Meilensteinprüfung: 53 synthetische CTests, 125 Haupt-GUI-Prüfungen,
16 Randfallprüfungen und 24.092 Text-/Geometrieprüfungen bestanden. Drei Themes
bei 1080p, Silver zusätzlich bei 720p. Alle neun Ligen in beiden Bereichen,
OBS-Neustarts und ein tatsächlicher Aufstellungstausch mit Cacheverwerfung sind
geprüft. Ein kontrollierter synthetischer Spielstand ohne heutigen Kaderbezug
deckt das Archivprofil ab; er ist kein tatsächlicher Rücktritt/Transfer.
Native Ausführung Linux x64; Windows und macOS wurden nicht ausgeführt.
Die nachfolgende Demo-Projektion bleibt getrennt erhalten.
## Unveränderliche Demo-Projektion
[demo_rankings.hpp](../../../../src/modern/ui/demo_rankings.hpp) und
+43
View File
@@ -31,6 +31,49 @@ Die Restliste beginnt bei y=596. Ihre Kopfzeile ist 74, eine Datenzeile
Abstände berücksichtigen die späteren Regeln der HTML-Stylesheets und
die Themes Midnight, Silver und Matchday.
## Tatsächliche Saisonwerte · Engine-Anschluss 28. Oktober 2026
Ausgangsstand `0.3` / `6b4aa97`. Im echten Karriere-Einstieg verwendet derselbe
Presenter `player-rankings {leagueId,scope}` mit Snapshot-Kontext. Vier Kategorien
werden zusammen gelesen und anschließend lokal umgeschaltet. Die vorhandene
Almanach-Auswertung `player_stats` liefert Tore, Vorlagen, Gelb, Gelb-Rot, Rot,
Einsätze, Sortierung und Gleichstandsplätze. Es zählen ausschließlich die
aufgezeichneten Ereignisse der laufenden Saison und gewählten Liga. Schüsse im
Elfmeterschießen werden nicht zu Torschützenwerten. Rot umfasst Rot plus Gelb-Rot.
`scope: 0` zeigt die gewählte Liga, `scope: 1` ausschließlich Beiträge für den
eigenen Verein in dessen Liga. Ein Vereinswechsel nimmt frühere Leistungen für
einen anderen Verein nicht in den Vereinsbereich mit. Die separat gewählte
Liga bleibt als Ansichtsvorliebe erhalten, wenn man zum eigenen Verein und
zurück wechselt. Der Read liefert `requestLeagueId` und tatsächliche `leagueId`
getrennt; daraus wird kein Manager-/Vereinswechsel abgeleitet.
Namen und Vereinszuordnung der Statistik stammen aus dem Archiv, einschließlich
des Vereins des letzten ausgewerteten Einsatzes. `currentTeam` wird anhand
stabiler Spieler-IDs aus den aktuellen Runtime-Kadern ermittelt. Ein Spielerklick
öffnet bei vorhandenem aktuellen Kader die tatsächlichen heutigen Profilwerte;
ohne aktuellen Eintrag bleiben Alter, Stärke und Vertrag unbekannt. Das Profil
ist dann als Saisonaufzeichnung gekennzeichnet; der letzte erfasste Verein
heißt ausdrücklich „Archivverein“. Fotos sind unveränderliche
Weltassetreferenzen mit dem deklarierten Silhouetten-Fallback, keine Anfangs-
Spielerstärken oder geratenen Vertragsdaten.
Länder und Ligen stammen aus dem aktiven `report-index`. Die UI berechnet keine
Tore, Vorlagen oder Rangfolge. Auswahl, Tabs, Scrollen und Profile ändern weder
Spielrevision noch Zufallszustand. Bestätigte Sessionänderungen verwerfen den
Statistikcache. Die ursprüngliche Präsentationsdemo bleibt als eigene Quelle
mit den nachfolgend beschriebenen Dummydaten erhalten.
Private Screenshots, tatsächliche OBS und QA: `bmh_4k_ui/docs/qa/engine-rankings-2026-10-28/`.
Meilensteinprüfung: 53 synthetische CTests, 125 Haupt-GUI-Prüfungen,
16 Randfallprüfungen und 24.092 Text-/Geometrieprüfungen bestanden. Drei Themes
bei 1080p, Silver zusätzlich bei 720p. Alle neun Ligen in beiden Bereichen,
OBS-Neustarts und ein tatsächlicher Aufstellungstausch mit Cacheverwerfung sind
geprüft. Ein kontrollierter synthetischer Spielstand ohne heutigen Kaderbezug
deckt das Archivprofil ab; er ist kein tatsächlicher Rücktritt/Transfer.
Native Ausführung Linux x64; Windows und macOS wurden nicht ausgeführt.
## Datenquelle und lokale Navigation
[demo_rankings.hpp](../../../../src/modern/ui/demo_rankings.hpp) und
+17 -1
View File
@@ -17,7 +17,7 @@ werden. Die Quelle wird nicht in DemoSource überführt.
## Gebundener Umfang
- `ModernSession::ui_read`: `session`, `desktop`, `camps`, `squad`, `lineup`, `tactics`, `training`, `bank`, `stadium`, `credit`, `environment`, `advertising`, `contracts`, `calendar`, `scheduling`, `friendly-plan`, `report-index`, `league-report`, `league-fixtures`, `other-index`, `other-fixtures`; parameterisierte Angebote über `friendly` und Archivabfragen über `almanac`. Karriere, Manager,
- `ModernSession::ui_read`: `session`, `desktop`, `camps`, `squad`, `lineup`, `tactics`, `training`, `bank`, `stadium`, `credit`, `environment`, `advertising`, `contracts`, `calendar`, `scheduling`, `friendly-plan`, `report-index`, `league-report`, `league-fixtures`, `other-index`, `other-fixtures`, `player-rankings`, `fairplay`; parameterisierte Angebote über `friendly` und Archivabfragen über `almanac`. Karriere, Manager,
Mannschaft, Datum, Saison, Geld, Lagerqualitäten und Angebote kommen aus der
Engine. Katalog und Engine müssen dieselbe Welt-ID und Datenrevision haben.
- Der bestehende RmlUI-Schreibtisch verwendet die gemeinsamen App-Buttons und
@@ -312,3 +312,19 @@ Auslosung bleiben ohne Paarungen; es gibt keinen Demoersatz. Hin-/Rückspiele,
Verlängerungs-/Elfmetermarker und geplante Datumszeilen bleiben unterscheidbar.
Vereinsprofile verwenden die gemeldeten Teilnehmer, Spielerprofile ausschließlich
tatsächlich vorhandene Runtime-Kader. [Vertrag und Grenzen](../desktop/reports/README.md).
## Spielerstatistiken und Fairplay · 28. Oktober 2026
Die bestehenden Presenter lesen tatsächliche Ereignisse der aktuellen Saison.
`player-rankings {leagueId,scope}` liefert vier fertig sortierte Kategorien mit
Gleichstandsplätzen, archivierter Identität und optionalem aktuellem Kaderbezug.
Der Vereinsbereich filtert die Beiträge vor dem Zusammenzählen nach Verein;
Leistungen vor einem Transfer werden nicht dem neuen Verein zugeschlagen.
`fairplay` liefert Karten/Strafpunkte für alle aktuellen Vereine der ersten
Liga, einschließlich Nullzeilen. Die Darstellungsgewichte ändern keine Sperren.
Beide Reads verwenden report-index und den üblichen Karriere-/Manager-/Welt-/
Revisionskontext. Tabs bleiben lokal, Sessionmutationen verwerfen den Cache.
Profile zeigen aktuelle Kaderwerte oder ausdrücklich unbekannte Angaben bei
nur noch archivierten Personen. [Spielerstatistiken](../desktop/scorers/README.md)
und [Fairplay](../desktop/fairplay/README.md) beschreiben Umfang und Grenzen.
+80 -2
View File
@@ -169,7 +169,7 @@ struct PlayerRow {
};
J player_stats(const ModernState& g, const std::vector<AlmanacSeason>& seasons, const std::string& competition,
const std::string& season, const std::string& sort, size_t limit) {
const std::string& season, const std::string& sort, size_t limit, const std::string& team = {}) {
std::map<std::string, PlayerRow> rows;
uint64_t order = 0;
for (const auto& s : seasons) {
@@ -178,7 +178,9 @@ J player_stats(const ModernState& g, const std::vector<AlmanacSeason>& seasons,
++order;
if (competition_of(g, s, m).id != competition) continue;
auto row = [&](uint16_t player, int side) -> PlayerRow* {
if (player >= s.players.size()) return nullptr;
if (player >= s.players.size() || side < 0 || side > 1) return nullptr;
const uint16_t club = side ? m.away : m.home;
if (!team.empty() && (club >= s.clubs.size() || s.clubs[club].id != team)) return nullptr;
const AlmanacPlayer& p = s.players[player];
PlayerRow& r = rows[p.id];
r.id = p.id, r.name = player_name(p);
@@ -765,6 +767,82 @@ cli::Json query_statistics_screen(const ModernState& g, int manager, const cli::
}
// Current-season views for the existing player-statistics and fair-play presenters.
cli::Json query_rankings(const ModernState& g, int manager, const cli::Json& request) {
const J* kind = field(request, "kind"), *wanted = field(request, "leagueId"), *scope_value = field(request, "scope");
if (!kind || !kind->string()) return error("invalid_rankings_request");
const bool fair = *kind->string() == "fairplay";
if (!fair && *kind->string() != "player-rankings") return error("invalid_rankings_request");
if ((scope_value && (!scope_value->integer() || *scope_value->integer() < 0 || *scope_value->integer() > 1)) || manager < 0 || size_t(manager) >= g.manager_teams.size()) return error("invalid_rankings_request");
const int scope = scope_value ? int(*scope_value->integer()) : 0;
const int own = g.manager_teams[size_t(manager)];
if (own < 0 || own >= league_clubs()) return error("no_club");
const auto league_id = [&](int l) { return size_t(l) < g.world_league_id.size() && !g.world_league_id[size_t(l)].empty() ? g.world_league_id[size_t(l)] : "league:" + std::to_string(l); };
int requested = -1;
for (int l = 0; l < kLeagueCount; ++l) if (wanted && wanted->string() && *wanted->string() == league_id(l)) requested = l;
if (!fair && requested < 0) return error("invalid_rankings_league");
const int league = fair ? 0 : scope ? team_league(own) : requested;
const std::string season = season_label(g.display_start_year + g.season);
const auto team_id = [&](int t) {return size_t(t) < g.world_club_id.size() && !g.world_club_id[size_t(t)].empty() ? g.world_club_id[size_t(t)] : "team:" + std::to_string(t);};
const auto team_name = [&](int t) {return size_t(t) < g.world_club_name.size() && !g.world_club_name[size_t(t)].empty() ? g.world_club_name[size_t(t)] : almanac_utf8(g.club_name(t));};
try {
const auto seasons = seasons_of(g);
O out{{"ok", true}, {"kind", fair ? "fairplay" : "player-rankings"}, {"leagueId", league_id(league)}, {"season", season}, {"team", O{{"id", team_id(own)}, {"name", team_name(own)}}}};
if (!fair) {
out["requestLeagueId"] = league_id(requested); out["scope"] = scope;
std::map<std::string, int> current_teams;
for (int t = 0; t < league_clubs(); ++t) {
const auto range = squad_range(t);
for (size_t slot = range.first; slot < range.first + range.count && slot < g.squad_slots.size(); ++slot) {
const size_t player = g.squad_slots[slot] & 0x0fff;
if (player != 0x0fff && player < g.world_player_id.size() && !g.world_player_id[player].empty()) current_teams[g.world_player_id[player]] = t;
}
}
A categories;
for (const char* sort : {"goals", "assists", "yellow", "red"}) {
J stats = player_stats(g, seasons, league_id(league), season, sort, 0, scope ? team_id(own) : std::string());
for (auto& row : std::get<A>(stats.object()->at("players").value)) {
auto& values = *row.object(); const auto& pid = *values.at("player").object()->at("id").string();
const World* world = current_world(); const WorldPlayer* player = world ? world->player(pid) : nullptr;
values["photoAssetId"] = player && !player->photo.empty() ? J(player->photo) : J(nullptr);
const auto active = current_teams.find(pid);
values["currentTeam"] = active == current_teams.end() ? J(nullptr) : J(O{{"id", team_id(active->second)}, {"name", team_name(active->second)}});
values["value"] = std::string(sort) == "red" ? J(*values.at("red").integer() + *values.at("second_yellow").integer()) : values.at(std::string(sort));
}
categories.push_back(std::move(stats.object()->at("players")));
}
out["categories"] = std::move(categories);
} else {
// A presentation weighting, matching the approved UI; it does not affect discipline.
out["weights"] = O{{"yellow", 1}, {"red", 4}};
struct Cards { std::string id, name; int yellow = 0, red = 0; };
std::vector<Cards> cards;
for (int t = league_first_team(league); t < league_first_team(league) + kLeagueSizes[league]; ++t) cards.push_back({team_id(t), team_name(t)});
int matches = 0;
for (const auto& s : seasons) if (season_label(s.start_year) == season)
for (const auto& m : s.matches) {
if (competition_of(g, s, m).id != league_id(league)) continue;
++matches;
for (const auto& e : m.events) {
if (e.side > 1) continue;
const auto club = club_json(s, e.side ? m.away : m.home);
if (!club.object()) continue;
const auto& id = *club.object()->at("id").string();
for (auto& c : cards) if (c.id == id) {
if (e.kind == AlmanacEventKind::YellowCard) ++c.yellow;
if (e.kind == AlmanacEventKind::RedCard || e.kind == AlmanacEventKind::SecondYellow) ++c.red;
}
}
}
std::stable_sort(cards.begin(), cards.end(), [](const Cards& a, const Cards& b) {return a.yellow + 4 * a.red < b.yellow + 4 * b.red;});
A rows;
for (const auto& c : cards) rows.push_back(O{{"rank", int(rows.size() + 1)}, {"team", O{{"id", c.id}, {"name", c.name}}}, {"yellow", c.yellow}, {"red", c.red}, {"points", c.yellow + 4 * c.red}});
out["rows"] = std::move(rows); out["recordedMatches"] = matches;
}
return out;
} catch (const std::exception&) { return error("rankings_unavailable"); }
}
// --- the live ticker of the Modern UI: the recorded matches of the last kickoff ---------------
namespace {
+2
View File
@@ -20,6 +20,8 @@
namespace bmh::modern {
cli::Json query_statistics(const ModernState& g, const cli::Json& request);
// Current-season player categories and fair-play cards from recorded events only.
cli::Json query_rankings(const ModernState& g, int manager, const cli::Json& request);
// The almanac screen of the Modern UI (DataSource::read_almanac), the request kinds of its demo:
// {kind: "index"} years with matches, their number, first and last date
+7
View File
@@ -483,6 +483,13 @@ cli::Json ui_read(const ModernState& g, const UiContext& c, const cli::Json& req
if (kind == "session") return snapshot(request_id, std::move(m), session_data(g, c));
if (kind == "desktop") return snapshot(request_id, std::move(m), desktop_data(g, c, today));
if (kind == "camps") return snapshot(request_id, std::move(m), camps_data(g, c, std::to_string(c.state_revision)));
if (kind == "player-rankings" || kind == "fairplay") {
J data = query_rankings(g, c.manager, request);
auto* values = std::get_if<O>(&data.value);
if (!values || !values->count("ok") || !std::holds_alternative<bool>(values->at("ok").value) || !std::get<bool>(values->at("ok").value))
return failure(request_id, "rankings_unavailable", "Diese Statistik ist im aktuellen Kontext nicht verfügbar.", c.state_revision);
values->erase("ok"); return snapshot(request_id, std::move(m), std::move(data));
}
if (kind == "other-index" || kind == "other-fixtures") {
J data = query_projection(g, c.manager, request);
auto* values = std::get_if<O>(&data.value);
+3
View File
@@ -59,6 +59,9 @@ Json engine_fixtures_projection(const Json &bundle,const Json &index,const Json
Json engine_other_index(const Json &bundle,const Json &read);
Json engine_other_projection(const Json &bundle,const Json &index,const Json &read,const std::string &view,int round);
Json engine_rankings_projection(const Json &bundle,const Json &index,const Json &read,const std::string &league,int scope);
Json engine_fairplay_projection(const Json &bundle,const Json &index,const Json &read);
// Single-session facade. Its owner serializes all calls on a background worker.
// No RmlUI objects or callbacks cross this boundary.
class EngineBridge {
+10 -5
View File
@@ -81,6 +81,7 @@ void App::engine_frame() {
if (auto *roster = element("contracts-roster-scroll")) roster->SetScrollTop(*engine_contract_scroll_);
engine_contract_scroll_.reset();
}
if(rendered&&(menu_=="scorers"||menu_=="fairplay")){rankings_restore_scroll();context_->Update();}
if (center_selects(*doc_)) context_->Update();
if (menu_ == "lineup" && lineup_roster_scroll_) {
if (auto *roster = element("lineup-roster-scroll")) roster->SetScrollTop(*lineup_roster_scroll_);
@@ -138,8 +139,9 @@ void App::engine_event(Rml::Event &event) {
if (!engine_busy_ && advertising_event(event)) return;
if (!engine_busy_ && popup_.empty() && contracts_event(event)) return;
if (engine_reports_event(event)) return;
if(!engine_busy_&&popup_.empty()&&rankings_event(event))return;
if (!engine_busy_ && popup_.empty() && engine_friendly_event(event)) return;
if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other") && report_picker_event(event)) return;
if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers") && report_picker_event(event)) return;
if (engine_sports_event(event)) return;
Rml::ElementFormControl *range = nullptr;
for (auto *node = target; node && node != doc_; node = node->GetParentNode())
@@ -168,7 +170,7 @@ void App::engine_event(Rml::Event &event) {
if (!popup_.empty()) { popup_.clear(); confirm_ = {}; dirty_ = true; }
else if (!engine_busy_ && !engine_player_.empty()) { focus_after_render_ = "lineup-detail-" + engine_player_ + "-0"; engine_player_.clear(); refresh(); }
else if (!engine_busy_ && menu_ == "almanac") engine_almanac_action("alm-back",nullptr);
else if (!engine_busy_ && !menu_.empty()) { if (menu_ == "training" || menu_ == "tactics") engine_sports_reset(); menu_.clear(); refresh(); }
else if (!engine_busy_ && !menu_.empty()) { if (menu_ == "training" || menu_ == "tactics") engine_sports_reset(); if(menu_=="scorers"||menu_=="fairplay")rankings_remember_scroll(); menu_.clear(); refresh(); }
else engine_quit();
event.StopImmediatePropagation(); return;
}
@@ -219,10 +221,11 @@ void App::engine_event(Rml::Event &event) {
if (action == "popup-confirm") { auto callback = std::move(confirm_); popup_.clear(); dirty_ = true; if (callback) callback(); }
return;
}
if(action.starts_with("rankings-")&&menu_=="scorers"){rankings_action(action,node);return;}
if (engine_reports_action(action,node)) return;
if (almanac_action(action,node)) return;
if (engine_friendly_action(action, node)) return;
if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other") && report_picker_action(action,node)) return;
if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers") && report_picker_action(action,node)) return;
if (engine_calendar_action(action, node)) return;
if (contracts_action(action, node)) return;
if (environment_action(action, node)) return;
@@ -230,12 +233,14 @@ void App::engine_event(Rml::Event &event) {
if (bank_action(action, node)) return;
if (engine_sports_action(action, id, node)) return;
if (engine_lineup_action(action, id, node)) return;
if (action == "close") { menu_.clear(); refresh(); }
if (action == "close") { if(menu_=="scorers"||menu_=="fairplay")rankings_remember_scroll(); menu_.clear(); refresh(); }
else if (action == "engine-ticket" && engine_fresh_) {
const auto price = engine_ticket_projection(engine_data_);
ticket_->open(node, device_ratio_, price.at("min"), price.at("max")); dirty_ = true;
}
else if (action == "engine-open" && (id == "environment" || id == "advertising")) { menu_ = id; advertising_selected_ = -1; advertising_offer_ = 0; refresh(); }
else if(action=="engine-open"&&id=="scorers"){menu_=id;engine_reports_sync();engine_rankings_load(engine_rankings_state_.at("league"),engine_rankings_state_.at("scope"));}
else if(action=="engine-open"&&id=="fairplay"){menu_=id;engine_reports_sync();engine_fairplay_load();}
else if(action=="engine-open"&&id=="other"){menu_=id;engine_reports_sync();engine_other_load(engine_other_value_.is_object()?engine_other_value_.at("viewId").get<std::string>():"",engine_other_value_.is_object()?engine_other_value_.at("round").get<int>():0);}
else if(action=="engine-open"&&id=="league"){menu_=id;engine_reports_sync();const auto league=engine_reports_state_.at("league").get<std::string>();engine_fixtures_load(league,engine_fixtures_value_.is_object()&&engine_fixtures_value_.at("leagueId")==league?engine_fixtures_value_.at("round").get<int>():0);}
else if(action=="engine-open"&&(id=="tables"||id=="strengths")){menu_=id;engine_reports_sync();engine_reports_load(engine_reports_state_.at("league"),engine_reports_state_.at("filter"));}
@@ -264,5 +269,5 @@ void App::engine_event(Rml::Event &event) {
}
Json App::engine_snapshot() const {
return {{"mode", engine_mode_}, {"busy", engine_busy_}, {"dirty", engine_dirty_}, {"fresh", engine_fresh_}, {"bundle", engine_data_},
{"response", engine_response_}, {"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
{"response", engine_response_}, {"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
}
+25
View File
@@ -871,4 +871,29 @@ Json engine_other_projection(const Json &bundle,const Json &index,const Json &re
}
return data;
}
Json engine_rankings_projection(const Json &bundle,const Json &index,const Json &read,const std::string &league,int scope) {
const auto catalogue=engine_report_index(bundle,index);auto context=bundle;context["player-rankings"]=read;auto data=lineup_read(context,"player-rankings");
require(scope>=0&&scope<=1&&data.at("requestLeagueId")==league&&data.at("scope")==scope&&data.at("season")==bundle.at("desktop").at("meta").at("season").at("label"),"Spielerstatistik gehört einer anderen Auswahl/Saison.");
std::set<std::string> clubs,all;const Json *selected=nullptr;bool request_exists=false;
for(const auto &l:catalogue.at("leagues")){if(l.at("id")==league)request_exists=true;for(const auto &id:l.at("members"))all.insert(id.get<std::string>());if(l.at("id")==data.at("leagueId"))selected=&l;}
require(selected&&request_exists,"Statistikliga fehlt im aktiven Index.");for(const auto &id:selected->at("members"))clubs.insert(id.get<std::string>());
require(data.at("team").at("id")==bundle.at("desktop").at("meta").at("scope").at("teamId")&&(!scope||clubs.contains(data.at("team").at("id").get<std::string>()))&& (scope||data.at("leagueId")==league),"Statistikbereich gehört einem fremden Verein.");
require(data.at("categories").is_array()&&data.at("categories").size()==4,"Statistikkategorien fehlen.");
for(int kind=0;kind<4;++kind) {
auto &rows=data["categories"][kind];require(rows.is_array(),"Spielerliste fehlt.");std::set<std::string> ids;int previous=-1,rank=0;size_t offset=0;
for(auto &r:rows){++offset;const auto id=r.at("player").at("id").get<std::string>(),club=r.at("club").at("id").get<std::string>();require(!id.empty()&&ids.insert(id).second&&r.at("player").at("name").is_string()&&r.at("club").at("name").is_string()&&clubs.contains(club)&&(!scope||r.at("club").at("id")==data.at("team").at("id")),"Doppelter/fremder Statistikspieler.");
for(const auto *key:{"appearances","goals","assists","yellow","second_yellow","red"})(void)whole_in_range(r.at(key),0,10000000);
const int value=whole_in_range(r.at("value"),1,20000000);const Json expected=kind==0?r.at("goals"):kind==1?r.at("assists"):kind==2?r.at("yellow"):Json(r.at("red").get<int>()+r.at("second_yellow").get<int>());require(r.at("value")==expected&&(previous<0||value<=previous),"Falscher Statistikwert oder Reihenfolge.");if(value!=previous)rank=int(offset);require(r.at("rank")==rank,"Ungültiger Gleichstandsplatz.");previous=value;
require(r.at("currentTeam").is_null()||(r.at("currentTeam").is_object()&&all.contains(r.at("currentTeam").at("id").get<std::string>())&&r.at("currentTeam").at("name").is_string()),"Unbekannter aktueller Kader.");require(r.at("photoAssetId").is_null()||r.at("photoAssetId").is_string(),"Ungültiges Fotoasset.");
r["player_ref"]=r.at("player");r["team_ref"]=r.at("club");r["player"]=id;r["club"]=club;r["name"]=r.at("player_ref").at("name");r["club_name"]=r.at("team_ref").at("name");r["photo"]=r.at("photoAssetId").is_string()?r.at("photoAssetId"):Json("asset:player/"+(id.starts_with("player:")?id.substr(7):id)+"/photo");
}
}
data["league"]=*selected;return data;
}
Json engine_fairplay_projection(const Json &bundle,const Json &index,const Json &read) {
const auto catalogue=engine_report_index(bundle,index);auto context=bundle;context["fairplay"]=read;auto data=lineup_read(context,"fairplay");
require(!catalogue.at("leagues").empty()&&data.at("leagueId")==catalogue.at("leagues")[0].at("id")&&data.at("season")==bundle.at("desktop").at("meta").at("season").at("label")&&data.at("weights").is_object()&&data.at("weights").size()==2&&data.at("weights").at("yellow")==1&&data.at("weights").at("red")==4,"Unbekannte Fairplay-Auswahl oder Wertung.");
const auto &league=catalogue.at("leagues")[0];require(data.at("rows").is_array()&&data.at("rows").size()==league.at("members").size(),"Unvollständige Fairplayliste.");std::set<std::string> ids;int previous=-1,rank=0;for(auto &r:data["rows"]){const auto id=r.at("team").at("id").get<std::string>();require(ids.insert(id).second&&std::find(league.at("members").begin(),league.at("members").end(),Json(id))!=league.at("members").end()&&r.at("team").at("name").is_string(),"Doppelter/fremder Fairplayverein.");const int y=whole_in_range(r.at("yellow"),0,10000000),red=whole_in_range(r.at("red"),0,10000000),points=whole_in_range(r.at("points"),0,50000000);require(points==y+4*red&&points>=previous&&r.at("rank")==++rank,"Ungültige Fairplaywertung.");previous=points;r["club"]=id;}
(void)whole_in_range(data.at("recordedMatches"),0,10000000);data["league"]=league;return data;
}
} // namespace bmh::modern_ui
+38
View File
@@ -0,0 +1,38 @@
// SPDX-License-Identifier: GPL-3.0-only
void App::engine_rankings_load(const std::string &preferred,int scope) {
if(engine_busy_||!engine_fresh_)return;
if(engine_rankings_value_.is_object()&&engine_rankings_value_.at("requestLeagueId")==preferred&&engine_rankings_value_.at("scope")==scope){refresh();return;}
auto link=engine_link_;engine_start("Spielerstatistiken werden geladen …",[link,preferred,scope]{
const auto bundle=link->snapshot(),index=link->read({{"kind","report-index"}});const auto data=engine_report_index(bundle,index);const Json *selected=nullptr;
for(const auto &l:data.at("leagues"))if(l.at("id")==preferred)selected=&l;
if(!selected)for(const auto &l:data.at("leagues"))if(l.at("own")==true){selected=&l;break;}
if(!selected)throw editor::Error("Keine Vereinsliga für die Statistik vorhanden.");
const auto id=selected->at("id").get<std::string>();
return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","rankings"},{"index",index},{"league",id},{"scope",scope},{"read",link->read({{"kind","player-rankings"},{"leagueId",id},{"scope",scope}})}},nullptr};
});
}
void App::engine_fairplay_load() {
if(engine_busy_||!engine_fresh_)return;
if(engine_fairplay_value_.is_object()){refresh();return;}
auto link=engine_link_;engine_start("Fairplay wird geladen …",[link]{const auto bundle=link->snapshot(),index=link->read({{"kind","report-index"}});return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","fairplay"},{"index",index},{"read",link->read({{"kind","fairplay"}})}},nullptr};});
}
bool App::engine_rankings_action(const std::string &action,Rml::Element *target) {
if(menu_!="scorers"||action!="player-detail")return false;
engine_rankings_player_=Json();const auto id=target->GetAttribute<Rml::String>("data-id","");
const auto kind=rankings_view_.value("tab",0);
if(engine_rankings_value_.is_object())for(const auto &r:engine_rankings_value_.at("categories").at(size_t(kind)))if(r.at("player")==id){
engine_rankings_player_=r;report_detail_player_=id;report_detail_club_=r.at("currentTeam").is_object()?r.at("currentTeam").at("id").get<std::string>():r.at("club").get<std::string>();report_detail_kind_="player";report_detail_return_focus_=target->GetId();focus_after_render_="report-detail-close";close_report_picker(false);
if(r.at("currentTeam").is_null()){refresh();return true;}
const auto team=report_detail_club_;if(engine_reports_roster_value_.is_object()&&engine_reports_roster_value_.at("team").at("id")==team){refresh();return true;}
engine_reports_roster_value_=Json();auto link=engine_link_;engine_start("Spielerprofil wird geladen …",[link,team]{auto bundle=link->snapshot();return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","squad"},{"team",team},{"read",link->read({{"kind","squad"},{"teamId",team}})}},nullptr};});return true;
}
return false;
}
std::string App::engine_rankings_player_detail() {
const auto &r=engine_rankings_player_;const Json *live=nullptr;
if(engine_reports_roster_value_.is_object()&&engine_reports_roster_value_.at("team").at("id")==report_detail_club_)for(const auto &p:engine_reports_roster_value_.at("players"))if(p.at("player").at("id")==r.at("player"))live=&p;
std::string term="—";if(live&&live->at("contractRemaining").is_object())term=number(live->at("contractRemaining").at("value"))+" Monate";
const auto club=r.at("currentTeam").is_object()?engine_text(r.at("currentTeam").at("name")):r.at("club_name").get<std::string>();
const auto body="<div class=\"report-detail-portrait\">"+img(r.at("photo"),496,662.667,true,true,1024)+"</div><p class=\"report-detail-photo-caption\">"+std::string(r.at("currentTeam").is_null()?"Saisonaufzeichnung":"Porträt")+"</p>"+report_detail_fields({{"Position",live?report_detail_position(live->at("player")):"—"},{"Alter",live?report_number(live->at("age"))+" Jahre":"—"},{"Stärke",live?report_number(live->at("live_strength")):"—"},{r.at("currentTeam").is_null()?"Archivverein":"Verein",club},{"Vertrag",term}},73);
return "<div id=\"report-detail-layer\" class=\"report-detail-layer\"><section id=\"report-detail-dialog\" class=\"report-detail-card report-detail-player\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"report-detail-title\"><h2 id=\"report-detail-title\">"+esc(r.at("name").get<std::string>())+"</h2>"+body+"<nav class=\"report-detail-actions\">"+btn("report-detail-close","Schließen","report-detail-action","id=\"report-detail-close\"")+"</nav></section></div>";
}
+20 -5
View File
@@ -3,8 +3,10 @@ void App::engine_reports_sync() {
const auto &meta=engine_data_.at("desktop").at("meta");
if(meta==engine_reports_context_)return;
if(engine_reports_context_.is_null()||meta.at("careerId")!=engine_reports_context_.at("careerId")||meta.at("scope").at("managerId")!=engine_reports_context_.at("scope").at("managerId"))engine_reports_state_["league"]="";
if(engine_reports_context_.is_null()||meta.at("careerId")!=engine_reports_context_.at("careerId")||meta.at("scope")!=engine_reports_context_.at("scope"))engine_rankings_state_["league"]="";
engine_reports_context_=meta;engine_reports_index_=Json();engine_reports_read_=Json();engine_reports_roster_=Json();engine_reports_value_=Json();engine_reports_roster_value_=Json();
engine_fixtures_read_=Json();engine_fixtures_value_=Json();
engine_rankings_read_=Json();engine_rankings_value_=Json();engine_fairplay_read_=Json();engine_fairplay_value_=Json();engine_rankings_player_=Json();
engine_other_index_=Json();engine_other_read_=Json();engine_other_value_=Json();
report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear();
}
@@ -52,6 +54,11 @@ void App::engine_other_load(const std::string &preferred,int round) {
void App::engine_reports_poll(const EngineReply &reply) {
if(reply.bundle.at("desktop").at("meta")!=engine_reports_context_)throw editor::Error("Der Berichtskontext hat sich geändert. Bitte neu öffnen.");
const auto &r=reply.response,&read=r.at("read");
if(r.at("kind")=="rankings"||r.at("kind")=="fairplay") {
if(r.at("kind")=="rankings"){auto value=engine_rankings_projection(reply.bundle,r.at("index"),read,r.at("league"),r.at("scope"));engine_rankings_value_=std::move(value);engine_rankings_read_=read;engine_rankings_state_["league"]=r.at("league");engine_rankings_state_["scope"]=r.at("scope");}
else {auto value=engine_fairplay_projection(reply.bundle,r.at("index"),read);engine_fairplay_value_=std::move(value);engine_fairplay_read_=read;}
engine_reports_index_=r.at("index");engine_notice_="Statistik geladen.";return;
}
if(r.at("kind")=="other") {
(void)engine_other_index(reply.bundle,r.at("index"));
auto value=read.is_null()?Json():engine_other_projection(reply.bundle,r.at("index"),read,r.at("view"),r.at("round"));
@@ -78,16 +85,21 @@ Json App::engine_reports_rows(const std::string &mode) const {
return sort_report_rows(std::move(rows),engine_reports_state_.at("sorts").at(mode));
}
Json App::engine_report_team(const std::string &id) const {
if(menu_=="scorers"&&engine_rankings_value_.is_object()) {
if(engine_rankings_player_.is_object()&&engine_rankings_player_.at("currentTeam").is_object()&&engine_rankings_player_.at("currentTeam").at("id")==id)return engine_rankings_player_.at("currentTeam");
for(const auto &rows:engine_rankings_value_.at("categories"))for(const auto &r:rows)if(r.at("club")==id)return r.at("team_ref");
}
if(menu_=="fairplay"&&engine_fairplay_value_.is_object())for(const auto &r:engine_fairplay_value_.at("rows"))if(r.at("club")==id)return r.at("team");
if(menu_=="other"&&engine_other_value_.is_object())for(const auto &m:engine_other_value_.at("matches"))for(const auto *side:{"home_team","away_team"})if(m.at(side).at("id")==id)return m.at(side);
if(engine_reports_value_.is_object())for(const auto &r:engine_reports_value_.at("table"))if(r.at("club")==id)return r.at("team");
return Json();
}
std::vector<std::pair<std::string,std::string>> App::engine_reports_picker_items(const std::string &kind) const {
std::vector<std::pair<std::string,std::string>> App::engine_reports_picker_items(const std::string &kind,const std::string &preferred) const {
std::vector<std::pair<std::string,std::string>> out;
if(menu_=="other"){if(kind=="competition"&&engine_other_index_.is_object())for(const auto &v:engine_other_index_.at("data").at("views"))out.emplace_back(v.at("id"),v.at("name"));return out;}
if(kind=="filter"){const char* values[]={"Alle Spiele","Hinrunde","Rückrunde","Heim","Auswärts"};for(int i=0;i<5;++i)out.emplace_back(std::to_string(i),values[i]);return out;}
const auto &leagues=engine_reports_index_.at("data").at("leagues");std::set<std::string> seen;std::string nation;
for(const auto &l:leagues)if(l.at("id")==engine_reports_state_.at("league"))nation=l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";
for(const auto &l:leagues)if(l.at("id")== (preferred.empty()?engine_reports_state_.at("league"):Json(preferred)))nation=l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";
for(const auto &l:leagues) {
const auto n=l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";
if(kind=="country"&&seen.insert(n).second)out.emplace_back(n,n=="__other__"?"Weitere Ligen":world_->nation_name(n));
@@ -100,9 +112,9 @@ std::vector<std::pair<std::string,std::string>> App::engine_reports_picker_items
return out;
}
bool App::engine_reports_action(const std::string &action,Rml::Element *target) {
if(menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other")return false;
if(menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other"&&menu_!="scorers"&&menu_!="fairplay")return false;
const auto id=target?target->GetAttribute<Rml::String>("data-id",""):std::string();
if(action=="report-detail-close") {focus_after_render_=report_detail_return_focus_;report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear();refresh();return true;}
if(action=="report-detail-close") {engine_rankings_player_=Json();focus_after_render_=report_detail_return_focus_;report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear();refresh();return true;}
if(engine_busy_||!engine_fresh_)return action.starts_with("report-")||action=="club-detail"||action=="player-detail";
if(action=="report-round"&&menu_=="other"){if(id!="1"&&id!="-1")return true;const int current=engine_other_value_.at("round"),total=engine_other_value_.at("rounds");focus_after_render_=target->GetId();engine_other_load(engine_other_value_.at("viewId"),std::clamp(current+std::stoi(id),1,total));return true;}
if(action=="report-round"&&menu_=="league") {if(id!="1"&&id!="-1")return true;const int current=engine_fixtures_value_.at("round"),total=engine_fixtures_value_.at("rounds");const int next=std::clamp(current+std::stoi(id),1,total);focus_after_render_=target->GetId();engine_fixtures_load(engine_reports_state_.at("league"),next);return true;}
@@ -117,11 +129,13 @@ bool App::engine_reports_action(const std::string &action,Rml::Element *target)
report_detail_club_=id;report_detail_player_.clear();report_detail_kind_="club";report_detail_return_focus_=target->GetId();focus_after_render_="report-detail-roster";close_report_picker(false);refresh();return true;
}
if(action=="report-club-roster") {
engine_rankings_player_=Json();
report_detail_kind_="roster";
if(engine_reports_roster_value_.is_object()&&engine_reports_roster_value_.at("team").at("id")==report_detail_club_){focus_after_render_="report-detail-player-0";refresh();return true;}
engine_reports_roster_value_=Json();auto link=engine_link_;const auto team=report_detail_club_;
engine_start("Kader wird geladen …",[link,team]{auto bundle=link->snapshot();return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","squad"},{"team",team},{"read",link->read({{"kind","squad"},{"teamId",team}})}},nullptr};});return true;
}
if(engine_rankings_action(action,target))return true;
if(action=="player-detail") {
if(engine_reports_roster_value_.is_object())for(const auto &r:engine_reports_roster_value_.at("players"))if(r.at("player").at("id")==id){report_detail_player_=id;report_detail_kind_="player";focus_after_render_="report-detail-close";refresh();break;}
return true;
@@ -129,7 +143,7 @@ bool App::engine_reports_action(const std::string &action,Rml::Element *target)
return false;
}
bool App::engine_reports_event(Rml::Event &event) {
if((menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other")||report_detail_kind_.empty())return false;
if((menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other"&&menu_!="scorers"&&menu_!="fairplay")||report_detail_kind_.empty())return false;
const auto type=event.GetType();
if(type=="keydown"&&event.GetParameter<int>("key_identifier",0)==Rml::Input::KI_ESCAPE){engine_reports_action("report-detail-close",nullptr);event.StopImmediatePropagation();return true;}
if(type=="keydown"&&event.GetParameter<int>("key_identifier",0)==Rml::Input::KI_TAB){Rml::ElementList nodes;if(auto *root=element("report-detail-dialog"))root->QuerySelectorAll(nodes,"button");std::erase_if(nodes,[](auto *n){return n->HasAttribute("disabled");});if(!nodes.empty()){const auto it=std::find(nodes.begin(),nodes.end(),context_->GetFocusElement());int i=it==nodes.end()?-1:int(it-nodes.begin()),n=int(nodes.size());auto *next=nodes[size_t((i+n+(event.GetParameter<int>("shift_key",0)?-1:1))%n)];next->Focus(true);next->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));}event.StopImmediatePropagation();return true;}
@@ -138,6 +152,7 @@ bool App::engine_reports_event(Rml::Event &event) {
}
std::string App::engine_reports_detail() {
if(report_detail_kind_.empty())return {};
if(report_detail_kind_=="player"&&engine_rankings_player_.is_object())return engine_rankings_player_detail();
const auto team=engine_report_team(report_detail_club_);if(team.is_null())return {};
const auto close=btn("report-detail-close","Zurück","report-detail-action","id=\"report-detail-close\"");
std::string title=engine_text(team.at("name")),body,actions=close;
+6 -3
View File
@@ -37,6 +37,7 @@ Json App::engine_camp_view() const {
}
void App::engine_render() {
if (ticket_) ticket_->close(false);
if(menu_=="scorers"||menu_=="fairplay")rankings_remember_scroll();
fixture_half_width_=-1.f;
almanac_list_width_=-1.f;
if (menu_ == "friendlies") if (auto *list = element("friendly-opponents")) engine_friendly_scroll_ = list->GetScrollTop();
@@ -114,11 +115,13 @@ void App::engine_render() {
const auto route = id.substr(4);
const bool camp_allowed = desk.at("menuAvailability").at("camps").value("status", "") == "available";
const auto commands = meta.at("scope").value("allowedCommands", Json::array());
const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || route == "save" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || route == "save" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
out += desktop_button(id, o, "engine-open", supported && !engine_busy_);
}
}
out += "</div>";
if(menu_=="scorers")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Spielerstatistiken",engine_rankings_value_.is_object()?render_scorers():"<div class=\"fill center\">"+esc(engine_busy_?"Spielerstatistiken werden geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="fairplay")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Fairplay",engine_fairplay_value_.is_object()?render_fairplay():"<div class=\"fill center\">"+esc(engine_busy_?"Fairplay wird geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="other")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Übrige Spiele",engine_other_value_.is_object()?render_reports("other"):"<div class=\"fill center\">"+esc(engine_busy_?"Wettbewerbe werden geladen …":engine_other_index_.is_object()?"Keine aktiven Wettbewerbe.":engine_notice_)+"</div>")+"</div>";
if(menu_=="league")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Ligaspiele",engine_fixtures_value_.is_object()?render_reports("league"):"<div class=\"fill center\">"+esc(engine_busy_?"Ligaspiele werden geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="tables"||menu_=="strengths")out+="<div class=\"fill\" style=\"z-index:100;\">"+window(menu_=="tables"?"Tabelle":"Stärken",engine_reports_read_.is_object()?render_reports(menu_):"<div class=\"fill center\">"+esc(engine_busy_?"Ligabericht wird geladen …":engine_notice_)+"</div>")+"</div>";
@@ -135,7 +138,7 @@ void App::engine_render() {
if (menu_ == "lineup") out += "<div class=\"fill\" style=\"z-index:100;\">" + window("Aufstellung", render_lineup()) + "</div>";
if (menu_ == "camp") out += "<div class=\"fill\" style=\"z-index:100;\">" + window("Trainingslager", render_camp()) + "</div>";
}
if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "<div class=\"panel\" style=\"position:absolute;bottom:12dp;left:700dp;right:700dp;padding:9dp;font-size:25dp;z-index:110;\" id=\"engine-status\">" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "</div>";
if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="fairplay") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "<div class=\"panel\" style=\"position:absolute;bottom:12dp;left:700dp;right:700dp;padding:9dp;font-size:25dp;z-index:110;\" id=\"engine-status\">" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "</div>";
if (menu_.empty() || engine_data_.empty()) out += "<div class=\"panel\" style=\"position:absolute;left:850dp;bottom:24dp;right:100dp;padding:18dp;font-size:27dp;\" id=\"engine-status\">" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "</div>";
element("canvas")->SetInnerRML(out); ++document_generation_;
scale_chalk_shadow();
@@ -158,7 +161,7 @@ void App::engine_render() {
Rml::ElementList underlay; doc_->QuerySelectorAll(underlay, ".window>.content,.window>.titlebar");
for (auto *node : underlay) { node->SetProperty("pointer-events", "none"); node->SetProperty("filter", "blur(10dp)"); }
}
if(!report_detail_kind_.empty()&&(menu_=="tables"||menu_=="strengths"||menu_=="league"||menu_=="other")){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#report-underlay button,#window-close");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
if(!report_detail_kind_.empty()&&(menu_=="tables"||menu_=="strengths"||menu_=="league"||menu_=="other"||menu_=="scorers"||menu_=="fairplay")){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#report-underlay button,.rankings-scorers button,.rankings-fairplay button,#window-close");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
if (engine_busy_) {
Rml::ElementList controls; doc_->QuerySelectorAll(controls, "#canvas button,#canvas input");
for (auto *node : controls) node->SetAttribute("disabled", true);
+7 -1
View File
@@ -14,6 +14,12 @@
Json engine_reports_context_, engine_reports_index_, engine_reports_read_, engine_reports_roster_, engine_reports_value_, engine_reports_roster_value_;
Json engine_reports_state_={{"league",""},{"filter",0},{"sorts",{{"tables",{{"key","rank"},{"desc",false}}},{"strengths",{{"key","strength"},{"desc",true}}}}}};
Json engine_fixtures_read_, engine_fixtures_value_;
Json engine_rankings_read_,engine_rankings_value_,engine_fairplay_read_,engine_fairplay_value_,engine_rankings_player_;
Json engine_rankings_state_={{"league",""},{"scope",0}};
void engine_rankings_load(const std::string &,int);
void engine_fairplay_load();
bool engine_rankings_action(const std::string &,Rml::Element *);
std::string engine_rankings_player_detail();
Json engine_other_index_, engine_other_read_, engine_other_value_;
void engine_other_load(const std::string &,int);
void engine_fixtures_load(const std::string &,int);
@@ -22,7 +28,7 @@
void engine_reports_poll(const EngineReply &);
Json engine_reports_rows(const std::string &) const;
Json engine_report_team(const std::string &) const;
std::vector<std::pair<std::string,std::string>> engine_reports_picker_items(const std::string &) const;
std::vector<std::pair<std::string,std::string>> engine_reports_picker_items(const std::string &,const std::string & = {}) const;
bool engine_reports_action(const std::string &,Rml::Element *);
bool engine_reports_event(Rml::Event &);
std::string engine_reports_detail();
+12 -12
View File
@@ -53,21 +53,21 @@ void App::rankings_restore_scroll() {
}
std::string App::render_scorers() {
rankings_remember_scroll();
const auto snapshot = snap();
const auto club = manager(snapshot).value("club", "");
const auto snapshot = engine_mode_?Snapshot{}:snap();
const auto club = engine_mode_?engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>():manager(snapshot).value("club", "");
if (!rankings_view_.is_object()) rankings_view_ = Json::object();
if (!rankings_view_.contains("league")) rankings_view_["league"] = rankings_league(*world_, snapshot.state, club);
const auto league_id = rankings_view_.value("league", std::string());
const int scope = std::clamp(rankings_view_.value("scope", 0), 0, 1),
if (!engine_mode_ && !rankings_view_.contains("league")) rankings_view_["league"] = rankings_league(*world_, snapshot.state, club);
const auto league_id = engine_mode_?engine_rankings_value_.at("leagueId").get<std::string>():rankings_view_.value("league", std::string());
const int scope = engine_mode_?engine_rankings_state_.at("scope").get<int>():std::clamp(rankings_view_.value("scope", 0), 0, 1),
kind = std::clamp(rankings_view_.value("tab", 0), 0, 3);
rankings_view_["scope"] = scope; rankings_view_["tab"] = kind;
const auto *league = world_->find("competitions", league_id),
*own = world_->find("clubs", club);
const auto title = scope ? (own ? world_->name(*own) : "—")
const auto title = engine_mode_?(scope?engine_rankings_value_.at("team").at("name").get<std::string>():engine_rankings_value_.at("league").at("name").get<std::string>()):scope ? (own ? world_->name(*own) : "—")
: (league ? world_->name(*league) : "—");
const auto nation = scope ? (own ? own->value("nation", "") : "")
: (league ? league->value("nation", "") : "");
const auto rows = demo_scorer_rows(*world_, league_id, club, scope, kind);
const auto rows = engine_mode_?engine_rankings_value_.at("categories").at(size_t(kind)):demo_scorer_rows(*world_, league_id, club, scope, kind);
const auto key = "scorers:" + league_id + ":" + std::to_string(scope) + ":" + std::to_string(kind);
const auto player_button = [&](const Json &r, bool leader) {
const auto id = r.at("player").get<std::string>();
@@ -80,12 +80,12 @@ std::string App::render_scorers() {
};
const auto club_button = [&](const Json &r, bool leader) {
const auto id = r.at("club").get<std::string>();
return btn("club-detail", label(world_->find("clubs", id), leader ? 34 : 42), "rankings-club-button " + std::string(id == club ? "current" : ""),
return btn("club-detail", engine_mode_?"<span class=\"club-label\">"+crest(world_->find("clubs",id),leader?34:42)+"<span>"+esc(r.at("club_name").get<std::string>())+"</span></span>":label(world_->find("clubs", id), leader ? 34 : 42), "rankings-club-button " + std::string(id == club ? "current" : ""),
"id=\"rankings-club-" + esc(r.at("player").get<std::string>()) + "\" data-id=\"" + esc(id) + "\"");
};
std::string out = "<section class=\"rankings-scorers kind-" + std::to_string(kind) + "\"><header class=\"rankings-heading\"><div><h2>" + esc(title) +
"</h2><span>" + esc(world_->nation_name(nation)) + " · Saison " + esc(rankings_season(snapshot.state, *world_)) +
"</span></div><p>Spielwerte fiktiv</p></header><nav class=\"rankings-tabs\" role=\"tablist\" aria-label=\"Spielerstatistik auswählen\">";
"</h2><span>" + esc(world_->nation_name(nation)) + " · Saison " + esc(engine_mode_?engine_rankings_value_.at("season").get<std::string>():rankings_season(snapshot.state, *world_)) +
"</span></div>"+(engine_mode_?"":"<p>Spielwerte fiktiv</p>")+"</header><nav class=\"rankings-tabs\" role=\"tablist\" aria-label=\"Spielerstatistik auswählen\">";
for (int i = 0; i < 4; ++i) {
const auto icon = i < 2 ? picture(renderer_.diagram("rankings-icon-" + std::to_string(i) + "-" + theme_, rankings_icon(i, theme_ == "silver" ? "#233443" : theme_ == "matchday" ? "#efeded" : "#b9cddd"), 102), 34, 34)
: "<span class=\"rankings-card-icon " + std::string(i == 2 ? "yellow" : "red") + "\"></span>";
@@ -103,7 +103,7 @@ std::string App::render_scorers() {
const auto &r = rows[i];
out += "<div class=\"rankings-row " + std::string(i % 2 ? "striped" : "") + "\" role=\"row\" data-rank=\"" + r.at("rank").dump() + "\" data-value=\"" + r.at("value").dump() + "\"><div class=\"rankings-rest-player\"><span class=\"rankings-rank\">" + r.at("rank").dump() + ".</span>" + player_button(r, false) + "</div><div>" + club_button(r, false) + "</div><div>" + rankings_cell_text(r.at("value").dump()) + "</div></div>";
}
if (rows.empty()) out += "<p class=\"rankings-empty\">" + rankings_cell_text("Keine Spieler mit Einträgen in dieser Kategorie.") + "</p>";
if (rows.empty()) out += "<div class=\"rankings-row\" role=\"row\"><div>"+rankings_cell_text("Keine Einträge in dieser Kategorie.")+"</div><div></div><div></div></div>";
out += "</div></div></div><nav class=\"report-footer rankings-footer\">";
if (!scope) out += report_picker("country", 0, 854.666667) + report_picker("league", 878.666667, 854.666667);
else out += "<span class=\"rankings-own-club\">" + label(own, 42) + "</span>";
@@ -114,7 +114,7 @@ std::string App::render_scorers() {
std::string App::render_fairplay() {
rankings_remember_scroll();
const auto rows = demo_fairplay_rows(*world_);
const auto rows = engine_mode_?engine_fairplay_value_.at("rows"):demo_fairplay_rows(*world_);
std::string out = "<section class=\"rankings-fairplay\"><header class=\"rankings-fair-heading\"><p>Strafpunkte · weniger ist besser</p><div><span class=\"rankings-yellow\">Gelb · 1 Punkt</span><span class=\"rankings-red\">Rot · 4 Punkte</span></div></header><div id=\"rankings-list\" class=\"rankings-fair-list\" data-scroll-key=\"fairplay\"><div class=\"rankings-table\" role=\"table\"><div class=\"rankings-fair-row rankings-head\" role=\"row\"><div>" + rankings_cell_text("Pl. / Verein") + "</div><div>" + rankings_cell_text("Gelb") + "</div><div>" + rankings_cell_text("Rot") + "</div><div>" + rankings_cell_text("Punkte") + "</div></div>";
for (size_t i = 0; i < rows.size(); ++i) {
const auto &r = rows[i];
+17 -1
View File
@@ -16,6 +16,10 @@ App::report_picker_items(const std::string &kind) const {
std::vector<std::pair<std::string, std::string>> items;
if (!world_ || !report_picker_kind(kind))
return items;
if(engine_mode_&&menu_=="scorers") {
if(kind=="scorer-scope")return {{"0","Gesamte Liga"},{"1","Eigener Verein"}};
return engine_reports_picker_items(kind,engine_rankings_state_.at("league"));
}
if (engine_mode_ && (menu_=="tables"||menu_=="strengths"||menu_=="league"||menu_=="other")) return engine_reports_picker_items(kind);
if (engine_mode_ && menu_ == "friendlies") return engine_friendly_picker_items(kind);
if (menu_ == "statistics")
@@ -75,6 +79,12 @@ App::report_picker_items(const std::string &kind) const {
std::string App::report_picker_value(const std::string &kind) const {
if (!world_ || !report_picker_kind(kind))
return {};
if(engine_mode_&&menu_=="scorers") {
if(kind=="scorer-scope")return std::to_string(engine_rankings_state_.at("scope").get<int>());
if(kind=="league")return engine_rankings_state_.at("league");
for(const auto &l:engine_reports_index_.at("data").at("leagues"))if(l.at("id")==engine_rankings_state_.at("league"))return l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";
return {};
}
if(engine_mode_&&menu_=="other")return kind=="competition"&&engine_other_value_.is_object()?engine_other_value_.at("viewId").get<std::string>():"";
if(engine_mode_&&(menu_=="tables"||menu_=="strengths"||menu_=="league"||menu_=="other")){if(kind=="filter")return std::to_string(engine_reports_state_.at("filter").get<int>());if(kind=="league")return engine_reports_state_.at("league");const auto live_index=engine_report_index(engine_data_,engine_reports_index_);for(const auto &l:live_index.at("leagues"))if(l.at("id")==engine_reports_state_.at("league"))return l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";return {}; }
if (menu_ == "statistics")
@@ -217,7 +227,13 @@ bool App::report_picker_action(const std::string &action, Rml::Element *target)
? Json(std::stoi(value)) : Json(value);
close_report_picker(false);
// Commit even an unchanged country: the Gold resets its first league.
if(engine_mode_&&menu_=="other")engine_other_load(value,0);
if(engine_mode_&&menu_=="scorers") {
std::string league=engine_rankings_state_.at("league");int scope=engine_rankings_state_.at("scope");
if(kind=="league")league=value;else if(kind=="scorer-scope")scope=std::stoi(value);
else if(kind=="country")for(const auto &l:engine_reports_index_.at("data").at("leagues"))if((l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__")==value){league=l.at("id");break;}
rankings_remember_scroll();engine_rankings_load(league,scope);
}
else if(engine_mode_&&menu_=="other")engine_other_load(value,0);
else if(engine_mode_&&(menu_=="tables"||menu_=="strengths"||menu_=="league"||menu_=="other")){
std::string league=engine_reports_state_.at("league");int filter=engine_reports_state_.at("filter");
if(kind=="league")league=value;
+1
View File
@@ -1532,6 +1532,7 @@ public:
#include "modern/ui/engine_friendlies.inc"
#include "modern/ui/engine_almanac.inc"
#include "modern/ui/engine_reports.inc"
#include "modern/ui/engine_rankings.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {
+23 -1
View File
@@ -11,7 +11,7 @@ using namespace bmh::modern_ui;
int main(int argc, char **argv) {
try {
const std::string mode=argc>1?argv[1]:"";
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other"};
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived"};
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <world.obw> <new-output-directory>");
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
@@ -44,6 +44,21 @@ int main(int argc, char **argv) {
if (!session.save_game(out / "input.obs", 0, false, error)) throw std::runtime_error(error);
modern::set_current_world(nullptr);
}
if(mode=="prepare-rankings-archived") {
std::string person,league;
{
auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);
modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);auto &g=session.state();league=g.world_league_id.at(0);
const auto read=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","player-rankings"},{"leagueId",league},{"scope",0}},0)));
person=read.at("data").at("categories")[0][0].at("player").at("id");
const auto found=std::find(g.world_player_id.begin(),g.world_player_id.end(),person);if(found==g.world_player_id.end())throw std::runtime_error("archive fixture player missing");const auto player=size_t(found-g.world_player_id.begin());
for(auto &slot:g.squad_slots)if((slot&0x0fff)==player)slot=kEmptySlot;
std::string error;if(!session.save_game(out/"archived.obs",0,false,error))throw std::runtime_error(error);
write("synthetic-mutation.json",{{"qa_only",true},{"kind","remove-current-squad-membership"},{"playerId",person},{"archive","unchanged"},{"real_retirement",false}});
}
modern::set_current_world(nullptr);auto fixture=EngineBridge::open(world,out/"archived.obs");const auto bundle=fixture->snapshot(),index=fixture->read({{"kind","report-index"}}),read=fixture->read({{"kind","player-rankings"},{"leagueId",league},{"scope",0}});const auto value=engine_rankings_projection(bundle,index,read,league,0);
if(value.at("categories")[0][0].at("player")!=person||!value.at("categories")[0][0].at("currentTeam").is_null())throw std::runtime_error("archived-only counterexample not retained");write("rankings.json",read);std::cout<<"synthetic archived-only rankings fixture passed\n";return 0;
}
auto link = EngineBridge::open(world, out / "input.obs");
const auto before = link->snapshot(); write("before.json", before);
if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection");
@@ -337,6 +352,13 @@ int main(int argc, char **argv) {
write("saved.json",link->save_copy(out/"reports.obs"));link.reset();link=EngineBridge::open(world,out/"reports.obs");
if(link->read({{"kind","report-index"}}).at("data")!=index_read.at("data"))throw std::runtime_error("report index changed after OBS restart");
}
if(mode=="verify-rankings") {
const auto index=link->read({{"kind","report-index"}}),catalogue=engine_report_index(before,index);write("rankings-index.json",index);Json all=Json::array();
for(const auto &league:catalogue.at("leagues"))for(int scope=0;scope<2;++scope){const Json request={{"kind","player-rankings"},{"leagueId",league.at("id")},{"scope",scope}};const auto read=link->read(request);write("latest-read.json",read);(void)engine_rankings_projection(before,index,read,league.at("id"),scope);if(link->read(request)!=read)throw std::runtime_error("rankings read is not repeatable");all.push_back(read);}
const auto fair=link->read({{"kind","fairplay"}});write("fairplay.json",fair);(void)engine_fairplay_projection(before,index,fair);write("all-rankings.json",all);
if(link->snapshot()!=before)throw std::runtime_error("rankings changed engine");write("saved.json",link->save_copy(out/"rankings.obs"));link.reset();link=EngineBridge::open(world,out/"rankings.obs");
if(link->read({{"kind","fairplay"}}).at("data")!=fair.at("data"))throw std::runtime_error("fairplay changed after OBS restart");
}
if(mode=="verify-other") {
const auto index=link->read({{"kind","other-index"}}),data=engine_other_index(before,index);write("other-index.json",index);Json all=Json::array();
for(const auto &v:data.at("views"))for(int round=1;round<=v.at("rounds").get<int>();++round) {
+12
View File
@@ -387,6 +387,18 @@ int main() {
bad_other=other_read;bad_other["data"]["matches"][0]["result"]={1,2};rejects([&]{engine_other_projection(report_bundle,other_index,bad_other,"cup-view:0:0",1);});
bad_other=other_read;bad_other["data"]["entry"]=1;rejects([&]{engine_other_projection(report_bundle,other_index,bad_other,"cup-view:0:0",1);});
bad_other=other_read;bad_other["meta"]["stateRevision"]="42";rejects([&]{engine_other_projection(report_bundle,other_index,bad_other,"cup-view:0:0",1);});
auto rankings_bundle=report_bundle;for(auto &r:rankings_bundle)r["meta"]["season"]={{"label","2026/27"}};
const auto rw=[&](const Json &d){return Json{{"messageType","snapshot"},{"meta",rankings_bundle.at("desktop").at("meta")},{"data",d}};};const auto ri=rw(report_index_data);
Json ranking_row={{"rank",1},{"player",{{"id","player:score"},{"name","Synthetic Scorer"}}},{"club",{{"id","club:6"},{"name","Live A"}}},{"goals",2},{"assists",1},{"yellow",0},{"red",0},{"second_yellow",0},{"appearances",3},{"value",2},{"photoAssetId",nullptr},{"currentTeam",{{"id","club:7"},{"name","Live B"}}}};
Json rc=Json::array({Json::array({ranking_row}),Json::array(),Json::array(),Json::array()});const auto rr=rw({{"kind","player-rankings"},{"requestLeagueId","league:live"},{"leagueId","league:live"},{"scope",0},{"season","2026/27"},{"team",{{"id","club:6"},{"name","Live A"}}},{"categories",rc}});
require(engine_rankings_projection(rankings_bundle,ri,rr,"league:live",0).at("categories")[0][0].at("player")=="player:score","ranked player identity lost");
auto archived_rank=rr;archived_rank["data"]["categories"][0][0]["currentTeam"]=nullptr;require(engine_rankings_projection(rankings_bundle,ri,archived_rank,"league:live",0).at("categories")[0][0].at("currentTeam").is_null(),"archived-only identity received a fake current team");
auto bad_rank=rr;bad_rank["data"]["categories"][0][0]["rank"]=2;rejects([&]{engine_rankings_projection(rankings_bundle,ri,bad_rank,"league:live",0);});
bad_rank=rr;bad_rank["data"]["categories"][0][0]["value"]=5;rejects([&]{engine_rankings_projection(rankings_bundle,ri,bad_rank,"league:live",0);});
bad_rank=rr;bad_rank["data"]["season"]="2025/26";rejects([&]{engine_rankings_projection(rankings_bundle,ri,bad_rank,"league:live",0);});
bad_rank=rr;bad_rank["meta"]["stateRevision"]="42";rejects([&]{engine_rankings_projection(rankings_bundle,ri,bad_rank,"league:live",0);});
const auto fr=rw({{"kind","fairplay"},{"leagueId","league:live"},{"season","2026/27"},{"weights",{{"yellow",1},{"red",4}}},{"recordedMatches",1},{"rows",{{{"rank",1},{"team",{{"id","club:6"},{"name","Live A"}}},{"yellow",1},{"red",0},{"points",1}},{{"rank",2},{"team",{{"id","club:7"},{"name","Live B"}}},{"yellow",0},{"red",1},{"points",4}}}}});
require(engine_fairplay_projection(rankings_bundle,ri,fr).at("rows").size()==2,"fairplay rows lost");auto bad_fair=fr;bad_fair["data"]["rows"][1]["points"]=1;rejects([&]{engine_fairplay_projection(rankings_bundle,ri,bad_fair);});
std::cout << "engine DTO, exact money, scope and booking tests passed\n";
return 0;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
+37
View File
@@ -0,0 +1,37 @@
// SPDX-License-Identifier: GPL-3.0-only
// Authored archive events; no game data or assets.
#include "modern/content/statistics.hpp"
#include "modern/content/ui_contract.hpp"
#include "game/schedule.hpp"
#include <iostream>
#include <stdexcept>
using namespace bmh;
namespace {
using J=cli::Json;using O=J::Object;
const J& at(const J& j,const char* k){return j.object()->at(k);}
int n(const J& j){return int(*j.integer());}
void check(bool yes,const char* why){if(!yes)throw std::runtime_error(why);}
}
int main() try {
modern::ModernState g;g.manager_teams={0};g.manager_records.resize(0xb0c);g.display_start_year=2026;
for(int l=0;l<kLeagueCount;++l){g.world_league_id.push_back("league:"+std::to_string(l));g.world_league_name.push_back("Synthetic league "+std::to_string(l));}
for(int t=0;t<modern::league_clubs();++t){g.world_club_id.push_back("club:"+std::to_string(t));g.world_club_name.push_back("Synthetic club "+std::to_string(t));}
auto &s=g.almanac.current;s.season=0;s.start_year=2026;s.display_start_year=2026;s.clubs={{"club:0","Club A"},{"club:1","Club B"}};s.players={{"player:a","Alpha","One",""},{"player:b","Beta","Two",""},{"player:c","Gamma","Three",""}};s.leagues={{0,"league:0","Synthetic league 0"}};
modern::AlmanacMatch m;m.type=0;m.league=0;m.home=0;m.away=1;m.home_goals=1;m.date=100;
m.lineup[0].assign(12,modern::kAlmanacNone);m.lineup[0][0]=0;m.lineup[0][11]=1;m.lineup[1]={2};
using K=modern::AlmanacEventKind;
m.events={{K::Substitution,45,0,0,1,modern::kAlmanacNone},{K::Goal,60,0,0,0,1},{K::YellowCard,70,0,0,0,modern::kAlmanacNone},{K::SecondYellow,80,0,0,0,modern::kAlmanacNone},{K::RedCard,85,1,0,2,modern::kAlmanacNone},{K::ShootoutKick,121,0,1,0,modern::kAlmanacNone}};
s.matches.push_back(m);
auto second=m;second.home=1;second.away=0;second.date=130;second.home_goals=1;second.away_goals=1;second.lineup[0]={0,2};second.lineup[1]={1};second.events={{K::Goal,50,0,0,0,2},{K::Goal,55,1,0,1,modern::kAlmanacNone}};s.matches.push_back(second);
auto cup=m;cup.type=1;cup.league=0xff;s.matches.push_back(cup);
const auto read=[&](int scope){return modern::query_rankings(g,0,O{{"kind","player-rankings"},{"leagueId","league:0"},{"scope",scope}});};
const auto all=read(0);const auto &cats=*at(all,"categories").array();check(cats.size()==4&&cats[0].array()->size()==2,"rankings categories missing");
const auto &leader=cats[0].array()->at(0);check(*at(at(leader,"player"),"id").string()=="player:a"&&n(at(leader,"value"))==2,"goals include cup/shootout or lost league goal");check(*at(at(leader,"club"),"id").string()=="club:1","last recorded club not retained");check(n(at(leader,"appearances"))==2,"appearances changed");check(n(at(cats[1].array()->at(0),"value"))==1,"assist missing");check(cats[3].array()->size()==2&&n(at(cats[3].array()->at(0),"rank"))==1&&n(at(cats[3].array()->at(1),"rank"))==1,"red plus second-yellow tied rank changed");
const auto own=read(1);const auto &own_goals=*at(own,"categories").array()->at(0).array();check(own_goals.size()==2&&n(at(own_goals[0],"value"))==1&&n(at(own_goals[1],"value"))==1,"own scope counted other club contributions");for(const auto &r:own_goals)check(*at(at(r,"club"),"id").string()=="club:0","own scope has foreign club");
const auto fair=modern::query_rankings(g,0,O{{"kind","fairplay"}});check(n(at(fair,"recordedMatches"))==2,"fairplay counted cup");const auto &rows=*at(fair,"rows").array();check(rows.size()==size_t(kLeagueSizes[0]),"zero-card clubs missing");int total=0;for(const auto &r:rows)total+=n(at(r,"points"));check(total==9,"fairplay weighting or card side changed");check(n(at(rows.back(),"yellow"))==1&&n(at(rows.back(),"red"))==1&&n(at(rows.back(),"points"))==5,"second yellow counted incorrectly");
s.start_year=2025;const auto empty=read(0);for(const auto &cat:*at(empty,"categories").array())check(cat.array()->empty(),"previous season counted as current");s.start_year=2026;
check(!std::get<bool>(at(read(2),"ok").value),"invalid scope accepted");
modern::UiContext context;context.manager=0;context.state_revision=9;const auto wrapped=modern::ui_read(g,context,O{{"kind","player-rankings"},{"leagueId","league:0"},{"scope",0}});check(*at(wrapped,"messageType").string()=="snapshot"&&*at(at(wrapped,"meta"),"stateRevision").string()=="9","runtime envelope missing");
check(s.matches.size()==3&&s.matches[0].events.size()==6,"read changed archive");
std::cout<<"current season, own-club transfers, tied ranks, appearances, cards and pure reads passed\n";return 0;
} catch(const std::exception& e){std::cerr<<e.what()<<'\n';return 1;}