Connect native indoor standings to real season points and extend CI coverage (by Codex)
This commit is contained in:
1 parent
d30e83c0a5
commit
0842cb3458
19 files changed
+296
-20
No files matched your search
@@ -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_career_files_tests modern_statistics_projection_tests modern_toto_projection_tests modern_toto_quote_tests modern_stadium_ui_tests modern_stadium_projection_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
|
||||
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_toto_projection_tests modern_toto_quote_tests modern_stadium_ui_tests modern_stadium_projection_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 modern_transfer_read_tests modern_transfer_projection_tests modern_achievements_projection_tests modern_news_projection_tests modern_balance_projection_tests modern_widgets_projection_tests modern_indoor_projection_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
|
||||
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_|career_files_|statistics_projection_|toto_projection_|toto_quote_|stadium_projection_|transfer_projection_|transfer_read_|achievements_projection_|news_projection_|balance_projection_|widgets_projection_|indoor_projection_|other_read_|winners_read_|manager_presentation_|coach_identity_)" -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
|
||||
|
||||
@@ -4,3 +4,10 @@
|
||||
.indoor-list .report-cell {width:22%;}
|
||||
.indoor-list .report-cell.first {width:78%;}
|
||||
.indoor-info {display:flex;align-items:center;justify-content:center;left:0;right:0;width:100%;}
|
||||
|
||||
.indoor-empty {padding:100dp 40dp;text-align:center;font-size:34dp;color:var(--muted);}
|
||||
|
||||
.indoor-value-info {position:absolute;left:52dp;right:52dp;top:124dp;bottom:130dp;display:flex;flex-direction:column;gap:12dp;}
|
||||
.indoor-value-info>p {display:block;font-size:32dp;line-height:1.3;margin:0;}
|
||||
.indoor-value-info>div {display:flex;justify-content:space-between;align-items:center;min-height:66dp;border-bottom:1dp var(--border);font-size:32dp;}
|
||||
.indoor-value-info>div>span,.indoor-value-info strong {display:block;font-weight:normal;}
|
||||
@@ -116,3 +116,5 @@ Aus der Welt: `nationId` und `crestAssetId` der Teams (`TeamRef`) und `photoAsse
|
||||
Nach der Übergabe (MVP_FOR_CLAUDE.md): A Schreibtisch (dieser Stand) → B Vorbereitung (Kader, Aufstellung, Taktik, Training, Lager) → C Geschäft (Bank, Stadion, Transfers, Verträge, Werbung) → D Live-Ticker → E Eingriff und Nachspiel → F Manager und Presse. Je Lieferung Read- und Command-Tests.
|
||||
|
||||
- `desktop-widgets`: reine Session-Desk-Projektion mit zehn optionalen Warnprädikaten, eigener Platz-/Stärkeangabe und optionalem bestätigtem Gegner. Fananzahl ist ausdrücklich kein Stimmungsprozent. Keine zusätzlichen Commands oder Persistenzfelder.
|
||||
|
||||
- `indoor-standings`: reiner Club-Read aus der vorhandenen Originalprojektion. `teamId`, `tournaments`, `rows[{rank, points, team:{id,name}}]` (16 beziehungsweise leer vor dem ersten Turnier), `footer`, `indoor`, `scoring: null | {value, places:[{rank,points}]}`. Die Wertung sind Punkte, keine Geldbeträge; Slot-/Spriteformatierung bleibt aus dem Transport. Keine Qualifikations- oder Ziehungsmutatoren, keine zusätzlichen Commands.
|
||||
@@ -65,3 +65,5 @@ Was die Modern-Engine der Oberfläche liefert und ab welcher Phase, steht in der
|
||||
und Stand der Engine in [new_engine](../new_engine/README.md).
|
||||
|
||||
- [Tatsächliche Desktop-Widgets](desktop/widgets/ENGINE.md): Statuslampen, Begegnung, Platz/Stärke und Posteingang.
|
||||
|
||||
- [Tatsächliche Hallentabellen](desktop/indoor/ENGINE.md): Original-Punkterangliste, Turnierwertung und Kaderabsprung.
|
||||
@@ -0,0 +1,12 @@
|
||||
<!-- SPDX-License-Identifier: GPL-3.0-only -->
|
||||
# Tatsächliche Hallentabellen · 29. Oktober 2026
|
||||
|
||||
Der native Engine-Einstieg verwendet den vorhandenen Gold-Presenter für die Hallen-Punkterangliste. Der reine Session-Read `indoor-standings` kapselt `ui::indoor_standings_from_game`: die ursprüngliche 40er-Sortierung erfolgt auf einer Kopie, ausgegeben werden die tatsächlich sichtbaren 16 Ränge. Es werden weder eine Masters-Qualifikation noch Ziehungen oder Saisonaktionen zum bloßen Anzeigen ausgeführt.
|
||||
|
||||
Der Read enthält den aktiven Verein im gemeinsamen Besitzer-/Revisionsumschlag, `tournaments`, `rows` mit Platz/Punkten/stabiler Teamreferenz, den tatsächlichen Footer und optional `scoring`. Vereinsnamen verwenden den aktuellen Welt-Datenstand; bei nicht zugeordneten Legacy-Referenzen bleibt der Originalname die Quelle. Bei null gewerteten Turnieren bleibt die Liste leer. Nationaltrainer bekommen keinen Vereins-Hallenread.
|
||||
|
||||
`scoring` ist nur bei bestätigtem aktuellem Hallenkontext bekannt und enthält den ursprünglichen Turnierwert sowie die Platzpunkte für die vier Ränge. Dies sind **Wertungspunkte, keine Geldpreise**. Die Werte werden im Sessionadapter aus derselben Originaltabelle übernommen wie in der bestehenden Projektion. Die UI rechnet keine Punkteformel und zeigt keine alten Sprite-Schrift-Paddingzeichen an. Unbekannter aktueller Hallenwert wird nicht durch einen geratenen Preis ersetzt.
|
||||
|
||||
Die Darstellung erlaubt Sortierung nach tatsächlichem Platz und Punkten; bei Punktgleichheit bleibt die Originalreihenfolge stabil. Vereinsprofil, tatsächlicher Kader und Spielerinformationen verwenden dieselben vorhandenen Read-Dialoge wie die übrigen Tabellen. Reine Ansicht, Sortieren und Navigation verändern keine Sessionwerte. Die leere Saison erhält eine ausdrückliche Leeransicht statt Demo-Mannschaften.
|
||||
|
||||
OBW, OBS, Turnierstruktur und Spielregeln bleiben unverändert. Der separate HTML-/Demo-Presenter bleibt verfügbar. Die Seite ist eine tatsächliche Anbindung dieses Menüs und keine Behauptung über vollständige Unterstützung aller Hallen-/Matchsonderfälle.
|
||||
@@ -3,10 +3,10 @@
|
||||
|
||||
Dies ist eine Routenübersicht des nativen Engine-Einstiegs auf `0.3`, keine
|
||||
Fertigstellungsquote des gesamten Spiels. HTML-/Demo-Presenter sind getrennt
|
||||
von echten Karrierewerten. Stand einschließlich Transfermarkt, Erfolgsverlauf, Nachrichtenpostfach und Bilanz.
|
||||
von echten Karrierewerten. Stand einschließlich Transfermarkt, Erfolgsverlauf, Nachrichtenpostfach, Bilanz und Hallenansichten.
|
||||
|
||||
Von 32 Desktoprouten sind 27 an Sessiondaten bzw. tatsächliche Aktionen
|
||||
angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Vier weitere
|
||||
Von 32 Desktoprouten sind 28 an Sessiondaten bzw. tatsächliche Aktionen
|
||||
angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Drei weitere
|
||||
Routen besitzen ihre Präsentation, sind im echten Einstieg aber noch nicht
|
||||
freigeschaltet. Rollen-, Termin- und Angebotssperren können auch eine angebundene
|
||||
Route vorübergehend deaktivieren; insbesondere hat der Nationaltrainer weniger
|
||||
@@ -25,6 +25,7 @@ Vereinsmenüs.
|
||||
| Transfermarkt | Tatsächliche Kader-/Marktwerte und Gebote, lokale Suche, bestätigte Listung und Kauf-/Leihangebote | Abwerben, Entfernen und Zurücknehmen sind sichtbar gesperrt; ursprüngliche Prämienstufen bleiben erhalten |
|
||||
| Erfolge | Tatsächliche Manager-Saisonaufzeichnungen, Ligafarben aus Weltregeln, aktueller Zwischenstand und Karriereverlauf | Keine fiktiven Vorjahre oder erfundene historische Vereinszuordnung; Nationaltrainer gesperrt |
|
||||
| Nachrichten | Tatsächliche Postfachtexte, bestätigte Leser-/Ordneraktionen, Wiederherstellung und aus Engine-Fakten gerenderte Berichte | Presseberichte bleiben bis zu ihrer eigenen Zustandsanbindung schreibgeschützt; Nationalrechte werden beachtet |
|
||||
| Hallentabellen | Tatsächliche 16er-Punkterangliste, Turnierzahl, Punktewertung, Sortierung und Kader-/Spielerabsprung | Original-40er-Sortierung; leere Saison bleibt leer, Nationaltrainer gesperrt |
|
||||
| Bilanz | Gebuchte 18 Posten, Abschreibung, echte Zwölfmonatsprognose, bestätigte Planung und OBS-Rundreise | Gold bietet Aktuell/Zukunft; der zusätzliche ursprüngliche Real-Read bleibt separat verfügbar |
|
||||
| Große Statistik | Vorhandene Almanachauswertungen, tatsächliche Transfer-/Analyticswerte | Titelchancen, fehlende Saisonfinanzen und nicht aufgezeichnete Turnierbereiche bleiben leer |
|
||||
| Almanach | Tatsächlich aufgezeichnete Spiele, Details und Ereignisse | Keine Rekonstruktion unbekannter historischer Werte |
|
||||
@@ -36,7 +37,6 @@ Vereinsmenüs.
|
||||
|
||||
| Route | Vorhandene Grundlage | Nächster Integrationsschritt |
|
||||
|---|---|---|
|
||||
| Hallentabellen | HTML-/RmlUI-Ansicht und Indoor-Presenter | Tatsächliche Turnierphase und Tabellen/Teilnehmer liefern |
|
||||
| Einstellungen im Karriere-Desktop | Gemeinsamer globaler/lokaler Einstellungsdialog | Spiel-/Automatikwerte und Plattformwirkung sauber anbinden; Hauptmenüpräferenzen sind separat vorhanden |
|
||||
| Highscore | Gemeinsamer Presenter und ursprüngliche Ranglistenprojektion | Tatsächlichen Ranglistenbesitzer und Speicherweg anbinden |
|
||||
| Manager | Präsentation für Hinzufügen, Aufgeben und spätere Vereinssuche; Sessionaktionen vorhanden | Join/Abgabe an aktuelle Menschen und Besitzwechsel binden |
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
#include "modern/content/toto_quote.hpp"
|
||||
#include "modern/content/transfer_market.hpp"
|
||||
#include "ui/achievements.hpp"
|
||||
#include "ui/indoor_standings.hpp"
|
||||
#include "modern/content/world_save.hpp"
|
||||
#include "modern/game/balance_plan.hpp"
|
||||
#include "modern/game/bank_credit.hpp"
|
||||
@@ -8984,6 +8985,39 @@ cli::Json ModernSession::ui_read(const cli::Json& request, uint64_t revision) co
|
||||
context.career_ended = career_complete();
|
||||
const std::string kind = ui_text(request, "kind"), request_id = ui_text(request, "requestId");
|
||||
const int manager = context.manager;
|
||||
if (kind == "indoor-standings") {
|
||||
if (manager < 0 || manager > 3 || size_t(manager) >= g_.manager_teams.size() ||
|
||||
g_.manager_teams[size_t(manager)] < 0 || g_.manager_teams[size_t(manager)] >= league_clubs())
|
||||
return modern::ui_error(request_id, "no_club", "Hallentabellen sind am Vereinsschreibtisch verfügbar.", revision, false);
|
||||
if (const auto 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);
|
||||
try {
|
||||
ui::DeskRequest owner;
|
||||
owner.kind = ui::DeskRequestKind::open_menu;
|
||||
owner.menu_kind = 9; owner.manager_slot = manager; owner.revision = revision;
|
||||
const auto view = ui::indoor_standings_from_game(g_, exe_, texts_, owner);
|
||||
A rows, awards;
|
||||
for (size_t i = 0; i < view.rows.size(); ++i) {
|
||||
const auto &row = view.rows[i];
|
||||
const auto id = modern::ui_team_id(g_, row.team);
|
||||
const auto *world = modern::current_world();
|
||||
const auto *club = world ? world->club(id) : nullptr;
|
||||
rows.push_back(O{{"rank", int(i + 1)}, {"points", int(row.points)},
|
||||
{"team", O{{"id", id}, {"name", club ? club->name : ui::original_to_utf8(row.name)}}}});
|
||||
}
|
||||
// These are ranking points, not money. Keep sprite-font padding out of the transport.
|
||||
if (view.indoor) for (int i = 0; i < 4; ++i)
|
||||
awards.push_back(O{{"rank", i + 1}, {"points", int(exe_.u8(::bmh::layout::IndoorStandings_FormatError_TextPointer + uint32_t(i))) * int(view.strength)}});
|
||||
return modern::ui_snapshot(g_, context, request_id, O{{"kind", "indoor-standings"},
|
||||
{"teamId", modern::ui_team_id(g_, g_.manager_teams[size_t(manager)])},
|
||||
{"tournaments", int(view.tournaments)}, {"rows", std::move(rows)},
|
||||
{"footer", ui::original_to_utf8(view.footer)}, {"indoor", view.indoor},
|
||||
{"scoring", view.indoor ? cli::Json(O{{"value", int(view.strength)}, {"places", std::move(awards)}}) : cli::Json(nullptr)}});
|
||||
} catch (const std::exception &e) {
|
||||
return modern::ui_error(request_id, "indoor_unavailable", e.what(), revision, false);
|
||||
}
|
||||
}
|
||||
if (kind == "desktop-widgets") {
|
||||
if (manager < 0 || size_t(manager) >= g_.manager_teams.size())
|
||||
return modern::ui_error(request_id, "no_manager", "Kein aktiver Manager.", revision, false);
|
||||
|
||||
@@ -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 engine_statistics.cpp engine_toto.cpp engine_stadium.cpp engine_transfer.cpp engine_achievements.cpp engine_news.cpp engine_balance.cpp engine_widgets.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 engine_toto.cpp engine_stadium.cpp engine_transfer.cpp engine_achievements.cpp engine_news.cpp engine_balance.cpp engine_widgets.cpp engine_indoor.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 statistics_projection toto_projection stadium_projection transfer_projection achievements_projection news_projection balance_projection widgets_projection)
|
||||
foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_projection news_projection balance_projection widgets_projection indoor_projection)
|
||||
add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp)
|
||||
target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core)
|
||||
if(MSVC)
|
||||
|
||||
@@ -17,7 +17,7 @@ Json from_engine(const cli::Json &v) { return Json::parse(cli::dump_json(v)); }
|
||||
namespace {
|
||||
Json session_snapshot(modern::app::ModernSession &session,uint64_t revision) {
|
||||
Json bundle=Json::object();
|
||||
for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements","news","balance","desktop-widgets"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
|
||||
for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements","news","balance","desktop-widgets","indoor-standings"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
|
||||
validate_engine_desk(bundle);const auto &season=bundle.at("desktop").at("meta").at("season");
|
||||
bundle["calendar"]=from_engine(session.ui_read(cli::Json::Object{{"kind","calendar"},{"from",season.at("startDate").get<std::string>()},{"until",season.at("endDate").get<std::string>()}},revision));
|
||||
bundle["scheduling"]=from_engine(session.ui_read(cli::Json::Object{{"kind","scheduling"}},revision));return bundle;
|
||||
|
||||
@@ -73,6 +73,7 @@ Json engine_toto_command(const Json &bundle,const Json "e,const std::string
|
||||
Json engine_statistics_projection(const Json &bundle,const Json &read);
|
||||
|
||||
Json engine_widgets_projection(const Json &bundle);
|
||||
Json engine_indoor_projection(const Json &bundle);
|
||||
Json engine_balance_projection(const Json &,const Json &);
|
||||
Json engine_balance_command(const Json &,const Json &,const std::string &);
|
||||
|
||||
|
||||
@@ -34,6 +34,7 @@ void App::engine_accept(EngineReply result) {
|
||||
engine_transfer_sync();
|
||||
engine_news_sync();
|
||||
engine_balance_sync();
|
||||
engine_indoor_sync();
|
||||
engine_contracts_poll();
|
||||
engine_calendar_sync();
|
||||
engine_friendly_sync();
|
||||
@@ -294,6 +295,7 @@ void App::engine_event(Rml::Event &event) {
|
||||
if(menu_=="achievements"&&career_report_action(action,node))return;
|
||||
if(menu_=="news"&&dispatch_news(action,node))return;
|
||||
if(menu_=="balance"&&engine_balance_action(action,node))return;
|
||||
if(menu_=="indoor"&&indoor_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" || menu_=="statistics") && report_picker_action(action,node)) return;
|
||||
@@ -310,6 +312,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=="indoor"){menu_=id;engine_reports_sync();refresh();}
|
||||
else if(action=="engine-open"&&id=="balance"){menu_=id;balance_future_=false;engine_balance_feedback_="Gebuchte Saisonwerte.";refresh();}
|
||||
else if(action=="engine-open"&&id=="news"){menu_=id;news_dialog_.clear();refresh();}
|
||||
else if(action=="engine-open"&&id=="achievements"){menu_=id;career_view_=Json::object();refresh();}
|
||||
@@ -348,5 +351,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_},
|
||||
{"balance_future",engine_balance_future_},{"balance_edits",engine_balance_edits_},{"balance_view_future",balance_future_},{"news_error",engine_news_error_},{"news_value",engine_news_value_},{"news_view",news_view_},{"news_undo",engine_news_undo_},{"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"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_}};
|
||||
{"indoor_value",engine_indoor_value_},{"balance_future",engine_balance_future_},{"balance_edits",engine_balance_edits_},{"balance_view_future",balance_future_},{"news_error",engine_news_error_},{"news_value",engine_news_value_},{"news_view",news_view_},{"news_undo",engine_news_undo_},{"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"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_}};
|
||||
}
|
||||
@@ -0,0 +1,77 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include <set>
|
||||
namespace bmh::modern_ui {
|
||||
namespace {
|
||||
void ensure(bool v, const char *message) {
|
||||
if (!v)
|
||||
throw editor::Error(message);
|
||||
}
|
||||
} // namespace
|
||||
Json engine_indoor_projection(const Json &bundle) {
|
||||
validate_engine_desk(bundle);
|
||||
const auto &read = bundle.at("indoor-standings");
|
||||
ensure(read.value("messageType", "") == "snapshot" &&
|
||||
read.at("data").value("kind", "") == "indoor-standings",
|
||||
"Hallentabellen sind hier nicht verfügbar.");
|
||||
const auto &meta = bundle.at("desktop").at("meta");
|
||||
for (auto *key : {"contractVersion", "careerId", "worldId", "worldRevision",
|
||||
"stateRevision", "scope"})
|
||||
ensure(read.at("meta").at(key) == meta.at(key),
|
||||
"Die Hallentabelle ist veraltet.");
|
||||
const auto &d = read.at("data");
|
||||
ensure(meta.at("scope").at("role") == "club" &&
|
||||
d.at("teamId") == meta.at("scope").at("teamId"),
|
||||
"Die Hallentabelle gehört einem anderen Verein.");
|
||||
ensure(d.at("tournaments").is_number_integer() && d.at("tournaments") >= 0 &&
|
||||
d.at("tournaments") <= 255 && d.at("rows").is_array() &&
|
||||
d.at("rows").size() == (d.at("tournaments") == 0 ? 0 : 16),
|
||||
"Unvollständige Hallenrangliste.");
|
||||
Json rows = Json::array();
|
||||
std::set<std::string> ids;
|
||||
std::set<int> ranks;
|
||||
for (const auto &row : d.at("rows")) {
|
||||
ensure(row.at("rank").is_number_integer() && row.at("rank") >= 1 &&
|
||||
row.at("rank") <= 16 &&
|
||||
ranks.insert(row.at("rank").get<int>()).second &&
|
||||
row.at("points").is_number_integer() && row.at("points") >= 0 &&
|
||||
row.at("points") <= 65535,
|
||||
"Ungültige Hallenpunkte oder Platzierung.");
|
||||
const auto &team = row.at("team");
|
||||
ensure(team.at("id").is_string() &&
|
||||
!team.at("id").get<std::string>().empty() &&
|
||||
ids.insert(team.at("id").get<std::string>()).second &&
|
||||
team.at("name").is_string(),
|
||||
"Fremde oder doppelte Hallenmannschaft.");
|
||||
rows.push_back({{"original", row.at("rank").get<int>() - 1},
|
||||
{"rank", row.at("rank")},
|
||||
{"points", row.at("points")},
|
||||
{"club", team.at("id")},
|
||||
{"team", team}});
|
||||
}
|
||||
ensure(d.at("footer").is_string() && d.at("indoor").is_boolean(),
|
||||
"Unvollständige Turnierinformation.");
|
||||
const auto &scoring = d.at("scoring");
|
||||
ensure(d.at("indoor") == scoring.is_object(),
|
||||
"Unvollständige Turnierwertung.");
|
||||
if (!scoring.is_null()) {
|
||||
ensure(scoring.at("value").is_number_integer() &&
|
||||
scoring.at("value") >= 0 && scoring.at("value") <= 255 &&
|
||||
scoring.at("places").is_array() &&
|
||||
scoring.at("places").size() == 4,
|
||||
"Ungültige Turnierwertung.");
|
||||
std::set<int> places;
|
||||
for (const auto &place : scoring.at("places"))
|
||||
ensure(place.at("rank").is_number_integer() && place.at("rank") >= 1 &&
|
||||
place.at("rank") <= 4 &&
|
||||
places.insert(place.at("rank").get<int>()).second &&
|
||||
place.at("points").is_number_integer() &&
|
||||
place.at("points") >= 0 && place.at("points") <= 65535,
|
||||
"Ungültige Platzpunkte.");
|
||||
}
|
||||
return {{"rows", rows},
|
||||
{"tournaments", d.at("tournaments")},
|
||||
{"footer", d.at("footer")},
|
||||
{"scoring", scoring}};
|
||||
}
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -0,0 +1,8 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
void App::engine_indoor_sync() {
|
||||
engine_indoor_value_ = Json();
|
||||
try {
|
||||
engine_indoor_value_ = engine_indoor_projection(engine_data_);
|
||||
} catch (const std::exception &) {
|
||||
} // Snapshot/role availability controls the route.
|
||||
}
|
||||
@@ -87,6 +87,7 @@ 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_=="indoor"&&engine_indoor_value_.is_object())for(const auto &row:engine_indoor_value_.at("rows"))if(row.at("club")==id)return row.at("team");
|
||||
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()) {
|
||||
@@ -116,7 +117,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"&&menu_!="statistics")return false;
|
||||
if(menu_!="indoor"&&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";
|
||||
@@ -124,7 +125,7 @@ bool App::engine_reports_action(const std::string &action,Rml::Element *target)
|
||||
if(action=="report-round"&&menu_=="league") {if(id!="1"&&id!="-1")return true;const int current=engine_fixtures_value_.at("round"),total=engine_fixtures_value_.at("rounds");const int next=std::clamp(current+std::stoi(id),1,total);focus_after_render_=target->GetId();engine_fixtures_load(engine_reports_state_.at("league"),next);return true;}
|
||||
if(action=="report-sort") {
|
||||
const std::set<std::string> 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;
|
||||
if(menu_=="indoor" ? (id!="rank"&&id!="points") : !(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<bool>():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;}
|
||||
@@ -148,7 +149,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"&&menu_!="statistics")||report_detail_kind_.empty())return false;
|
||||
if((menu_!="indoor"&&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;}
|
||||
@@ -157,6 +158,17 @@ bool App::engine_reports_event(Rml::Event &event) {
|
||||
}
|
||||
std::string App::engine_reports_detail() {
|
||||
if(report_detail_kind_.empty())return {};
|
||||
if(report_detail_kind_=="indoor-info"&&engine_indoor_value_.is_object()) {
|
||||
const auto &scoring=engine_indoor_value_.at("scoring");
|
||||
const auto footer=engine_indoor_value_.at("footer").get<std::string>();
|
||||
std::string body="<div class=\"indoor-value-info\"><p>"+esc(footer.empty()?"Noch kein Hallenturnier gewertet.":footer)+"</p>";
|
||||
if(scoring.is_object()) {
|
||||
body+="<p>Wertung des aktuellen Turniers: "+number(scoring.at("value"))+" Punkte</p>";
|
||||
for(const auto &place:scoring.at("places"))body+="<div><span>"+number(place.at("rank"))+". Platz</span><strong>"+number(place.at("points"))+" Punkte</strong></div>";
|
||||
}
|
||||
body+="</div>";
|
||||
return "<div class=\"report-detail-layer\"><section id=\"report-detail-dialog\" class=\"report-detail-card report-detail-indoor-info\" style=\"height:"+std::string(scoring.is_object()?"780":"332")+"dp;\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"report-detail-title\"><h2 id=\"report-detail-title\">Hallenwertung</h2>"+body+"<nav class=\"report-detail-actions\">"+btn("report-detail-close","Zurück","report-detail-action","id=\"report-detail-close\"")+"</nav></section></div>";
|
||||
}
|
||||
if(report_detail_kind_=="player"&&engine_rankings_player_.is_object())return engine_rankings_player_detail();
|
||||
const auto team=engine_report_team(report_detail_club_);if(team.is_null())return {};
|
||||
const auto close=btn("report-detail-close","Zurück","report-detail-action","id=\"report-detail-close\"");
|
||||
|
||||
@@ -131,7 +131,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=="balance"&&engine_fresh_&&engine_data_.at("balance").value("messageType","")=="snapshot") || (route=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (route=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (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());
|
||||
const bool supported = (route=="indoor"&&engine_fresh_&&engine_indoor_value_.is_object()) || ((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=="balance"&&engine_fresh_&&engine_data_.at("balance").value("messageType","")=="snapshot") || (route=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (route=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (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_);
|
||||
}
|
||||
}
|
||||
@@ -140,6 +140,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_=="indoor")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Hallentabellen",render_indoor())+"</div>";
|
||||
if(menu_=="balance")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Bilanz",render_balance())+"</div>";
|
||||
if(menu_=="news")out+="<div class=\"fill\" style=\"z-index:100;\">"+render_news()+"</div>";
|
||||
if(menu_=="achievements")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Erfolge",render_achievements())+"</div>";
|
||||
@@ -187,7 +188,7 @@ void App::engine_render() {
|
||||
Rml::ElementList underlay; doc_->QuerySelectorAll(underlay, ".window>.content,.window>.titlebar");
|
||||
for (auto *node : underlay) { node->SetProperty("pointer-events", "none"); node->SetProperty("filter", "blur(10dp)"); }
|
||||
}
|
||||
if(!report_detail_kind_.empty()&&(menu_=="tables"||menu_=="strengths"||menu_=="league"||menu_=="other"||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(!report_detail_kind_.empty()&&(menu_=="indoor"||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(menu_=="stadium"&&stadium_view_.value("dialog",std::string())!=""){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#stadium-underlay button,.window>.titlebar button");for(auto *n:nodes){n->SetAttribute("disabled",true);n->SetProperty("pointer-events","none");}}
|
||||
if(!toto_dialog_.empty()){Rml::ElementList nodes;doc_->QuerySelectorAll(nodes,"#toto-underlay button,.window>.titlebar button");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);}
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
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}}}}}};
|
||||
Json engine_reports_state_={{"league",""},{"filter",0},{"sorts",{{"tables",{{"key","rank"},{"desc",false}}},{"strengths",{{"key","strength"},{"desc",true}}},{"indoor",{{"key","rank"},{"desc",false}}}}}};
|
||||
Json engine_fixtures_read_, engine_fixtures_value_;
|
||||
Json engine_rankings_read_,engine_rankings_value_,engine_fairplay_read_,engine_fairplay_value_,engine_rankings_player_;
|
||||
Json engine_rankings_state_={{"league",""},{"scope",0}};
|
||||
@@ -156,3 +156,6 @@
|
||||
void engine_balance_close(const std::string &);
|
||||
void engine_balance_continue(const std::string &);
|
||||
bool engine_balance_action(const std::string &,Rml::Element *);
|
||||
|
||||
Json engine_indoor_value_;
|
||||
void engine_indoor_sync();
|
||||
@@ -1,9 +1,13 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
std::string App::render_indoor() {
|
||||
const auto snapshot = snap();
|
||||
const auto &state = snapshot.state.at("reports");
|
||||
const auto state = engine_mode_ ? engine_reports_state_ : snap().state.at("reports");
|
||||
const auto &sort = state.at("sorts").at("indoor");
|
||||
const auto rows = report_indoor_rows(*world_, state);
|
||||
Json rows;
|
||||
if (engine_mode_) {
|
||||
std::vector<Json> values;
|
||||
for (const auto &row : engine_indoor_value_.at("rows")) values.push_back(row);
|
||||
rows = sort_report_rows(std::move(values), sort);
|
||||
} else rows = report_indoor_rows(*world_, state);
|
||||
std::string body = "<div id=\"report-underlay\" class=\"report-underlay\">"
|
||||
"<div id=\"report-list\" class=\"report-list indoor-list\">"
|
||||
"<div class=\"report-table\" role=\"table\">"
|
||||
@@ -39,8 +43,10 @@ std::string App::render_indoor() {
|
||||
"<span class=\"report-value\">" + std::to_string(row.at("points").get<int>()) +
|
||||
"</span></div></div>";
|
||||
}
|
||||
if (rows.empty()) body += "<p class=\"indoor-empty\">Noch kein Hallenturnier gewertet.</p>";
|
||||
const auto footer = engine_mode_ ? engine_indoor_value_.at("footer").get<std::string>() : "Nach dem 5. Turnier";
|
||||
body += "</div></div><nav class=\"report-footer\">" +
|
||||
btn("indoor-info", "<span>Nach dem 5. Turnier</span>", "report-reset indoor-info",
|
||||
btn("indoor-info", "<span>" + esc(footer.empty() ? "Turnierinformationen" : footer) + "</span>", "report-reset indoor-info",
|
||||
"id=\"indoor-info\"") + "</nav></div>";
|
||||
return body + render_report_detail();
|
||||
}
|
||||
|
||||
@@ -1552,6 +1552,7 @@ public:
|
||||
#include "modern/ui/engine_news.inc"
|
||||
#include "modern/ui/engine_balance.inc"
|
||||
#include "modern/ui/engine_widgets.inc"
|
||||
#include "modern/ui/engine_indoor.inc"
|
||||
} // namespace
|
||||
bool is_modern_world(const fs::path &file) {
|
||||
try {
|
||||
|
||||
@@ -0,0 +1,107 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/demo_reports.hpp"
|
||||
#include "modern/ui/engine_bridge.hpp"
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
using namespace bmh::modern_ui;
|
||||
namespace {
|
||||
void check(bool v, const char *s) {
|
||||
if (!v)
|
||||
throw std::runtime_error(s);
|
||||
}
|
||||
template <class F> void rejects(F f) {
|
||||
bool yes = false;
|
||||
try {
|
||||
f();
|
||||
} catch (const std::exception &) {
|
||||
yes = true;
|
||||
}
|
||||
check(yes, "invalid indoor read accepted");
|
||||
}
|
||||
} // namespace
|
||||
int main() try {
|
||||
const Json meta = {{"contractVersion", "bmh-modern-ui@draft1"},
|
||||
{"careerId", "career:test"},
|
||||
{"worldId", "world:test"},
|
||||
{"worldRevision", "1"},
|
||||
{"stateRevision", "5"},
|
||||
{"scope",
|
||||
{{"role", "club"},
|
||||
{"managerId", "manager:one"},
|
||||
{"teamId", "club:one"}}}};
|
||||
Json b;
|
||||
for (auto *k : {"session", "desktop", "camps", "indoor-standings"})
|
||||
b[k] = {
|
||||
{"messageType", "snapshot"}, {"meta", meta}, {"data", {{"kind", k}}}};
|
||||
b["desktop"]["data"].update(
|
||||
{{"manager", {{"id", "manager:one"}}},
|
||||
{"team", {{"id", "club:one"}}},
|
||||
{"accounts",
|
||||
{{"cash", {{"minor", "0"}, {"currency", "EUR"}, {"minorUnits", 2}}}}}});
|
||||
b["camps"]["data"]["camps"] = Json::array();
|
||||
auto &d = b["indoor-standings"]["data"];
|
||||
d.update({{"teamId", "club:one"},
|
||||
{"tournaments", 0},
|
||||
{"rows", Json::array()},
|
||||
{"footer", ""},
|
||||
{"indoor", false},
|
||||
{"scoring", nullptr}});
|
||||
auto empty = engine_indoor_projection(b);
|
||||
check(empty["rows"].empty() && empty["tournaments"] == 0,
|
||||
"empty season invented results");
|
||||
d["tournaments"] = 4;
|
||||
d["footer"] = "Synthetic fourth tournament";
|
||||
d["indoor"] = true;
|
||||
d["scoring"] = {{"value", 27}, {"places", Json::array()}};
|
||||
for (int i = 1; i <= 4; ++i)
|
||||
d["scoring"]["places"].push_back({{"rank", i}, {"points", i * 27}});
|
||||
for (int i = 0; i < 16; ++i)
|
||||
d["rows"].push_back({{"rank", i + 1},
|
||||
{"points", i ? 16 - i : 0},
|
||||
{"team",
|
||||
{{"id", "club:" + std::to_string(i)},
|
||||
{"name", "Synthetic club " + std::to_string(i)}}}});
|
||||
d["rows"][15]["points"] = 0;
|
||||
const auto before = b;
|
||||
const auto p = engine_indoor_projection(b);
|
||||
check(b == before && p["rows"].size() == 16 && p["rows"][0]["points"] == 0 &&
|
||||
p["rows"][15]["rank"] == 16,
|
||||
"actual rows or zero points lost");
|
||||
check(p["footer"] == d["footer"] && p["scoring"] == d["scoring"],
|
||||
"original info changed");
|
||||
auto values = p.at("rows").get<std::vector<Json>>();
|
||||
const auto sorted =
|
||||
sort_report_rows(values, {{"key", "points"}, {"desc", true}});
|
||||
check(sorted[14].at("rank") == 1 && sorted[15].at("rank") == 16,
|
||||
"equal point sort lost original ranking order");
|
||||
for (int fault = 0; fault < 9; ++fault) {
|
||||
auto bad = b;
|
||||
auto &v = bad["indoor-standings"];
|
||||
if (fault == 0)
|
||||
v["meta"]["stateRevision"] = "6";
|
||||
if (fault == 1)
|
||||
v["data"]["teamId"] = "wrong";
|
||||
if (fault == 2)
|
||||
v["data"]["rows"][1]["team"]["id"] = "club:0";
|
||||
if (fault == 3)
|
||||
v["data"]["rows"][1]["rank"] = 1;
|
||||
if (fault == 4)
|
||||
v["data"]["rows"][0]["points"] = -1;
|
||||
if (fault == 5)
|
||||
v["data"]["rows"].erase(0);
|
||||
if (fault == 6)
|
||||
v["data"]["tournaments"] = 0;
|
||||
if (fault == 7)
|
||||
v["data"]["scoring"]["places"][0]["points"] = -1;
|
||||
if (fault == 8)
|
||||
for (auto &row : bad)
|
||||
row["meta"]["scope"]["role"] = "national";
|
||||
rejects([&] { engine_indoor_projection(bad); });
|
||||
}
|
||||
std::cout << "indoor actual rows, zero/empty, owner, context, rank and info "
|
||||
"checks passed\n";
|
||||
return 0;
|
||||
} catch (const std::exception &e) {
|
||||
std::cerr << e.what() << '\n';
|
||||
return 1;
|
||||
}
|
||||
Reference in new issue
Block a user