diff --git a/.github/workflows/modern-ui.yml b/.github/workflows/modern-ui.yml index 1f9f74a..4dd6f8c 100644 --- a/.github/workflows/modern-ui.yml +++ b/.github/workflows/modern-ui.yml @@ -52,9 +52,9 @@ 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 --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 --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_)" -LE external-data --output-on-failure --output-junit modern-ui-results.xml + 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 if: always() uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index e26a402..8907025 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1217,6 +1217,9 @@ 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_report_read_tests tests/modern_report_read_tests.cpp) +target_link_libraries(modern_report_read_tests PRIVATE bmh_modern_content) +add_test(NAME modern_report_read_tests COMMAND modern_report_read_tests) add_executable(modern_toto_tests tests/modern_toto_tests.cpp) target_link_libraries(modern_toto_tests PRIVATE bmh_season_modern) add_test(NAME modern_toto_tests COMMAND modern_toto_tests) diff --git a/docs/new_engine/README.md b/docs/new_engine/README.md index 21ae2ee..d9b5115 100644 --- a/docs/new_engine/README.md +++ b/docs/new_engine/README.md @@ -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); Projektionen offen | +| 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, 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 | diff --git a/docs/new_engine/phasen.md b/docs/new_engine/phasen.md index 5d45d31..44df970 100644 --- a/docs/new_engine/phasen.md +++ b/docs/new_engine/phasen.md @@ -111,3 +111,13 @@ berichtigt eindeutig belegte ältere Doppelprotokolle in Kopien. Spielstandbytes Spielentscheidungen und RNG bleiben unverändert. Hallen- und unklare Verlängerungs-Teilstände werden ausdrücklich behandelt. Format und Editor benötigen keine Anpassung; [Nachweise und Grenzen](almanach.md). + +### M6 · Tabellen-/Stärken-Leseprojektion, 28. Oktober 2026 + +`report-index` nennt die tatsächlich aktiven Ligen und ihre aktuellen Mitglieder. +`league-report` kapselt ComputeLeagueTable mit fünf Filtern und TeamAverage für +den ganzen Kader. Die UI ordnet gelieferte Zeilen nur zur Ansicht um; Kader und +Profile nutzen den bestehenden squad-Read. Es gibt keine Regel-, OBW- oder +Editor-Formatänderung. Nicht projizierte Qualifikationszonen bleiben unbekannt. +Synthetische Tabellen-/Subset-/Bereichsprüfungen und private Read-/GUI-Rundreisen +stehen unter `bmh_4k_ui/docs/qa/engine-reports-2026-10-28/`. diff --git a/docs/new_ui/NATIVE_STATUS.md b/docs/new_ui/NATIVE_STATUS.md index cada85f..7ce8733 100644 --- a/docs/new_ui/NATIVE_STATUS.md +++ b/docs/new_ui/NATIVE_STATUS.md @@ -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 und den Almanach 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 und Stärken 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 diff --git a/docs/new_ui/README.md b/docs/new_ui/README.md index bcca97f..90c347a 100644 --- a/docs/new_ui/README.md +++ b/docs/new_ui/README.md @@ -40,7 +40,7 @@ Implementierung in der Spiel-Engine. | Verträge | [Kaderdaten, Angebote, Versicherung und Prämien](desktop/contracts/README.md) | | Almanach | [Echte Archivjahre, Tagespartien und historische Spielberichte](desktop/almanac/README.md) | | Paarungsanordnung | [Mittige Ergebnisse und innenliegende Wappen](desktop/fixtures/README.md) | -| Berichte | [Tabellen, Stärken, Ligaspiele, übrige Spiele und Profile](desktop/reports/README.md) | +| Berichte | [Echte Tabellen/Stärken und Profile; getrennte Spielvorschau](desktop/reports/README.md) | | Freundschaftsspiele | [Vereins-/Nationalgegner, echte Angebote und bestätigte Buchungen](desktop/friendlies/README.md) | | Verlegen | [Kalendergestützte Verlegung mit Rücknahme](desktop/postpone/README.md) | | Hallentabellen | [16 Vereine, Sortierung und Hallenmasters-Info](desktop/indoor/README.md) | diff --git a/docs/new_ui/desktop/reports/README.md b/docs/new_ui/desktop/reports/README.md index 0d79254..c131970 100644 --- a/docs/new_ui/desktop/reports/README.md +++ b/docs/new_ui/desktop/reports/README.md @@ -12,6 +12,54 @@ Die Ansichten verbinden **echte Katalogdaten aus der geladenen OBW-Welt** mit ausdrücklich fiktiven Berichtsergebnissen. Sie starten keine Karriere, führen keine Spiele aus und ändern weder Weltdatei noch Enginezustand. +## Echte Tabellen und Stärken · 28. Oktober 2026 + +Ausgangsstand `0.3` / `f9e8719`. Im tatsächlichen Engine-Einstieg verwenden +Tabellen und Stärken jetzt denselben vorhandenen RmlUI-Presenter mit Sessiondaten. +`report-index` liefert die aktiven Ligen mit stabilen IDs, Namen, Land-ID, +aktuellen Teilnehmern, Vereinszahl, Spieltagen und Fortschritt. Die Länder- und +Ligaauswahl verwendet ausschließlich diesen Index, einschließlich der erweiterten +internationalen Ligen. Die übrigen Spielberichte bleiben bis zu ihrem eigenen +Anschluss getrennte Präsentationsansichten. + +`league-report {leagueId, filter}` liefert Tabelle und Kaderstärken im selben +Karriere-/Welt-/Manager-/Revisionskontext. Filter 0–4 bedeuten Alle Spiele, +Hinrunde, Rückrunde, Heim und Auswärts. Die Tabelle kommt direkt aus +`ComputeLeagueTable`, einschließlich Abzügen, Rangfolge und Formprotokoll. +Eine noch nicht gespielte Halbserie hat null Spiele und eindeutige Source-Ränge. +Die UI berechnet keine Punkte- oder Terminregeln. Sie sortiert ausschließlich +die gelieferten Zeilen; „Pl. / Verein“ bleibt eine Rangsortierung. „Gesamt“ +setzt Filter und Rangsortierung zurück. + +Die Positionswerte stammen aus `TeamAverage` mit KO/TE/Form/Moral für den +aktuellen gesamten Kader, ohne Startelf-Einschränkung. Fehlende Positionen +bleiben unbekannt. Die Stärke wird nicht aus dem statischen Weltkader abgeleitet. +Qualifikations-/Aufstiegs-/Abstiegsmarkierungen bleiben im echten Einstieg +neutral, solange dafür keine belastbare Regelprojektion vorliegt. Die Farben +der getrennten HTML-/RmlUI-Demo behaupten keine aktuellen Engineregeln. + +Vereinsklick, Spielerübersicht und Spielerprofil verwenden die vorhandenen +Dialogformen. Der Kader kommt bei Bedarf aus `squad {teamId}` und zeigt aktuelle +Namen, Positionen, Stärke und Alter; Fotos kommen über die gelieferten Asset-IDs. +Bekannte Restvertragsmonate werden angezeigt, fehlende Angaben bleiben —. +Stadionnamen sind unveränderliche Weltmetadaten. Plätze werden nur aus tatsächlich +vorliegenden aktuellen Stadionblöcken angezeigt; fehlende fremde Kapazitäten +werden nicht aus dem Anfangsdatensatz geraten. Menschliche Manager werden aus +der aktiven Session zugeordnet. + +Die Bridge lädt auf ihrem seriellen Hintergrund-Worker. Ein unveränderter +Ligabericht wird beim Wechsel Tabelle/Stärken wiederverwendet. Ein neuer +Karriere-/Welt-/Manager-/Revisionskontext verwirft Bericht und Kadercache. +Sortieren, Filter-/Länderwechsel und Profile erzeugen keine Spieländerung. +Der National-Schreibtisch erhält durch dieses Vereinspaket keine zusätzlichen +Vereinsmenüs. + +Private Belege mit tatsächlicher OBS, drei Themes, 720p/1080p, Nullfällen und +Kontextwechseln: `bmh_4k_ui/docs/qa/engine-reports-2026-10-28/`. Native Prüfung +Linux x64; Windows-/macOS-Ausführung wurde nicht durchgeführt. + +Die folgenden Beschreibungen gelten für die **getrennte Präsentationsdemo**. + ## Sichtbare Daten | Ansicht | Darstellung und Herkunft | diff --git a/docs/new_ui/integration/ENGINE_ENTRY.md b/docs/new_ui/integration/ENGINE_ENTRY.md index f62a258..0ba6793 100644 --- a/docs/new_ui/integration/ENGINE_ENTRY.md +++ b/docs/new_ui/integration/ENGINE_ENTRY.md @@ -275,3 +275,13 @@ Entscheidungen rekonstruiert. Vorhandene Wappen kommen über die stabile Vereins-ID aus der aktiven Welt. Das Speichern als neue OBS erhält die bereits aufgezeichneten Archivbytes und beide RNGs. Einzelheiten und private QA stehen im [Almanach-Menüdokument](../desktop/almanac/README.md). + +## Tabellen und Stärken · 28. Oktober 2026 + +`report-index` und `league-report {leagueId,filter}` liefern aktive Ligen, +Tabellenfilter und Kaderstärken für den vorhandenen Berichtspresenter. Die +Berechnung bleibt bei ComputeLeagueTable/TeamAverage. Reine Ansichtsänderungen +verändern keine Revision oder RNGs; erfolgreiche Sessionmutationen verwerfen +veraltete Berichts-/Kaderdaten. Vereins-/Spielerprofile verwenden `squad` für das +angefragte Team. Nicht projizierte Qualifikationsregeln werden nicht durch +Demo-Zonen ersetzt. [Details](../desktop/reports/README.md). diff --git a/src/modern/content/ui_contract.cpp b/src/modern/content/ui_contract.cpp index 998b177..f4a7c03 100644 --- a/src/modern/content/ui_contract.cpp +++ b/src/modern/content/ui_contract.cpp @@ -314,6 +314,61 @@ J squad_data(const ModernState& g, const UiContext& c, int team, const std::stri return O{{"kind", "squad"}, {"team", team_ref(g, team, today)}, {"players", std::move(players)}}; } +J report_league(const ModernState& g, int league, int own) { + const int first=league_first_team(league), count=kLeagueSizes[league]; + const World* world=current_world(); + const WorldClub* club=world?world->club(team_id(g,first)):nullptr; + A members; + for(int i=0;ination.empty()?J(club->nation):J(nullptr)}, + {"members",std::move(members)},{"clubCount",count},{"matchdays",league_matchdays(league)}, + {"played",size_t(league)=first&&own0; + if(!any)sort_table(table,0); // A not-yet-played half still has unique Source ranks. + A rows,strengths; + for(int i=0;i>(3*n)&7); + if(!code)break; + const int outcome=code&3;const char symbol=outcome==3?'S':outcome==2?'U':outcome==1?'N':'-'; + form.insert(form.begin(),symbol);form_points+=outcome==3?3:outcome==2?1:0; + } + const int games=table.games(i),wins=table.wins[size_t(i)],loss=table.defeats[size_t(i)]; + rows.push_back(O{{"team",team_ref(g,team,today)},{"original",i},{"rank",table.rank(i)+1},{"played",games},{"wins",wins}, + {"draw",std::max(0,games-wins-loss)},{"loss",loss},{"gf",int(table.goals_for[size_t(i)])},{"ga",int(table.goals_against[size_t(i)])}, + {"diff",int(table.goals_for[size_t(i)])-int(table.goals_against[size_t(i)])},{"points",int(table.points[size_t(i)])},{"form",form_points},{"form_text",form}}); + int positions[4]={}; + if(fields_players(g,team)) { + const auto range=squad_range(team); + for(size_t s=range.first;s(report_league(g,l,-1).value).at("id").string()==id){league=l;break;} + const auto* f=field(request,"filter");const auto* value=f?f->integer():nullptr; + if(league<0||!value||*value<0||*value>4)return failure(request_id,"invalid_report_request","Liga oder Tabellenfilter ist nicht verfügbar.",c.state_revision); + return snapshot(request_id,std::move(m),league_report_data(g,league,int(*value),today)); + } if (kind == "almanac") { const J* query = field(request, "query"); if (!query || !query->object()) diff --git a/src/modern/ui/demo_reports.cpp b/src/modern/ui/demo_reports.cpp index 9bf4673..3f97b70 100644 --- a/src/modern/ui/demo_reports.cpp +++ b/src/modern/ui/demo_reports.cpp @@ -336,6 +336,7 @@ std::string edit_demo_reports(Json &state, const Json &action, const Catalog &wo return "invalid_reports_action"; } } +Json sort_report_rows(std::vector rows,const Json &sort) { return sorted(std::move(rows),sort); } Json report_table_rows(const Catalog &world, const Json &state) { if (!valid_demo_reports(state, world)) return Json::array(); diff --git a/src/modern/ui/demo_reports.hpp b/src/modern/ui/demo_reports.hpp index 6d86ce7..279ee02 100644 --- a/src/modern/ui/demo_reports.hpp +++ b/src/modern/ui/demo_reports.hpp @@ -16,6 +16,7 @@ bool migrate_demo_reports(Json &, const Catalog &); std::string edit_demo_reports(Json &, const Json &action, const Catalog &); // Rows retain stable catalog club IDs. Numeric strength components are null when // the corresponding squad positions have no usable OBW strength information. +Json sort_report_rows(std::vector rows,const Json &sort); Json report_table_rows(const Catalog &, const Json &); Json report_strength_rows(const Catalog &, const Json &); // At most 16 clubs from the first German league, independent of report selection. diff --git a/src/modern/ui/engine_bridge.hpp b/src/modern/ui/engine_bridge.hpp index 23eb09f..0143d45 100644 --- a/src/modern/ui/engine_bridge.hpp +++ b/src/modern/ui/engine_bridge.hpp @@ -51,6 +51,10 @@ Json engine_friendly_command(const Json &bundle, const Json &read, const std::st std::string engine_almanac_key(const Json &query); Json engine_almanac_projection(const Json &bundle, const Json &read, const Json &query); +Json engine_report_index(const Json &bundle,const Json &read); +Json engine_report_projection(const Json &bundle,const Json &index,const Json &read,const std::string &league,int filter); +Json engine_report_squad(const Json &bundle,const Json &read,const std::string &team); + // Single-session facade. Its owner serializes all calls on a background worker. // No RmlUI objects or callbacks cross this boundary. class EngineBridge { diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index 922352c..1b37079 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -12,6 +12,7 @@ void App::engine_poll() { try { auto result = engine_job_.get(); validate_engine_desk(result.bundle); + if(result.response.value("messageType","")=="reports_preview"){engine_reports_poll(result);refresh();return;} if(result.response.value("messageType","")=="almanac_preview"){engine_almanac_poll(result);refresh();return;} if (result.response.value("messageType", "") == "friendly_preview") { const auto &read = result.response.at("read"); @@ -53,6 +54,7 @@ void App::engine_poll() { } else engine_notice_ = "Spielstand geladen · Weitere Menüs werden schrittweise angebunden."; if (engine_response_.value("messageType", "") == "command_result") { advertising_selected_ = -1; advertising_offer_ = 0; } engine_credit_ = engine_data_.value("credit", Json()); engine_credit_edits_ = Json::array(); + engine_reports_sync(); engine_almanac_sync(); engine_ticket_bind(); engine_contracts_poll(); @@ -134,8 +136,9 @@ void App::engine_event(Rml::Event &event) { if (!engine_busy_ && bank_event(event)) return; 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() && engine_friendly_event(event)) return; - if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac") && report_picker_event(event)) return; + if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths") && 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()) @@ -205,9 +208,10 @@ 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 (engine_reports_action(action,node)) return; if (almanac_action(action,node)) return; if (engine_friendly_action(action, node)) return; - if ((menu_ == "friendlies" || menu_ == "almanac") && report_picker_action(action,node)) return; + if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths") && 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; @@ -221,6 +225,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=="tables"||id=="strengths")){menu_=id;engine_reports_sync();engine_reports_load(engine_reports_state_.at("league"),engine_reports_state_.at("filter"));} else if (action == "engine-open" && id == "almanac") { menu_=id;engine_almanac_sync();engine_almanac_load({{"kind","index"}}); } else if (action == "engine-open" && id == "friendlies") { menu_ = id; planning_dialog_.clear(); engine_friendly_sync(); refresh(); } else if (action == "engine-open" && (id == "calendar" || id == "postpone")) { menu_ = id; engine_move_id_.clear(); engine_calendar_sync(); refresh(); } @@ -246,5 +251,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_}, {"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_}, {"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_}}; } diff --git a/src/modern/ui/engine_dto.cpp b/src/modern/ui/engine_dto.cpp index 6557a89..c21994c 100644 --- a/src/modern/ui/engine_dto.cpp +++ b/src/modern/ui/engine_dto.cpp @@ -771,4 +771,52 @@ Json engine_almanac_projection(const Json &bundle,const Json &read,const Json &q } else {record(result.at("match"));require(result.at("match").at("id")==query.at("id"),"Archivantwort gehört einer anderen Partie.");} return result; } +Json engine_report_index(const Json &bundle,const Json &read) { + validate_engine_desk(bundle);auto context=bundle;context["report-index"]=read; + const auto &data=lineup_read(context,"report-index");require(data.at("leagues").is_array()&&!data.at("leagues").empty(),"Keine aktiven Ligen verfügbar."); + std::set ids,teams; + for(const auto &l:data.at("leagues")) { + const auto id=l.at("id").get();require(!id.empty()&&ids.insert(id).second,"Doppelte oder fehlende Liga-ID."); + require(l.at("name").is_string()&&l.at("own").is_boolean()&&(l.at("nationId").is_null()||l.at("nationId").is_string()),"Ligabeschreibung fehlt."); + const int count=whole_in_range(l.at("clubCount"),2,20);const int rounds=whole_in_range(l.at("matchdays"),1,400);(void)whole_in_range(l.at("played"),0,rounds); + require(l.at("members").is_array()&&l.at("members").size()==size_t(count),"Unvollständige Ligateilnehmer."); + for(const auto &t:l.at("members")){const auto team=t.get();require(!team.empty()&&teams.insert(team).second,"Doppelter Ligateilnehmer.");} + } + return data; +} +Json engine_report_projection(const Json &bundle,const Json &index,const Json &read,const std::string &league,int filter) { + const auto leagues=engine_report_index(bundle,index);auto context=bundle;context["league-report"]=read;const auto &data=lineup_read(context,"league-report"); + require(filter>=0&&filter<=4&&data.at("leagueId")==league&&data.at("filter")==filter,"Bericht gehört einer anderen Liga oder Auswahl."); + const Json *l=nullptr;for(const auto &v:leagues.at("leagues"))if(v.at("id")==league)l=&v;require(l,"Liga gehört nicht zum aktiven Spiel."); + std::set expected;for(const auto &id:l->at("members"))expected.insert(id.get()); + Json result=data;result["league"]=*l; + for(const auto *kind:{"table","strengths"}) { + const auto &rows=data.at(kind);require(rows.is_array()&&rows.size()==expected.size(),"Unvollständiger Ligabericht.");std::set seen;std::set ranks; + for(auto &row:result[kind]) { + const auto id=row.at("team").at("id").get();require(expected.contains(id)&&seen.insert(id).second&&row.at("team").at("name").is_string(),"Fremder oder doppelter Berichtsverein.");row["club"]=id;row["name"]=row.at("team").at("name"); + (void)whole_in_range(row.at("original"),0,int(expected.size())-1); + if(std::string_view(kind)=="table") { + const int rank=whole_in_range(row.at("rank"),1,int(expected.size()));require(ranks.insert(rank).second,"Doppelter Tabellenplatz."); + for(const auto *k:{"played","wins","draw","loss","gf","ga","points","form"})(void)whole_in_range(row.at(k),0,100000); + (void)whole_in_range(row.at("diff"),-100000,100000); + require(row.at("played").get()==row.at("wins").get()+row.at("draw").get()+row.at("loss").get(),"Inkonsistente Spielanzahl."); + require(row.at("form_text").is_string()&&row.at("form_text").get().size()<=8,"Ungültige Formserie."); + for(char c:row.at("form_text").get())require(std::string_view("SUN-").find(c)!=std::string_view::npos,"Unbekanntes Formergebnis."); + } else { + require(row.at("basis")=="squad","Unbekannte Stärkebasis."); + for(const auto *k:{"keeper","defence","midfield","attack","strength"})if(!row.at(k).is_null())(void)whole_in_range(row.at(k),0,100000); + } + } + } + require(data.at("zones").is_null(),"Unbekannte Qualifikationsprojektion.");return result; +} +Json engine_report_squad(const Json &bundle,const Json &read,const std::string &team) { + validate_engine_desk(bundle);auto context=bundle;context["squad"]=read;const auto &data=lineup_read(context,"squad"); + require(data.at("team").at("id")==team&&data.at("players").is_array(),"Kader gehört einem anderen Verein.");std::set ids; + for(const auto &r:data.at("players")) { + const auto id=r.at("player").at("id").get();require(!id.empty()&&ids.insert(id).second&&r.at("squadTeamId")==team,"Doppelter oder fremder Kaderspieler."); + require(r.at("player").at("name").is_string()&&r.at("player").at("positions").is_array(),"Spieleridentität fehlt."); + } + auto result=data;for(auto &r:result["players"])r["live_strength"]=metric_value(r,"strength");return result; +} } // namespace bmh::modern_ui diff --git a/src/modern/ui/engine_reports.inc b/src/modern/ui/engine_reports.inc new file mode 100644 index 0000000..a1d9634 --- /dev/null +++ b/src/modern/ui/engine_reports.inc @@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-3.0-only +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"]=""; + 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(); + report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear(); +} +void App::engine_reports_load(const std::string &preferred,int filter) { + if(engine_busy_||!engine_fresh_)return; + if(engine_reports_read_.is_object()&&engine_reports_state_.at("league")==preferred&&engine_reports_state_.at("filter")==filter){refresh();return;} + auto link=engine_link_; + engine_start("Ligabericht wird geladen …",[link,preferred,filter] { + const auto bundle=link->snapshot(),index=link->read({{"kind","report-index"}}); + const auto data=engine_report_index(bundle,index);std::string league; + for(const auto &l:data.at("leagues"))if(l.at("id")==preferred)league=preferred; + if(league.empty())for(const auto &l:data.at("leagues"))if(l.at("own")==true){league=l.at("id");break;} + if(league.empty())league=data.at("leagues")[0].at("id"); + const auto read=link->read({{"kind","league-report"},{"leagueId",league},{"filter",filter}}); + return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","league"},{"index",index},{"read",read},{"league",league},{"filter",filter}},nullptr}; + }); +} +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(read.value("messageType","")=="error"){engine_notice_=engine_text(read.value("message",Json()));return;} + if(r.at("kind")=="league") { + auto value=engine_report_projection(reply.bundle,r.at("index"),read,r.at("league"),r.at("filter")); + engine_reports_value_=std::move(value);engine_reports_index_=r.at("index");engine_reports_read_=read; + engine_reports_state_["league"]=r.at("league");engine_reports_state_["filter"]=r.at("filter"); + } else { + engine_reports_roster_value_=engine_report_squad(reply.bundle,read,r.at("team"));engine_reports_roster_=read; + if(report_detail_kind_=="roster"&&report_detail_club_==r.at("team").get())focus_after_render_=engine_reports_roster_value_.at("players").empty()?"report-detail-close":"report-detail-player-0"; + } + engine_notice_="Ligabericht geladen."; +} +Json App::engine_reports_rows(const std::string &mode) const { + std::vector rows; + for(const auto &r:engine_reports_value_.at(mode=="tables"?"table":"strengths"))rows.push_back(r); + 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(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> App::engine_reports_picker_items(const std::string &kind) const { + std::vector> 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 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():"__other__"; + for(const auto &l:leagues) { + const auto n=l.at("nationId").is_string()?l.at("nationId").get():"__other__"; + if(kind=="country"&&seen.insert(n).second)out.emplace_back(n,n=="__other__"?"Weitere Ligen":world_->nation_name(n)); + if(kind=="league"&&n==nation)out.emplace_back(l.at("id"),engine_text(l.at("name"))); + } + if(kind=="country"){ + const std::array order{"Deutschland","Spanien","Italien","Frankreich","England"}; + std::stable_sort(out.begin(),out.end(),[&](const auto &a,const auto &b){return std::find(order.begin(),order.end(),a.second)GetAttribute("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(engine_busy_||!engine_fresh_)return action.starts_with("report-")||action=="club-detail"||action=="player-detail"; + if(action=="report-sort") { + const std::set table{"rank","played","wins","draw","loss","form","points","gf","diff"},strength{"club","keeper","defence","midfield","attack","strength"}; + if(!(menu_=="tables"?table:strength).contains(id))return true; + auto &sort=engine_reports_state_["sorts"][menu_];const bool desc=sort.at("key")==id?!sort.at("desc").get():id!="rank"&&id!="club";sort={{"key",id},{"desc",desc}};focus_after_render_=target->GetId();refresh();return true; + } + if(action=="report-reset") {engine_reports_state_["sorts"]["tables"]={{"key","rank"},{"desc",false}};engine_reports_load(engine_reports_state_.at("league"),0);return true;} + if(action=="club-detail") { + if(engine_report_team(id).is_null())return true; + 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") { + 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(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; + } + return false; +} +bool App::engine_reports_event(Rml::Event &event) { + if((menu_!="tables"&&menu_!="strengths")||report_detail_kind_.empty())return false; + const auto type=event.GetType(); + if(type=="keydown"&&event.GetParameter("key_identifier",0)==Rml::Input::KI_ESCAPE){engine_reports_action("report-detail-close",nullptr);event.StopImmediatePropagation();return true;} + if(type=="keydown"&&event.GetParameter("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("shift_key",0)?-1:1))%n)];next->Focus(true);next->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));}event.StopImmediatePropagation();return true;} + bool inside=false;for(auto *n=event.GetTargetElement();n&&n!=doc_;n=n->GetParentNode())if(n->GetId()=="report-detail-dialog")inside=true; + if(!inside){event.StopImmediatePropagation();return true;}return false; +} +std::string App::engine_reports_detail() { + if(report_detail_kind_.empty())return {}; + 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; + if(report_detail_kind_=="club") { + std::string strength="—",manager="Computer"; + for(const auto &r:engine_reports_value_.at("strengths"))if(r.at("club")==report_detail_club_)strength=report_number(r.at("strength")); + for(const auto &m:engine_data_.at("session").at("data").at("managers"))if(m.at("teamId")==report_detail_club_&&m.at("status")=="active")manager=engine_text(m.at("name")); + std::string stadium_name="—",places="—";const auto *club=world_->find("clubs",report_detail_club_);const Json *stadium=nullptr; + if(club&&club->value("stadium",Json()).is_string())stadium=world_->find("stadiums",club->at("stadium")); + if(!stadium)for(const auto &candidate:world_->rows("stadiums"))if(candidate.value("owner",Json())==report_detail_club_){stadium=&candidate;break;} + if(stadium)stadium_name=world_->name(*stadium); + const auto &live_stadium=engine_data_.at("stadium"); + if(live_stadium.value("messageType","")=="snapshot"&&live_stadium.at("data").at("teamId")==report_detail_club_) {int64_t sum=0;for(const auto &block:live_stadium.at("data").at("blocks"))sum+=block.at("places").get();places=number(sum);} + body="
"+crest(world_->find("clubs",report_detail_club_),192)+"

