Bind native statistics to recorded careers and correct cup winners (by Codex)

This commit is contained in:
Codex committed 2026-10-29 03:35:43 +01:00
1 parent e3ea03a05d
commit eb140cdb1c
24 files changed
+296 -33

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_career_files_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 modern_manager_presentation_tests modern_coach_identity_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_career_files_tests modern_statistics_projection_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 modern_winners_read_tests modern_manager_presentation_tests modern_coach_identity_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_winners_read_tests tests/modern_winners_read_tests.cpp)
target_link_libraries(modern_winners_read_tests PRIVATE bmh_modern_content)
add_test(NAME modern_winners_read_tests COMMAND modern_winners_read_tests)
add_executable(modern_coach_identity_tests tests/modern_coach_identity_tests.cpp)
target_link_libraries(modern_coach_identity_tests PRIVATE bmh_modern_content)
add_test(NAME modern_coach_identity_tests COMMAND modern_coach_identity_tests)
+11
View File
@@ -30,3 +30,14 @@ Code: `src/modern/content/statistics.hpp/.cpp`, Aufruf über `ModernSession::rea
## Prüfen
`MODERN_STATS=1 modern_season_sim <welt.obw> 60 0 1` zeigt am Laufende Beispielanfragen und ihre Antworten.
## Korrektur der UI-Siegerzuordnung (#21, 29.10.2026)
`read_statistics_screen` erhält dieselben Titelträger wie der vorhandene
Wettbewerbssieger-Read. Bei `AlmanacWinner.type = Pokalindex + 1` gehören
Champions League, Pokalsieger und UEFA-Cup zu 3/4/2. Die alte Oberfläche hatte
sie vertauscht. Supercup (Pokalindex8, Typ9) steht neben Meisterschaft und
DFB-Pokal; die vier ausländischen Meisterschaften haben ihre passenden
Grafikrollen. Nur die Leseprojektion ändert sich, keine Regeln, Titel oder
historischen Daten. Synthetische unterschiedliche Sieger und eine echte
Saisonübergabe prüfen den Gegenfall.
+9
View File
@@ -102,3 +102,12 @@ Nationalkennzeichen. Dieselbe Contentprojektion liest die geprüften OBS-Dateien
für die Dateiliste ohne zweite aktive Session. Kein RNG, keine Änderungen an
Weltmaßen und kein neues Save-/OBW-Format. Der Live-Frontendadapter liest auch
hier ausschließlich über `ModernSession::ui_read`.
### Große Statistikansicht
`ui_read({kind: "statistics", query: {...}})` delegiert an die vorhandene
`ModernSession::read_statistics_screen`. Das Snapshot-Datenobjekt enthält
`kind`, die unveränderte `query` und `report`. Die bekannten Filter und das
`available`-/`reason`-Verhalten bleiben erhalten. Vorhandene aktuelle Transfer-
und Analytics-Projektionen ergänzen die belegten Almanachauswertungen. Der
Read ist rein; weder OBS-/OBW-Format noch Spielregeln werden geä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 [Engine-Einstieg](integration/ENGINE_ENTRY.md) erzeugt über den
vorhandenen Wizard eine echte Karriere oder lädt eine 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
vorhandenen Wizard eine echte Karriere oder lädt eine 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, Fairplay und die große Statistikansicht 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. Die vorhandenen Speichern-/Laden-Fenster verwalten echte OBS-Dateien
+67
View File
@@ -66,3 +66,70 @@ abgestimmten GUI-Studien dienen nur als Vorschauersatz, falls die Welt die
entsprechende Demorolle nicht enthält. Der spätere Session-Adapter liefert die
wettbewerbsspezifischen Referenzen der tatsächlichen Historie. Auflösung und
Seitenverhältnis bleiben vom Datensatz bestimmt; das OBW wird nicht bearbeitet.
## Anbindung an die laufende Modern-Karriere
Der Engine-Einstieg verwendet denselben Presenter mit dem Session-Read
`{kind: "statistics", query: {...}}`. Die Abfrage delegiert an die vorhandene
`ModernSession::read_statistics_screen`; die UI berechnet keine zweite
Spielstatistik. Filter: `section` (0–8), `category` (0/1/5), `country` (0–5),
`winner_country` (stabile Nation-ID), `absolute` und sechs `curves`-Schalter.
Der Read trägt den üblichen Welt-/Karriere-/Manager-/Revisionskontext.
Die vorhandenen Almanachauswertungen liefern ewige Tabelle, Nationalturniere,
Serien/Rekorde, Sieger und Minutenintervalle. Transferhistorie und Analytics
kommen aus den vorhandenen gespeicherten Managerzeilen. Fehlt eine belegte
Historie, bleibt die Auswahl bedienbar und zeigt eine Leeranzeige. Insbesondere
werden Titelchancen, fehlende Saisonfinanzen oder nicht aufgezeichnete
Turniergruppen nicht mit POC-Werten gefüllt.
Die Graphprojektion erhält die originalen Ganzzahlmesswerte. Sie normalisiert
sie nur in das vorhandene moderne SVG-Koordinatensystem; die erste Kurve
(Tabellenplatz) läuft von oben nach unten, die übrigen von unten nach oben.
Absolute Darstellung verwendet die vom Read gelieferten Grenzen, relative die
Grenzen der jeweiligen Messreihe. Konstante Messreihen liegen mittig, Werte
außerhalb der absoluten Skala werden visuell begrenzt. Die sechs Farben gehören
zur GUI-Palette. Keine Zufallswerte und keine zurückgeschriebenen Messwerte.
Vereinslinks verwenden stabile IDs aus der Aufzeichnung und führen zum
vorhandenen Vereins-/aktuellen Kaderprofil. Archivspielernamen bleiben aus der
Aufzeichnung; ein historisches Profil zeigt unbekannte heutige Werte ausdrücklich
als „—“. Ein Pokal öffnet nur dann ein Siegerbild, wenn die Historie tatsächlich
einen Sieger und dessen Saison nennt. Das Bild stammt aus dem Weltpaket bzw.
dem bereits vorhandenen GUI-Ersatz, ohne Änderung am Datensatz.
### Verifizierte Wettbewerbszuordnung (#21)
Die tatsächliche Pokaltabelle ordnet UEFA-Cup/Champions League/Pokalsieger den
Indizes 1/2/3 zu; der Almanach speichert jeweils Index+1. Die ältere
Statistikauswertung hatte die europäischen Titelträger zyklisch vertauscht.
Die Zuordnung verwendet jetzt die richtigen Typen 3/4/2. Der deutsche Supercup
(Index8, Typ9) ist als dritte Titelspalte vorhanden; ausländische Meisterschaften
verwenden ihre vorhandenen jeweiligen Pokalrollen. Es werden keine zusätzlich
nicht simulierten ausländischen Pokalwettbewerbe erfunden.
Der Gegenfall benutzt unterschiedliche synthetische Sieger pro Pokal; vor dem
Fix scheitert er an der Champions-League-Spalte. Eine über die echte Session
bis nach dem Saisonwechsel gespielte Karriere bestätigt die Zuordnung gegenüber
dem unabhängigen vorhandenen `read_statistics({kind:"winners"})`-Read.
Die tatsächliche Titelvergabe und die gespeicherten Archivbytes bleiben gleich.
### Native Prüfung des Enginepakets (29.10.2026)
58 synthetische Regressionstests, 284 Haupt-GUI-Prüfungen, 44 zusätzliche
Profil-/Leerstandprüfungen und 1.600 Geometrie-/Schriftprüfungen bestanden.
Drei Themes in 1080p, zusätzlich Silver in 720p; alle neun Sektionen, alle
Länder, nationale/internationale/Hallen-Sieger, echte Kurvenumschaltung,
Pokalbild und Vereins-/Spielerabsprünge. Die Schriftgröße der Dropdownoptionen
entspricht der Buttonbeschriftung; Tabellen-, Legenden- und Auswahltexte liegen
in ihren Flächen und sind vertikal ausgerichtet.
Eine über die echte Session bis nach dem ersten Saisonwechsel gespielte
Karriere liefert Abschlusstabellen und Titel. 30 wiederholbare API-Abfragen,
drei fehlerhafte Filter und acht unabhängige Siegervergleiche sind geprüft.
Vorher/Nachher für #21, Rohantworten, native Screenshots und passende OBS liegen
privat unter `bmh_4k_ui/docs/qa/engine-statistics-2026-10-29/`. Reine Ansichten,
Filter und Save verändern weder den nativen Spielzustand noch RNG-/Archivbytes.
Der explizite Demo-Einstieg bleibt separat und wurde nativ nachgeprüft.
Linux x64/SDL2/OpenGL ausgeführt; native Windows-/macOS-Ausführung offen.
Anstoß bleibt gesperrt. Keine Änderungen an Classic, Match- oder Saisonregeln.
+1 -1
View File
@@ -18,7 +18,7 @@ werden. Die Quelle wird nicht in DemoSource überführt.
## Gebundener Umfang
- `ModernSession::ui_read`: `session`, `desktop`, `file-metadata`, `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,
- `ModernSession::ui_read`: `session`, `desktop`, `file-metadata`, `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`, `statistics`; 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
+9 -1
View File
@@ -8948,12 +8948,20 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
const std::string kind = ui_text(request, "kind"), request_id = ui_text(request, "requestId");
const int manager = context.manager;
if (manager < 0 || size_t(manager) >= g_.manager_teams.size() ||
(kind != "opening" && kind != "lineup" && kind != "tactics" && kind != "training" && kind != "bank" && kind != "contracts" &&
(kind != "statistics" && kind != "opening" && kind != "lineup" && kind != "tactics" && kind != "training" && kind != "bank" && kind != "contracts" &&
kind != "advertising" && kind != "stadium" && kind != "transfer" && kind != "postmatch" && kind != "credit" &&
!(kind == "friendly" && g_.manager_teams[size_t(manager)] == no_team())))
return modern::ui_read(g_, context, request);
if (const std::string wanted = ui_text(request, "managerId"); !wanted.empty() && wanted != modern::ui_manager_id(g_, manager))
return modern::ui_error(request_id, "manager_not_active", "Dieser Manager sitzt nicht am Schreibtisch.", revision, false);
if (kind == "statistics") {
const cli::Json* query=ui_field(request,"query");
if(!query||!query->object())return modern::ui_error(request_id,"invalid_statistics_request","Eine Statistikabfrage wird benötigt.",revision,false);
const auto report=read_statistics_screen(*query);const auto* result=report.object();
if(!result||!result->count("ok")||!std::holds_alternative<bool>(result->at("ok").value)||!std::get<bool>(result->at("ok").value))
return modern::ui_error(request_id,"statistics_unavailable","Diese Statistik ist derzeit nicht verfügbar.",revision,false);
return modern::ui_snapshot(g_,context,request_id,O{{"kind","statistics"},{"query",*query},{"report",report}});
}
if (kind == "opening") {
try {
O entrants{{"uefa", A{}}, {"champions", A{}}, {"winners", A{}}}; A order, fixtures;
+8 -3
View File
@@ -625,11 +625,16 @@ void winners_by_season(O& out, const std::vector<AlmanacSeason>& seasons, int ca
std::vector<Title> titles;
if (category == 0) {
const Country& c = kCountries[country];
titles.push_back({"Meisterschaft", c.league == 0 ? "championship" : "", 0, c.league, 0});
if (c.league == 0) titles.push_back({"DFB-Pokal", "dfb-cup", 1, -1, 0});
static constexpr const char* trophies[]{"championship","es-la-liga","it-serie-a","fr-ligue-1","en-premier-league"};
titles.push_back({"Meisterschaft", trophies[country], 0, c.league, 0});
if (c.league == 0) {
titles.push_back({"DFB-Pokal", "dfb-cup", 1, -1, 0});
titles.push_back({"Supercup", "supercup", 9, -1, 0}); // cup-table index 8 + 1
}
out["note"] = std::string(c.name) + " · Titelträger im Saisonvergleich";
} else if (category == 1) {
titles = {{"Champions League", "champions-league", 2, -1, 0}, {"Pokalsieger", "cup-winners", 3, -1, 0}, {"UEFA-Cup", "uefa-cup", 4, -1, 0}};
// Almanac types are cup-table index + 1: UEFA=1, Champions=2, Winners=3.
titles = {{"Champions League", "champions-league", 3, -1, 0}, {"Pokalsieger", "cup-winners", 4, -1, 0}, {"UEFA-Cup", "uefa-cup", 2, -1, 0}};
out["note"] = "Europäische Titelträger im Saisonvergleich";
} else {
titles = {{"Sieger", "indoor-masters", 12, -1, 1}, {"Finalist", "", 12, -1, 2}};
+2 -2
View File
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-only
add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp)
add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp engine_statistics.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp)
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
add_library(bmh_modern_ui_mods STATIC mod_library.cpp)
@@ -49,7 +49,7 @@ foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss report
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
endforeach()
foreach(component career_reports rankings career_files)
foreach(component career_reports rankings career_files statistics_projection)
add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp)
target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core)
if(MSVC)
+2
View File
@@ -62,6 +62,8 @@ Json engine_other_projection(const Json &bundle,const Json &index,const Json &re
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);
Json engine_statistics_projection(const Json &bundle,const Json &read);
Json engine_opening_projection(const Json &bundle,const Json &read);
// Single-session facade. Its owner serializes all calls on a background worker.
+7 -3
View File
@@ -87,6 +87,7 @@ void App::engine_frame() {
engine_contract_scroll_.reset();
}
if(rendered&&(menu_=="scorers"||menu_=="fairplay")){rankings_restore_scroll();context_->Update();}
if(menu_=="statistics")statistics_restore_scroll();
if(rendered&&files_native_){files_after_render();context_->Update();}
if (center_selects(*doc_)) context_->Update();
if (menu_ == "lineup" && lineup_roster_scroll_) {
@@ -158,9 +159,10 @@ void App::engine_event(Rml::Event &event) {
}
if(files_native_&&files_event(event))return;
if (engine_reports_event(event)) return;
if(menu_=="statistics"&&statistics_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" || menu_=="scorers") && 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" || menu_=="statistics") && 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())
@@ -249,9 +251,10 @@ void App::engine_event(Rml::Event &event) {
if(files_native_&&files_action(action,node))return;
if(action.starts_with("rankings-")&&menu_=="scorers"){rankings_action(action,node);return;}
if (engine_reports_action(action,node)) return;
if(menu_=="statistics"&&statistics_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" || menu_=="scorers") && report_picker_action(action,node)) return;
if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="statistics") && 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;
@@ -265,6 +268,7 @@ void App::engine_event(Rml::Event &event) {
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=="statistics"){menu_=id;engine_reports_sync();engine_statistics_load();}
else if(action=="engine-open"&&id=="load"){engine_files_begin("load");}
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();}
@@ -296,5 +300,5 @@ void App::engine_event(Rml::Event &event) {
}
Json App::engine_snapshot() const {
return {{"mode", engine_mode_}, {"creation_busy",engine_creation_busy_}, {"busy", engine_busy_}, {"dirty", engine_dirty_}, {"fresh", engine_fresh_}, {"bundle", engine_data_},
{"response", engine_response_}, {"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"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_}};
{"response", engine_response_}, {"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"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_}};
}
+2 -2
View File
@@ -30,9 +30,9 @@ bool App::engine_rankings_action(const std::string &action,Rml::Element *target)
}
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;
if(r.at("currentTeam").is_object()&&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);
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()?r.value("source_caption",std::string("Saisonaufzeichnung")):std::string("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()?r.value("archive_label",std::string("Archivverein")):std::string("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>";
}
+7 -2
View File
@@ -7,6 +7,7 @@ void App::engine_reports_sync() {
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_statistics_read_=Json();engine_statistics_value_=Json();engine_statistics_query_=Json();statistics_trophy_=Json::object();statistics_scrolls_=Json::object();
engine_other_index_=Json();engine_other_read_=Json();engine_other_value_=Json();
report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear();
}
@@ -54,6 +55,7 @@ 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")=="statistics"){engine_statistics_value_=engine_statistics_projection(reply.bundle,read);engine_statistics_read_=read;engine_statistics_query_=r.at("query");engine_notice_="Statistik geladen.";return;}
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;}
@@ -85,6 +87,8 @@ 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_=="statistics"&&engine_statistics_value_.is_object())for(const auto &row:engine_statistics_value_.at("rows"))for(const auto &cell:row.at("cells"))if(cell.value("club","")==id)return {{"id",id},{"name",cell.at("text")}};
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");
@@ -112,7 +116,7 @@ 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"&&menu_!="scorers"&&menu_!="fairplay")return false;
if(menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other"&&menu_!="scorers"&&menu_!="fairplay"&&menu_!="statistics")return false;
const auto id=target?target->GetAttribute<Rml::String>("data-id",""):std::string();
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";
@@ -135,6 +139,7 @@ bool App::engine_reports_action(const std::string &action,Rml::Element *target)
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(menu_=="statistics"&&action=="player-detail"&&engine_statistics_player(id,target))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;}
@@ -143,7 +148,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"&&menu_!="scorers"&&menu_!="fairplay")||report_detail_kind_.empty())return false;
if((menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other"&&menu_!="scorers"&&menu_!="fairplay"&&menu_!="statistics")||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;}
+7 -2
View File
@@ -39,6 +39,7 @@ void App::engine_render() {
if(menu_=="save"||menu_=="load"||!files_mode_.empty())files_before_render();
if (ticket_) ticket_->close(false);
if(menu_=="scorers"||menu_=="fairplay")rankings_remember_scroll();
if(menu_=="statistics")statistics_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();
@@ -119,7 +120,7 @@ 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"||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 == "load" || (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=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (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_);
}
}
@@ -128,6 +129,7 @@ void App::engine_render() {
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_=="statistics")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Statistiken",engine_statistics_value_.is_object()?render_statistics():"<div class=\"fill center\">"+esc(engine_busy_?"Statistik wird geladen …":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>";
if(menu_=="almanac") out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Almanach",engine_almanac_cache_.contains("index")?render_almanac():"<div class=\"fill center\">"+esc(engine_busy_?"Spielarchiv wird geladen …":engine_notice_)+"</div>")+"</div>";
@@ -145,6 +147,8 @@ void App::engine_render() {
}
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>";
if(menu_=="statistics")out+=render_statistics_trophy();
element("canvas")->SetProperty("overflow",statistics_trophy_.contains("asset")?"visible":"hidden");
element("canvas")->SetInnerRML(out); ++document_generation_;
scale_chalk_shadow();
if (!engine_player_.empty()) {
@@ -166,7 +170,8 @@ 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"||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(!report_detail_kind_.empty()&&(menu_=="tables"||menu_=="strengths"||menu_=="league"||menu_=="other"||menu_=="scorers"||menu_=="fairplay"||menu_=="statistics")){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#report-underlay button,.rankings-scorers button,.rankings-fairplay button,.statistics-native button,#window-close");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
if(statistics_trophy_.contains("asset")){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,".window button,.window input");for(auto *n:nodes)n->SetAttribute("disabled",true);}
if (engine_busy_) {
Rml::ElementList controls; doc_->QuerySelectorAll(controls, "#canvas button,#canvas input");
for (auto *node : controls) node->SetAttribute("disabled", true);
+5
View File
@@ -95,3 +95,8 @@
void engine_create_poll();
void engine_accept(EngineReply);
bool engine_opening_active() const;
Json engine_statistics_read_,engine_statistics_value_,engine_statistics_query_;
Json statistics_data() const;
void engine_statistics_load();
bool engine_statistics_player(const std::string &,Rml::Element *);
+40
View File
@@ -0,0 +1,40 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/engine_bridge.hpp"
#include <algorithm>
#include <array>
#include <cmath>
namespace bmh::modern_ui {
namespace {
void check(bool condition,const char *message){if(!condition)throw editor::Error(message);}
}
Json engine_statistics_projection(const Json &bundle,const Json &read) {
validate_engine_desk(bundle);
check(read.value("messageType","")=="snapshot"&&read.at("data").value("kind","")=="statistics","Diese Statistik ist derzeit nicht verfügbar.");
for(const auto *key:{"contractVersion","careerId","worldId","worldRevision","stateRevision","scope"})
check(read.at("meta").at(key)==bundle.at("desktop").at("meta").at(key),"Der Statistikkontext hat sich geändert.");
auto data=read.at("data").at("report");
check(data.value("ok",false)&&data.at("fictional")==false,"Eine echte Statistikprojektion fehlt.");
check(data.at("section").is_number_integer()&&data.at("section").get<int>()>=0&&data.at("section").get<int>()<=8&&data.at("available").is_boolean(),"Ungültige Statistiksektion.");
check(data.at("columns").is_array()&&data.at("rows").is_array()&&data.at("series").is_array(),"Statistikreihen fehlen.");
for(const auto &row:data.at("rows")) {
check(row.at("cells").is_array()&&row.at("cells").size()==data.at("columns").size(),"Unvollständige Statistikzeile.");
for(const auto &cell:row.at("cells"))check(cell.at("text").is_string(),"Statistiktext fehlt.");
}
// Geometry is presentation only. Every point retains its saved source value.
constexpr std::array<const char*,6> colors{"#e3da6a","#79b5c8","#a9d67b","#e58a66","#ded9bd","#b295cd"};
check(data.at("series").size()<=colors.size(),"Zu viele Statistikreihen.");
size_t index=0;
for(auto &series:data["series"]) {
const auto &values=series.at("values");check(values.is_array()&&values.size()<=1024&&series.at("active").is_boolean(),"Ungültige Statistikwerte.");
double low=0,high=0;bool first=true;
for(const auto &v:values){check(v.is_number_integer(),"Ein Statistikwert ist keine Ganzzahl.");const auto n=v.get<double>();check(std::isfinite(n),"Ungültiger Statistikwert.");if(first){low=high=n;first=false;}else{low=std::min(low,n);high=std::max(high,n);}}
if(data.at("absolute")==true){check(series.at("absoluteMin").is_number_integer()&&series.at("absoluteMax").is_number_integer(),"Die absolute Skala fehlt.");low=series.at("absoluteMin").get<double>();high=series.at("absoluteMax").get<double>();}
Json points=Json::array();const double range=std::abs(high-low);
for(size_t at=0;at<values.size();++at){double value=values[at].get<double>();if(value<low)value=low;if(high<value)value=high;const double fraction=range?std::clamp(std::abs(value-low)/range,0.,1.):.5;const double x=50.+double(at)*3280./double(std::max(size_t(1),values.size()-1));const double y=index==0?50.+680.*fraction:730.-680.*fraction;points.push_back({x,y});}
series["points"]=std::move(points);series["color"]=colors[index++];
}
// A trophy can open only when the archive actually names a winner.
if(data.at("section")==7)for(size_t column=0;column<data["columns"].size();++column){auto &heading=data["columns"][column];if(heading.value("trophy","").empty())continue;for(const auto &row:data["rows"]){const auto &cell=row.at("cells")[column];if(cell.contains("club")&&cell.at("club").is_string()){heading["winner"]=cell.at("club");heading["season"]=row.at("cells")[0].at("text");break;}}}
return data;
}
} // namespace bmh::modern_ui
+24
View File
@@ -0,0 +1,24 @@
// SPDX-License-Identifier: GPL-3.0-only
Json App::statistics_data() const {
if(engine_mode_)return engine_statistics_value_.is_object()?engine_statistics_value_:Json{{"ok",false}};
return source_?source_->read_statistics(statistics_view_):Json{{"ok",false}};
}
void App::engine_statistics_load() {
if(engine_busy_||engine_files_busy_||!engine_fresh_)return;
if(engine_statistics_value_.is_object()&&engine_statistics_query_==statistics_view_){refresh();return;}
const auto query=statistics_view_;auto link=engine_link_;
engine_start("Statistik wird geladen …",[link,query]{const auto bundle=link->snapshot();return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","statistics"},{"query",query},{"read",link->read({{"kind","statistics"},{"query",query}})}},nullptr};});
}
bool App::engine_statistics_player(const std::string &id,Rml::Element *target) {
if(!engine_statistics_value_.is_object())return false;
for(const auto &row:engine_statistics_value_.at("rows"))for(const auto &cell:row.at("cells"))if(cell.value("player","")==id) {
std::string team=cell.value("club",""),name="—";
for(const auto &other:row.at("cells"))if(other.contains("club")||other.contains("nation")){team=other.value("club",other.value("nation",std::string()));name=other.value("text",std::string("—"));break;}
const auto *player=world_->find("players",id);std::string photo;
if(player&&player->value("photo",Json()).is_string())photo=player->at("photo");
if(photo.empty())photo="asset:player/"+(id.starts_with("player:")?id.substr(7):id)+"/photo";
engine_rankings_player_={{"player",id},{"name",cell.at("text")},{"club",team},{"club_name",name},{"photo",photo},{"currentTeam",nullptr},{"archive_label","Archivmannschaft"},{"source_caption","Archivaufzeichnung"}};
report_detail_player_=id;report_detail_club_=team;report_detail_kind_="player";report_detail_return_focus_=target->GetId();focus_after_render_="report-detail-close";close_report_picker(false);refresh();return true;
}
return false;
}
+5 -3
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
bool App::statistics_picker_select(const std::string &kind,const std::string &value) {
if(menu_!="statistics"||!source_||statistics_trophy_.contains("asset"))return false;
if(menu_!="statistics"||(!source_&&!engine_mode_)||statistics_trophy_.contains("asset"))return false;
const auto items=statistics_picker_items(kind);
if(std::none_of(items.begin(),items.end(),[&](const auto &item){return item.first==value;}))return false;
statistics_remember_scroll();
@@ -9,11 +9,12 @@ bool App::statistics_picker_select(const std::string &kind,const std::string &va
const auto field=kind=="stat-section"?"section":kind=="stat-category"?"category":"country";
statistics_view_[field]=std::stoi(value);
}
if(engine_mode_)engine_statistics_load();
return true;
}
bool App::statistics_action(const std::string &action,Rml::Element *target) {
if(!action.starts_with("statistics-"))return false;
if(menu_!="statistics"||!source_)return true;
if(menu_!="statistics"||(!source_&&!engine_mode_))return true;
if(action=="statistics-trophy-close") {
if(statistics_trophy_.contains("asset")) {
focus_after_render_=statistics_trophy_.value("return_focus","");statistics_trophy_=Json::object();refresh();
@@ -21,7 +22,7 @@ bool App::statistics_action(const std::string &action,Rml::Element *target) {
return true;
}
if(!target||statistics_trophy_.contains("asset")||!report_detail_kind_.empty()||!report_picker_.empty())return true;
const auto data=source_->read_statistics(statistics_view_);
const auto data=statistics_data();
if(!data.value("ok",false))return true;
statistics_remember_scroll();
if(action=="statistics-absolute"&&data.at("section")==2)statistics_view_["absolute"]=!data.at("absolute").get<bool>();
@@ -44,6 +45,7 @@ bool App::statistics_action(const std::string &action,Rml::Element *target) {
statistics_trophy_={{"asset",asset},{"title",title},{"winner",winner},{"season",entry.value("season",data.value("previous_season",""))},{"return_focus",target->GetId()}};
focus_after_render_="statistics-trophy-close";
} else return true;
if(engine_mode_&&action!="statistics-trophy")engine_statistics_load();
if(action!="statistics-trophy")focus_after_render_=target->GetId();
refresh();return true;
}
+9 -8
View File
@@ -10,8 +10,8 @@ std::string statistics_scroll_key(const Json &data) {
std::vector<std::pair<std::string,std::string>> App::statistics_picker_items(const std::string &kind) const {
std::vector<std::pair<std::string,std::string>> result;
if(!source_)return result;
const auto data=source_->read_statistics(statistics_view_);
if(!source_&&!engine_mode_)return result;
const auto data=statistics_data();
if(!data.value("ok",false))return result;
const int section=data.at("section").get<int>();
if(kind=="stat-section") {
@@ -30,8 +30,8 @@ std::vector<std::pair<std::string,std::string>> App::statistics_picker_items(con
return result;
}
std::string App::statistics_picker_value(const std::string &kind) const {
if(!source_)return {};
const auto data=source_->read_statistics(statistics_view_);
if(!source_&&!engine_mode_)return {};
const auto data=statistics_data();
if(!data.value("ok",false))return {};
if(kind=="winner-country")return data.value("winner_country","");
const auto key=kind=="stat-section"?"section":kind=="stat-category"?"category":"country";
@@ -77,14 +77,15 @@ std::string App::statistics_trophy_asset(const std::string &id) const {
}
std::string App::render_statistics() {
statistics_remember_scroll();
if(!source_||!world_)return "<p>Statistiken sind nicht verfügbar.</p>";
const auto data=source_->read_statistics(statistics_view_);
if((!source_&&!engine_mode_)||!world_)return "<p>Statistiken sind nicht verfügbar.</p>";
const auto data=statistics_data();
if(!data.value("ok",false))return "<p>Statistiken sind nicht verfügbar.</p>";
const int section=data.at("section").get<int>(),category=data.at("category").get<int>();
const bool winners=section==7,minutes=section==8,finals=section==4&&data.at("country")==3;
std::string out="<section class=\"statistics-native statistics-section-"+std::to_string(section)+(finals?" statistics-finals":"")+"\"><div class=\"statistics-panel\"><h2 class=\"statistics-heading\">"+esc(data.at("title").get<std::string>())+"</h2>";
if(winners)out+="<p class=\"statistics-winner-note\">"+statistics_text(data.value("note",""))+"</p>";
if(section==2) {
if(engine_mode_&&!data.value("available",false)){out+="<p class=\"statistics-empty\">"+statistics_text(data.value("reason","")=="not_recorded"?"Diese Auswertung wurde in der Karriere noch nicht aufgezeichnet.":"Keine Statistikdaten für diese Auswahl vorhanden.")+"</p>";}
else if(section==2) {
std::string svg="<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 3400 780' width='2496' height='812' preserveAspectRatio='none'><path d='M30 10V730H3380' fill='none' stroke='"+std::string(theme_=="silver"?"#627c8f":"#7d9aae")+"' stroke-width='3'/>";
const auto &series=data.at("series");
for(const auto &curve:series)if(curve.at("active")==true) {
@@ -93,7 +94,7 @@ std::string App::render_statistics() {
svg+="' fill='none' stroke='"+curve.at("color").get<std::string>()+"' stroke-width='7'/>";
}
svg+="</svg>";
out+="<div class=\"statistics-graph\" role=\"img\" aria-label=\"Sechs fiktive Verlaufsreihen · "+std::string(data.at("absolute")==true?"absolut":"relativ")+"\">"+picture(renderer_.diagram("statistics-analytics",svg,5100),2496,812)+"</div><div class=\"statistics-series\">";
out+="<div class=\"statistics-graph\" role=\"img\" aria-label=\""+std::string(engine_mode_?"Aufgezeichnete Verlaufsreihen · ":"Sechs fiktive Verlaufsreihen · ")+std::string(data.at("absolute")==true?"absolut":"relativ")+"\">"+picture(renderer_.diagram("statistics-analytics",svg,5100),2496,812)+"</div><div class=\"statistics-series\">";
for(size_t k=0;k<series.size();++k) {
const auto &curve=series[k];const bool active=curve.at("active").get<bool>();
out+=btn("statistics-curve","<span class=\"statistics-series-dot\" style=\"background-color:"+curve.at("color").get<std::string>()+";\"></span><span class=\"statistics-series-label\">"+esc(curve.at("name").get<std::string>())+"</span>","statistics-action statistics-series-button",
+1
View File
@@ -1541,6 +1541,7 @@ public:
#include "modern/ui/engine_rankings.inc"
#include "modern/ui/engine_creation.inc"
#include "modern/ui/engine_files.inc"
#include "modern/ui/engine_statistics.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {
+21 -4
View File
@@ -15,25 +15,26 @@ 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","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files"};
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","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics"};
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)); };
if (mode == "prepare-almanac" || std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") {
if (mode == "prepare-statistics" || mode == "prepare-almanac" || std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") {
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(), 17u);
ui::SetupOptions options; options.mode = 3; if(mode=="prepare-almanac") options.world=false; if (std::string(argv[1]) == "prepare-national") options.league = false; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1;
ui::SetupOptions options; options.mode = 3; if(mode=="prepare-almanac"||mode=="prepare-statistics") options.world=false; if (std::string(argv[1]) == "prepare-national") options.league = false; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1;
ui::ManagerChoice manager; manager.name = "Codex Engine QA"; manager.master_club = 0;
std::string error; ui::CareerInitializationResult result;
if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error);
if (options.managers == 2) { manager.name = "Codex Opponent QA"; manager.master_club = 1; manager.portrait = 1; if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error); }
if (!session.finish(result, error)) throw std::runtime_error(error);
if (mode == "prepare-national" || mode == "prepare-almanac") {
if (mode == "prepare-national" || mode == "prepare-almanac" || mode == "prepare-statistics") {
uint64_t rev = 0; bool found = false; Json expiry = Json::object(), log = Json::array();
for (int k = 0; k < 200; ++k) {
const auto desk = Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},rev)));
if (mode=="prepare-national" && desk.at("meta").at("scope").at("role") == "national") { found = true; break; }
if(mode=="prepare-statistics"&&!session.state().almanac.finished.empty()){found=true;break;}
if(mode=="prepare-almanac") {const auto index=Json::parse(cli::dump_json(session.read_almanac(cli::Json::Object{{"kind","index"}})));if(index.value("ok",false)&&index.at("years").size()>=2){found=true;break;}}
const auto &meta = desk.at("meta");
const Json command{{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:prepare-national-"+std::to_string(k)},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",{{"contractExpiry",expiry}}}};
@@ -127,9 +128,25 @@ int main(int argc, char **argv) {
const auto &season=session.state().almanac.current;bool found=false;Json recorded=Json::array();for(size_t i=initial;i<season.matches.size();++i){const auto &match=season.matches[i];for(int manager:{int(match.home_manager),int(match.away_manager)})if(manager>=0){const auto &person=season.managers.at(size_t(manager));recorded.push_back({{"managerIndex",person.index},{"name",person.name},{"matchType",match.type}});if(match.type==7||match.type==8){if(person.index!=2||person.name!="Alex Berger")throw std::runtime_error("national archive used another human");found=true;}}}
if(!found)throw std::runtime_error("no human national match recorded");write("recorded-managers.json",recorded);write("returned.json",Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","session"}},revision))));std::string error;const int active=session.state().memory.u8(::bmh::layout::ActiveManager);if(!session.save_game(out/"after-national.obs",active,false,error))throw std::runtime_error(error);modern::set_current_world(nullptr);std::cout<<"national archive attributed to third human\n";return 0;
}
if(mode=="inspect-statistics") {
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);
write("winner-records.json",Json::parse(cli::dump_json(session.read_statistics(cli::Json::Object{{"kind","winners"}}))));modern::set_current_world(nullptr);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");
if(mode=="verify-statistics") {
Json all=Json::array();
const auto run=[&](const Json &query){const auto read=link->read({{"kind","statistics"},{"query",query}});auto value=engine_statistics_projection(before,read);if(link->read({{"kind","statistics"},{"query",query}})!=read)throw std::runtime_error("statistics read not repeatable");all.push_back({{"query",query},{"read",read},{"projection",value}});return value;};
for(int section=0;section<9;++section)run({{"section",section}});
for(int country=0;country<6;++country){run({{"section",3},{"country",country}});run({{"section",4},{"country",country}});}
for(int category:{0,1,5})run({{"section",7},{"category",category}});
const auto index=run({{"section",7}});for(const auto &country:index.at("countries"))run({{"section",7},{"winner_country",country.at("id")}});
run({{"section",2},{"absolute",true},{"curves",{false,true,false,true,false,true}}});
if(link->snapshot()!=before)throw std::runtime_error("statistics reads changed session");
for(const auto &query:Json::array({Json{{"section",9}},Json{{"unknown",true}},Json{{"section",7},{"winner_country","nation:missing"}}})){const auto result=link->read({{"kind","statistics"},{"query",query}});if(result.value("messageType","")!="error"||link->snapshot()!=before)throw std::runtime_error("invalid statistics filter not rejected purely");}
write("all-statistics.json",all);write("saved.json",link->save_copy(out/"unchanged.obs"));write("receipt.json",{{"status","passed"},{"reads",int(all.size())},{"invalidFilters",3},{"readOnly",true}});std::cout<<"real statistics filters, series and read purity passed\n";return 0;
}
if(mode=="verify-files") {
auto store=make_career_files(out/"library",world);const auto meta=link->file_metadata();write("metadata.json",meta);
const auto first=store.put("Erste Saison",[&](const auto &path){link->save_copy(path);});
@@ -0,0 +1,21 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/engine_bridge.hpp"
#include <iostream>
#include <stdexcept>
#include <cmath>
using namespace bmh::modern_ui;
namespace {
void require(bool yes,const char *why){if(!yes)throw std::runtime_error(why);}
template<class F>void rejects(F f){bool rejected=false;try{f();}catch(const std::exception&){rejected=true;}require(rejected,"invalid statistics accepted");}
Json bundle(){const Json meta={{"contractVersion","bmh-modern-ui@draft1"},{"careerId","career:test"},{"worldId","world:test"},{"worldRevision","1"},{"stateRevision","3"},{"scope",{{"managerId","manager:test"},{"teamId","club:test"}}}};Json b;for(const auto *kind:{"session","desktop","camps"})b[kind]={{"messageType","snapshot"},{"meta",meta},{"data",{{"kind",kind}}}};b["desktop"]["data"].update({{"manager",{{"id","manager:test"}}},{"team",{{"id","club:test"}}},{"accounts",{{"cash",{{"currency","EUR"},{"minorUnits",2},{"minor","0"}}}}}});b["camps"]["data"]["camps"]=Json::array();return b;}
Json report(){return {{"ok",true},{"fictional",false},{"section",2},{"available",true},{"absolute",false},{"columns",Json::array()},{"rows",Json::array()},{"series",{{{"name","Rank"},{"active",true},{"values",{1,3,2}},{"absoluteMin",1},{"absoluteMax",18}},{{"name","Cash"},{"active",false},{"values",{-100,0,100}},{"absoluteMin",-200},{"absoluteMax",200}}}}};}
Json read(const Json &b,const Json &report){return {{"messageType","snapshot"},{"meta",b.at("desktop").at("meta")},{"data",{{"kind","statistics"},{"query",Json::object()},{"report",report}}}};}
}
int main(){try{
const auto b=bundle();auto raw=report();const auto original=raw;const auto v=engine_statistics_projection(b,read(b,raw));require(raw==original,"projection changed engine report");require(v.at("series")[0].at("values")==raw.at("series")[0].at("values"),"source values changed");require(v.at("series")[0].at("points")[0][1]==50.&&v.at("series")[0].at("points")[1][1]==730.,"rank direction reversed");require(v.at("series")[1].at("points")[0][1]==730.&&v.at("series")[1].at("points")[2][1]==50.,"value direction reversed");require(v.at("series")[1].at("active")==false,"hidden curve reactivated");
raw["absolute"]=true;const auto a=engine_statistics_projection(b,read(b,raw));require(std::abs(a.at("series")[1].at("points")[0][1].get<double>()-560.)<.001,"absolute range ignored");
raw["series"][0]["values"]={0};raw["absolute"]=false;const auto constant=engine_statistics_projection(b,read(b,raw));require(constant.at("series")[0].at("points")[0][1]==390.,"constant series is not centered");
auto stale=read(b,raw);stale["meta"]["scope"]["managerId"]="manager:other";rejects([&]{engine_statistics_projection(b,stale);});raw["fictional"]=true;rejects([&]{engine_statistics_projection(b,read(b,raw));});raw=report();raw["series"][0]["values"][0]="3";rejects([&]{engine_statistics_projection(b,read(b,raw));});
raw=report();raw["section"]=7;raw["series"]=Json::array();raw["columns"]={{{"text","Season"}},{{"text","Cup"},{"trophy","dfb-cup"}}};raw["rows"]={{{"cells",{{{"text","2030/31"}},{{"text","Synthetic winner"},{"club","club:winner"}}}}}};const auto winners=engine_statistics_projection(b,read(b,raw));require(winners.at("columns")[1].at("winner")=="club:winner"&&winners.at("columns")[1].at("season")=="2030/31","trophy lost recorded winner/season");raw["rows"]=Json::array();raw["available"]=false;raw["reason"]="not_recorded";const auto empty=engine_statistics_projection(b,read(b,raw));require(!empty.at("available").get<bool>()&&empty.at("rows").empty()&&!empty.at("columns")[1].contains("winner"),"empty archive invented winner");
std::cout<<"statistics: authoritative rows, signed values, scales, missing records and context checks passed\n";return 0;
}catch(const std::exception &e){std::cerr<<e.what()<<'\n';return 1;}}
+32
View File
@@ -0,0 +1,32 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/content/statistics.hpp"
#include "modern/game/modern_state.hpp"
#include <iostream>
#include <stdexcept>
using namespace bmh::modern;
namespace {
using J=bmh::cli::Json;using O=J::Object;
const J& at(const J& v,const char *key){return v.object()->at(key);}
void check(bool value,const char *why){if(!value)throw std::runtime_error(why);}
std::string club(const J& view,size_t column){return *at(at(at(view,"rows").array()->at(0),"cells").array()->at(column),"club").string();}
}
int main()try{
ModernState g;g.manager_teams={0};g.manager_records.resize(0xb0c);g.display_start_year=2026;auto &s=g.almanac.current;s.season=0;s.start_year=2026;
for(int i=0;i<8;++i)s.club({"club:"+std::to_string(i),"Synthetic club "+std::to_string(i)});
// Real cup-table indices: 1 UEFA, 2 Champions League, 3 Cup Winners, 8 Supercup.
for(int cup:{1,2,3,8})s.winners.push_back({uint8_t(cup+1),0xff,0xff,0,100,uint16_t(cup==8?4:cup),0xffff});
s.winners.push_back({0,0,0xff,0,100,5,0xffff});s.winners.push_back({1,0xff,0xff,0,100,6,0xffff});s.winners.push_back({0,6,0xff,0,100,7,0xffff});
const auto previous=s;
const auto europe=query_statistics_screen(g,0,O{{"section",7},{"category",1}});
check(at(europe,"ok").boolean()&&*at(europe,"ok").boolean(),"European read unavailable");
check(club(europe,1)=="club:2","Champions League column names another cup's winner");
check(club(europe,2)=="club:3","Cup Winners column names another cup's winner");
check(club(europe,3)=="club:1","UEFA column names another cup's winner");
const auto de=query_statistics_screen(g,0,O{{"section",7},{"category",0}});
check(at(de,"columns").array()->size()==4,"German Supercup column missing");
check(club(de,1)=="club:5"&&club(de,2)=="club:6"&&club(de,3)=="club:4","German winners do not use their recorded competitions");
const auto en=query_statistics_screen(g,0,O{{"section",7},{"category",0},{"winner_country","nation:en"}});
check(club(en,1)=="club:7","foreign championship winner differs");
check(*at(at(en,"columns").array()->at(1),"trophy").string()=="en-premier-league","foreign championship has wrong trophy role");
check(g.almanac.current==previous,"winner queries modified archive");std::cout<<"winners: distinct European cups, Supercup and foreign trophy roles passed\n";return 0;
}catch(const std::exception &e){std::cerr<<e.what()<<'\n';return 1;}