Vereinsprofil

"+report_detail_fields({{"Stadion",stadium_name},{"Plätze",places},{"Stärke",strength},{"Manager",manager}},72); + actions=btn("report-club-roster","Spieler","report-detail-action","id=\"report-detail-roster\"")+close; + } else if(report_detail_kind_=="roster") { + title+=" · Kader";body="
"; + for(const auto *h:{"Spieler","Pos.","Stärke","Alter"})body+="
"+std::string(h)+"
"; + body+="
"; + if(!engine_reports_roster_value_.is_object())body+="

"+esc(engine_busy_?"Kader wird geladen …":"Kader derzeit nicht verfügbar.")+"

"; + else {size_t n=0;for(const auto &r:engine_reports_roster_value_.at("players")){const auto i=n++;body+="
"+btn("player-detail",esc(engine_text(r.at("player").at("name"))),"report-detail-player-link","id=\"report-detail-player-"+std::to_string(i)+"\" data-id=\""+esc(r.at("player").at("id").get())+"\"")+"
"+esc(report_detail_position(r.at("player")))+"
"+report_number(r.at("live_strength"))+"
"+report_number(r.at("age"))+"
";}} + body+="
"; + } else { + const Json *row=nullptr;if(engine_reports_roster_value_.is_object())for(const auto &r:engine_reports_roster_value_.at("players"))if(r.at("player").at("id")==report_detail_player_)row=&r;if(!row)return {}; + const auto &p=row->at("player");title=engine_text(p.at("name"));auto photo=p.at("photoAssetId").is_string()?p.at("photoAssetId").get():"asset:player/"+(report_detail_player_.starts_with("player:")?report_detail_player_.substr(7):report_detail_player_)+"/photo"; + actions=btn("report-detail-close","Schließen","report-detail-action","id=\"report-detail-close\""); + std::string term="—";if(row->at("contractRemaining").is_object())term=number(row->at("contractRemaining").at("value"))+" Monate"; + body="
"+img(photo,496,662.667,true,true,1024)+"

Porträt

"+report_detail_fields({{"Position",report_detail_position(p)},{"Alter",row->at("age").is_number_integer()?report_number(row->at("age"))+" Jahre":"—"},{"Stärke",report_number(row->at("live_strength"))},{"Verein",engine_text(team.at("name"))},{"Vertrag",term}},73); + } + return "

"+esc(title)+"

"+body+"
"; +} diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc index c433dd4..3850b3c 100644 --- a/src/modern/ui/engine_screens.inc +++ b/src/modern/ui/engine_screens.inc @@ -113,11 +113,12 @@ 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 == "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")&&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 += ""; + if(menu_=="tables"||menu_=="strengths")out+="
"+window(menu_=="tables"?"Tabelle":"Stärken",engine_reports_read_.is_object()?render_reports(menu_):"
"+esc(engine_busy_?"Ligabericht wird geladen …":engine_notice_)+"
")+"
"; if(menu_=="almanac") out+="
"+window("Almanach",engine_almanac_cache_.contains("index")?render_almanac():"
"+esc(engine_busy_?"Spielarchiv wird geladen …":engine_notice_)+"
")+"
"; if (menu_ == "friendlies") out += "
" + window("Freundschaftsspiel", friendlies_available ? render_friendlies() : "
Freundschaftsplanung ist derzeit nicht verfügbar.
") + "
"; if (menu_ == "calendar") out += "
" + window("Kalender", calendar_available ? render_calendar() : "
Der Saisonkalender ist derzeit nicht verfügbar.
") + "
"; @@ -131,7 +132,7 @@ void App::engine_render() { if (menu_ == "lineup") out += "
" + window("Aufstellung", render_lineup()) + "
"; if (menu_ == "camp") out += "
" + window("Trainingslager", render_camp()) + "
"; } - if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies" || menu_ == "almanac") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; + if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; if (menu_.empty() || engine_data_.empty()) out += "
" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "
"; element("canvas")->SetInnerRML(out); ++document_generation_; scale_chalk_shadow(); @@ -154,6 +155,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")){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 (engine_busy_) { Rml::ElementList controls; doc_->QuerySelectorAll(controls, "#canvas button,#canvas input"); for (auto *node : controls) node->SetAttribute("disabled", true); diff --git a/src/modern/ui/engine_state.inc b/src/modern/ui/engine_state.inc index fba4297..43c613a 100644 --- a/src/modern/ui/engine_state.inc +++ b/src/modern/ui/engine_state.inc @@ -11,6 +11,17 @@ void engine_contracts_poll(); void engine_contracts_clear(bool focus = true); void engine_contracts_close(bool focus = true); + 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}}}}}}; + void engine_reports_sync(); + void engine_reports_load(const std::string &,int); + void engine_reports_poll(const EngineReply &); + Json engine_reports_rows(const std::string &) const; + Json engine_report_team(const std::string &) const; + std::vector> engine_reports_picker_items(const std::string &) const; + bool engine_reports_action(const std::string &,Rml::Element *); + bool engine_reports_event(Rml::Event &); + std::string engine_reports_detail(); Json engine_almanac_context_, engine_almanac_cache_ = Json::object(); void engine_almanac_sync(); void engine_almanac_load(const Json &); diff --git a/src/modern/ui/report_details.inc b/src/modern/ui/report_details.inc index 71325c1..410a40d 100644 --- a/src/modern/ui/report_details.inc +++ b/src/modern/ui/report_details.inc @@ -106,6 +106,7 @@ std::string report_detail_fields( std::string App::render_report_detail() { if (report_detail_kind_.empty() || !world_) return {}; + if(engine_mode_)return engine_reports_detail(); const auto snapshot = snap(); const auto current_date = snapshot.state.value("date", Json()); const auto *club = world_->find("clubs", report_detail_club_); diff --git a/src/modern/ui/report_pickers.inc b/src/modern/ui/report_pickers.inc index cc04d3b..6dbf077 100644 --- a/src/modern/ui/report_pickers.inc +++ b/src/modern/ui/report_pickers.inc @@ -16,6 +16,7 @@ App::report_picker_items(const std::string &kind) const { std::vector> items; if (!world_ || !report_picker_kind(kind)) return items; + if (engine_mode_ && (menu_=="tables"||menu_=="strengths")) return engine_reports_picker_items(kind); if (engine_mode_ && menu_ == "friendlies") return engine_friendly_picker_items(kind); if (menu_ == "statistics") return statistics_picker_items(kind); @@ -74,6 +75,7 @@ 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_=="tables"||menu_=="strengths")){if(kind=="filter")return std::to_string(engine_reports_state_.at("filter").get());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():"__other__";return {}; } if (menu_ == "statistics") return statistics_picker_value(kind); if (kind == "year") return std::to_string(almanac_year_); @@ -214,7 +216,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_ == "friendlies") { + if(engine_mode_&&(menu_=="tables"||menu_=="strengths")){ + std::string league=engine_reports_state_.at("league");int filter=engine_reports_state_.at("filter"); + if(kind=="league")league=value; + else if(kind=="filter")filter=std::stoi(value); + else if(kind=="country"){const auto index=engine_report_index(engine_data_,engine_reports_index_);for(const auto &l:index.at("leagues"))if((l.at("nationId").is_string()?l.at("nationId").get():"__other__")==value){league=l.at("id");break;}} + engine_reports_load(league,filter); + } else if (engine_mode_ && menu_ == "friendlies") { engine_friendly_filter(kind, value); } else if (menu_ == "statistics") { statistics_picker_select(kind, value); diff --git a/src/modern/ui/reports_screens.inc b/src/modern/ui/reports_screens.inc index ef5d5bf..357f49f 100644 --- a/src/modern/ui/reports_screens.inc +++ b/src/modern/ui/reports_screens.inc @@ -20,26 +20,27 @@ std::string report_zone(int rank, int count, int tier) { std::string App::report_club_button(const std::string &id, bool name_first) { const auto *c = world_->find("clubs", id); - if (!c) + const auto live=engine_mode_?engine_report_team(id):Json(); + if ((engine_mode_&&live.is_null())||(!engine_mode_&&!c)) return "—"; - const auto name = esc(world_->name(*c)); + const auto name = esc(engine_mode_?live.at("name").get():world_->name(*c)); const auto text = "" + name + ""; return btn("club-detail", name_first ? text + crest(c, 42) : crest(c, 42) + text, std::string("report-club-button ") + (name_first ? "name-first " : "") + - (snap().state.at("career").value("role","club")=="club"&&manager(snap()).value("club", "") == id ? "current" : ""), + ((engine_mode_?engine_data_.at("desktop").at("meta").at("scope").at("teamId")==id:snap().state.at("career").value("role","club")=="club"&&manager(snap()).value("club", "") == id) ? "current" : ""), "id=\"report-club-" + esc(id) + "\" data-id=\"" + esc(id) + "\""); } std::string App::render_reports(const std::string &mode) { - const auto snapshot = snap(); - const auto &state = snapshot.state.at("reports"); + const auto snapshot = engine_mode_?Snapshot{}:snap(); + const auto state = engine_mode_?engine_reports_state_:snapshot.state.at("reports"); const auto *league = world_->find("competitions", state.value("league", "")); const int tier = league ? league->value("tier", 1) : 1; const bool strengths = mode == "strengths", matches = mode == "league" || mode == "other"; const bool opening = mode == "other" && state.value("competition", 0) == 3 && snapshot.state.value("opening_created", false); - const auto rows = matches ? (opening ? report_opening_pairs(*world_, snapshot.state.at("opening_flow")) + const auto rows = engine_mode_?engine_reports_rows(mode):matches ? (opening ? report_opening_pairs(*world_, snapshot.state.at("opening_flow")) : report_match_rows(*world_, state, mode == "other")) : strengths ? report_strength_rows(*world_, state) : report_table_rows(*world_, state); @@ -126,7 +127,7 @@ std::string App::render_reports(const std::string &mode) { body += report_club_button(row.at(column == 0 ? "home" : "away").get(), column == 0); else if (!matches && column == 0) { if (!strengths) { - const auto zone = report_zone(row.value("rank", 0), int(rows.size()), tier); + const auto zone = engine_mode_?std::string():report_zone(row.value("rank", 0), int(rows.size()), tier); body += "" + std::to_string(row.value("rank", 0)) + "."; } @@ -149,7 +150,7 @@ std::string App::render_reports(const std::string &mode) { body += ""; } body += ""; - if (!matches && !strengths) { + if (!matches && !strengths && !engine_mode_) { const auto legend = tier == 1 ? std::vector>{ {"champions", "Champions League"}, {"europa", "Europa League"}, diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp index 313e27c..d5d4c7f 100644 --- a/src/modern/ui/view.cpp +++ b/src/modern/ui/view.cpp @@ -1531,6 +1531,7 @@ public: #include "modern/ui/engine_calendar.inc" #include "modern/ui/engine_friendlies.inc" #include "modern/ui/engine_almanac.inc" +#include "modern/ui/engine_reports.inc" } // namespace bool is_modern_world(const fs::path &file) { try { diff --git a/tests/modern_engine_bridge_probe.cpp b/tests/modern_engine_bridge_probe.cpp index 138f3c9..21802ee 100644 --- a/tests/modern_engine_bridge_probe.cpp +++ b/tests/modern_engine_bridge_probe.cpp @@ -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 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"}; + const std::set 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"}; if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe "); 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)); }; @@ -313,6 +313,30 @@ int main(int argc, char **argv) { write("saved.json",link->save_copy(out/"reads.obs"));link.reset();link=EngineBridge::open(world,out/"reads.obs");const auto loaded=link->snapshot();write("loaded.json",loaded); if(loaded.at("desktop").at("data")!=before.at("desktop").at("data")||link->read({{"kind","almanac"},{"query",{{"kind","index"}}}}).at("data")!=index_read.at("data"))throw std::runtime_error("archive or desk changed across OBS restart"); } + if(mode=="verify-reports") { + const auto index_read=link->read({{"kind","report-index"}}),index=engine_report_index(before,index_read);write("report-index.json",index_read); + Json all=Json::array(); + for(const auto &league:index.at("leagues")) { + const auto id=league.at("id").get();std::vector views; + for(int filter=0;filter<5;++filter) { + const Json request={{"kind","league-report"},{"leagueId",id},{"filter",filter}};const auto read=link->read(request);const auto value=engine_report_projection(before,index_read,read,id,filter); + if(link->read(request)!=read)throw std::runtime_error("report read not repeatable"); + views.push_back(value);all.push_back(read); + } + for(int f=1;f<5;++f)if(views[size_t(f)].at("strengths")!=views[0].at("strengths"))throw std::runtime_error("table filter changed squad strengths"); + for(const auto &r:views[0].at("table"))for(const auto *k:{"played","wins","draw","loss","gf","ga"}) { + const auto n=r.at(k).get();int venue=0,halves=0; + for(const auto &q:views[3].at("table"))if(q.at("club")==r.at("club"))venue+=q.at(k).get();for(const auto &q:views[4].at("table"))if(q.at("club")==r.at("club"))venue+=q.at(k).get(); + for(const auto &q:views[1].at("table"))if(q.at("club")==r.at("club"))halves+=q.at(k).get();for(const auto &q:views[2].at("table"))if(q.at("club")==r.at("club"))halves+=q.at(k).get(); + if(n!=venue||n!=halves)throw std::runtime_error("table subsets do not sum to total"); + } + const auto team=league.at("members")[0].get();const auto squad=link->read({{"kind","squad"},{"teamId",team}});(void)engine_report_squad(before,squad,team);write(("squad-"+std::to_string(all.size()/5)+".json").c_str(),squad); + } + write("reports.json",all); + if(link->snapshot()!=before)throw std::runtime_error("report reads changed engine"); + 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"); + } std::cout << "engine bridge " << argv[1] << " passed\n"; return 0; } catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; } } diff --git a/tests/modern_engine_dto_tests.cpp b/tests/modern_engine_dto_tests.cpp index 3bdb15c..1d67696 100644 --- a/tests/modern_engine_dto_tests.cpp +++ b/tests/modern_engine_dto_tests.cpp @@ -355,6 +355,23 @@ int main() { rejects([&]{engine_almanac_key({{"kind","calendar"},{"year",2026.5}});}); rejects([&]{engine_almanac_key({{"kind","day"},{"date","2026-02-30"}});}); rejects([&]{engine_almanac_key({{"kind","match"},{"id",""}});}); + auto report_bundle=fixture(); + const auto report_wrap=[&](const char*,const Json &data){return Json{{"messageType","snapshot"},{"meta",report_bundle.at("desktop").at("meta")},{"data",data}};}; + const Json report_index_data={{"kind","report-index"},{"leagues",{{{"id","league:live"},{"name","Live League"},{"nationId","nation:test"},{"members",{"club:6","club:7"}},{"clubCount",2},{"matchdays",2},{"played",1},{"own",true}}}}}; + const auto report_index_read=report_wrap("report-index",report_index_data); + Json report_rows=Json::array(),strength_rows=Json::array(); + for(int n=0;n<2;++n){const auto id=n?"club:7":"club:6";Json team={{"id",id},{"name",n?"Live B":"Live A"}}; + report_rows.push_back({{"team",team},{"original",n},{"rank",n+1},{"played",1},{"wins",n?0:1},{"draw",0},{"loss",n?1:0},{"gf",n?0:2},{"ga",n?2:0},{"diff",n?-2:2},{"points",n?0:3},{"form",n?0:3},{"form_text",n?"N":"S"}}); + strength_rows.push_back({{"team",team},{"original",n},{"basis","squad"},{"keeper",nullptr},{"defence",71},{"midfield",72},{"attack",73},{"strength",72}}); + } + const Json report_data={{"kind","league-report"},{"leagueId","league:live"},{"filter",0},{"table",report_rows},{"strengths",strength_rows},{"zones",nullptr}}; + const auto report_read=report_wrap("league-report",report_data);const auto report_value=engine_report_projection(report_bundle,report_index_read,report_read,"league:live",0); + require(report_value.at("table")[0].at("name")=="Live A"&&report_value.at("strengths")[0].at("keeper").is_null(),"live report name/unknown position was fabricated"); + auto bad_report=report_read;bad_report["meta"]["careerId"]="other";rejects([&]{engine_report_projection(report_bundle,report_index_read,bad_report,"league:live",0);}); + bad_report=report_read;bad_report["data"]["table"][0]["team"]["id"]="club:other";rejects([&]{engine_report_projection(report_bundle,report_index_read,bad_report,"league:live",0);}); + bad_report=report_read;bad_report["data"]["table"][1]["rank"]=1;rejects([&]{engine_report_projection(report_bundle,report_index_read,bad_report,"league:live",0);}); + bad_report=report_read;bad_report["data"]["filter"]=3;rejects([&]{engine_report_projection(report_bundle,report_index_read,bad_report,"league:live",0);}); + auto bad_index=report_index_read;bad_index["data"]["leagues"][0]["members"][1]="club:6";rejects([&]{engine_report_index(report_bundle,bad_index);}); 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; } diff --git a/tests/modern_report_read_tests.cpp b/tests/modern_report_read_tests.cpp new file mode 100644 index 0000000..72b7c6a --- /dev/null +++ b/tests/modern_report_read_tests.cpp @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/content/ui_contract.hpp" +#include "modern/content/projections.hpp" +#include "modern/game/modern_state.hpp" +#include "game/schedule.hpp" +#include "game/table.hpp" +#include "fixture_tables.hpp" +#include +#include +#include +using namespace bmh; +namespace { +using J=cli::Json;using O=J::Object; +const J& at(const J& j,const char* key){return j.object()->at(key);} +void check(bool b,const char* message){if(!b)throw std::runtime_error(message);} +int integer(const J& j){return int(*j.integer());} +} +int main() try { + set_fixture_tables(bmh::test::authored_fixture_tables()); + modern::ModernState g;g.manager_teams={0};g.manager_records.resize(0xb0c);g.display_start_year=2026; + g.world_league_id.resize(kLeagueCount);g.world_league_name.resize(kLeagueCount); + g.world_club_id.resize(modern::league_clubs());g.world_club_name.resize(modern::league_clubs()); + for(int l=0;lsize()==size_t(kLeagueCount),"active leagues only"); + const auto all=read(0),home=read(3),away=read(4),second=read(2); + const auto &rows=*at(at(all,"data"),"table").array(); + const auto old=modern::query_projection(g,0,O{{"kind","table"},{"league","league:0"}}); + for(const auto &r:rows){ + const auto id=*at(at(r,"team"),"id").string(); + for(const auto &legacy:*at(old,"rows").array())if(*at(at(legacy,"club"),"id").string()==id) { + check(integer(at(r,"rank"))==integer(at(legacy,"rank"))&&integer(at(r,"points"))==integer(at(legacy,"points"))&&integer(at(r,"gf"))==integer(at(legacy,"goals_for")),"unfiltered report matches existing engine table"); + } + for(const auto *key:{"played","wins","draw","loss","gf","ga"}) { + int venue=0; + for(const auto *part:{&home,&away})for(const auto &p:*at(at(*part,"data"),"table").array())if(*at(at(p,"team"),"id").string()==id)venue+=integer(at(p,key)); + check(venue==integer(at(r,key)),"home and away subsets sum to total"); + } + } + std::vector ranks; + for(const auto &r:*at(at(second,"data"),"table").array()){check(integer(at(r,"played"))==0,"unplayed second half has no invented matches");ranks.push_back(integer(at(r,"rank")));} + std::sort(ranks.begin(),ranks.end());for(size_t i=0;i(at(r,"strength").value),"absent squads do not receive fake strength"); + const auto invalid=read(5);check(*at(invalid,"messageType").string()=="error","invalid filter rejected"); + const auto foreign=modern::ui_read(g,context,O{{"kind","report-index"},{"managerId","manager:not-active"}});check(*at(foreign,"code").string()=="manager_not_active","foreign manager rejected"); + std::cout<<"report subsets, empty halves, engine parity and scope passed\n";return 0; +} catch(const std::exception& e){std::cerr<