Bind league fixtures and round navigation to live engine data (by Codex)

This commit is contained in:
Codex committed 2026-10-28 22:23:59 +01:00
1 parent 1c35698dbe
commit 545e16f153
21 files changed
+207 -31

No files matched your search

+1 -1
View File
@@ -57,7 +57,7 @@ Für 0.3 gilt außerdem:
| M3 | Modern-Weltlader, Namen (Vor-/Nachname, UTF-8), Asset-Schlüssel | Weltlader erledigt: Modern-Datensatz spielt zwei Saisons; Namen/Assets für die UI liegen in `ModernState`, Spielstände folgen mit M6 |
| M4 | Trainingslager: 18 Lager, drei Karten, 6-Sterne-Wirkung | Engine erledigt (Katalog, Preis, 6-Sterne-Wirkung, Test); Saisonwirkung wird in M7 gemessen |
| M5 | Datenrevision 1.4 des Modern-Datensatzes (privat), Wirtschaftsprüfung | erledigt: Revision 1.4 abgenommen (Lager, 100 Schiedsrichter, Geburtsdaten; siehe Phasen) |
| M6 | Modern-Spielstände (`modern-career-v1`), Projektionen für die UI | Spielstände erledigt (Rundreise identisch); UI-Projektionen schrittweise angebunden (u. a. Tabellen, Stärken, Almanach) |
| M6 | Modern-Spielstände (`modern-career-v1`), Projektionen für die UI | Spielstände erledigt (Rundreise identisch); UI-Projektionen schrittweise angebunden (u. a. Tabellen, Stärken, Ligaspiele, 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 |
+14
View File
@@ -121,3 +121,17 @@ 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/`.
### M6 · Ligaspiele-Leseprojektion, 28. Oktober 2026
`league-fixtures {leagueId,round?}` stellt die vorhandenen Paarungen und
Ergebniszustände mit der üblichen Snapshot-Hülle bereit. Aktiver Ligaindex,
stabile Paarungs-IDs und gültige Rundengrenzen verhindern Vermischung mit
Demo- oder fremden Kontextdaten. Statusmarker bleiben Ergebnisse ohne Torzahlen;
insbesondere wird `0xCE` nicht mehr als 12:14 ausgegeben (#19). Keine Änderung
an Saisonlogik, Ergebnisbytes, OBW-Format oder Editor. Der native Presenter
nutzt dieselbe mittige Paarungsgeometrie wie die HTML-Vorlage.
Synthetische Marker-/Bereichs-/Kontexttests, alle Runden der neun tatsächlichen
Ligen und private GUI-Reads einschließlich Verlegung/Rücknahme und OBS-Neustart
liegen unter `bmh_4k_ui/docs/qa/engine-fixtures-2026-10-28/`.
+1 -1
View File
@@ -22,7 +22,7 @@ Vereinbarter Ablauf: Die neue Oberfläche wird **je Menü** an die Modern-Engine
| `{kind: "status"}` | `manager {index, name}`, `club` (oder `null`, z. B. am Bundestrainer-Schreibtisch), `league`, `place`, `date`, `season`, `money` |
| `{kind: "leagues"}` | `leagues: [{index, id, name, clubs, matchdays, played}]` |
| `{kind: "table", league}` | `league`, `played`, `rows: [{rank, club, played, won, drawn, lost, goals_for, goals_against, points}]` (aktueller Stand, mit Punktabzug) |
| `{kind: "fixtures", league, matchday?}` | `league`, `matchday`, `matches: [{home, away, result: [h, a] \| null, status: open \| played \| postponed}]`; ohne `matchday` der nächste |
| `{kind: "fixtures", league, matchday?}` | `league`, `matchday`, `matches: [{id, home, away, result: [h, a] \| null, status: open \| played \| postponed \| rescheduled \| unavailable}]`; ohne `matchday` der nächste; nur `played` enthält Torzahlen |
| `{kind: "toto"}` | Tippschein des Spieltags und eigene Spalten, siehe [Toto](toto.md) |
| `{kind: "sponsor"}` | Exklusiv-Sponsor aus einem Trainingslager: offenes Angebot und vorgemerkter Vertrag, siehe [Trainingslager](trainingslager.md#exklusiv-sponsor) |
| `{kind: "squad", club?}` | `club`, `players: [{slot, player, nation, position (gk/def/mid/fwd), age, technique, condition, form, strength, skills {teamplay, speed, shooting, passing, tackling, free_kick, corner}, lineup (start/bench/none), injured_weeks, banned_weeks}]`; ohne `club` der eigene Verein, sonst Welt-ID oder Laufzeitindex |
+1 -1
View File
@@ -6,7 +6,7 @@ Die normale Classic-Konfiguration bleibt unverändert; die neue Oberfläche
wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut.
Der [opt-in Engine-Einstieg](integration/ENGINE_ENTRY.md) lädt inzwischen eine
echte Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung, Spielerverträge, Vereinskalender, Spielverlegung, Vereins-/Nationalfreundschaftsspiele den Almanach sowie Tabellen und Stärken an die
echte Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung, Spielerverträge, Vereinskalender, Spielverlegung, Vereins-/Nationalfreundschaftsspiele, den Almanach sowie Tabellen, Stärken und Ligaspiele 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
+1 -1
View File
@@ -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 | [Echte Tabellen/Stärken und Profile; getrennte Spielvorschau](desktop/reports/README.md) |
| Berichte | [Echte Tabellen, Stärken, Ligaspiele und Profile; getrennte übrige 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) |
+38 -3
View File
@@ -8,7 +8,7 @@ unveränderte HTML-Mockup `bmh_4k_ui`, Revision
`menu-themes.css`. Proprietäre Referenzbilder und Weltdaten gehören nicht
in dieses öffentliche Dokument.
Die Ansichten verbinden **echte Katalogdaten aus der geladenen OBW-Welt**
Die getrennten Präsentationsdemos 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.
@@ -19,8 +19,8 @@ Tabellen und Stärken jetzt denselben vorhandenen RmlUI-Presenter mit Sessiondat
`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.
internationalen Ligen. Ligaspiele sind ebenfalls angebunden (siehe unten);
„Übrige Spiele“ bleibt bis zum eigenen Anschluss eine Präsentationsansicht.
`league-report {leagueId, filter}` liefert Tabelle und Kaderstärken im selben
Karriere-/Welt-/Manager-/Revisionskontext. Filter 0–4 bedeuten Alle Spiele,
@@ -58,6 +58,41 @@ 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.
## Echte Ligaspiele · 28. Oktober 2026
Ausgangsstand `0.3` / `1c35698`. Der vorhandene Begegnungspresenter verwendet
`league-fixtures {leagueId, round?}`. Der Read kapselt die bestehende
`fixtures`-Projektion und liefert denselben Karriere-/Welt-/Manager-/Revisionskontext
wie die Berichts- und Kaderdaten. `round` ist einsbasiert; ohne Angabe gilt der
nächste von der Engine gemeldete Spieltag, begrenzt auf den letzten Spieltag.
Ungültige Liga-IDs oder explizite Runden werden abgewiesen.
Die Antwort enthält `leagueId`, `league`, `round`, `rounds` und `matches`.
Jede Paarung hat eine stabile `id`, `home`, `away`, `status` und `result`.
`result` ist nur bei `played` ein Zweierfeld mit Torzahlen; bei `open`,
`postponed`, `rescheduled` und `unavailable` bleibt es `null`. Verlegte Spiele
erscheinen als „verlegt“, andere offene Begegnungen als „–“. Der in #19
festgestellte Verlegungsmarker `0xCE` und seine Statusvarianten werden nicht
mehr als vermeintliches Ergebnis 12:14 decodiert. Die Änderung betrifft allein
den Read, keine Spielentscheidungen, Termine oder gespeicherten Ergebnisbytes.
Land und Liga verwenden den aktiven Berichtsindex. Die Rundenpfeile enden am
ersten und letzten verfügbaren Spieltag. Beim Wechsel von einer 20er- in eine
18er-Liga wird beispielsweise Spieltag 38 auf 34 begrenzt. Wiederöffnen im
selben Kontext behält die gewählte Runde; nach Prozessneustart gilt wieder der
von der Engine gemeldete nächste Spieltag. Bestätigte Sessionänderungen, auch
eine Verlegungsrücknahme, verwerfen den Cache. Vereinsklick und Spielerprofile
verwenden dieselben aktuellen Kaderdialoge wie Tabellen und Stärken.
Die Anordnung bleibt Heimname → Heimwappen → Ergebnis → Auswärtswappen →
Auswärtsname, mit mittigem Ergebnis und Spieltagskopf. Auch der Engine-Einstieg
verwendet die gemeinsame Korrektur für gerundete Pixelbreiten bei 720p.
Native Prüfung: drei Themes bei 1080p, Silver bei 720p, neun Ligen mit sämtlichen
34/38 Runden, leere erste Runde, tatsächliche Verlegung/Rücknahme und OBS-Neustarts.
Private Screenshots, Spielstände und Messdaten:
`bmh_4k_ui/docs/qa/engine-fixtures-2026-10-28/`. Ausführung Linux x64;
Windows und macOS sind nicht nativ geprüft.
Die folgenden Beschreibungen gelten für die **getrennte Präsentationsdemo**.
## Sichtbare Daten
+17 -1
View File
@@ -17,7 +17,7 @@ werden. Die Quelle wird nicht in DemoSource überführt.
## Gebundener Umfang
- `ModernSession::ui_read`: `session`, `desktop`, `camps`, `squad`, `lineup`, `tactics`, `training`, `bank`, `stadium`, `credit`, `environment`, `advertising`, `contracts`, `calendar`, `scheduling`, `friendly-plan`; parameterisierte Angebote über `friendly` und Archivabfragen über `almanac`. Karriere, Manager,
- `ModernSession::ui_read`: `session`, `desktop`, `camps`, `squad`, `lineup`, `tactics`, `training`, `bank`, `stadium`, `credit`, `environment`, `advertising`, `contracts`, `calendar`, `scheduling`, `friendly-plan`, `report-index`, `league-report`, `league-fixtures`; parameterisierte Angebote über `friendly` und Archivabfragen über `almanac`. Karriere, Manager,
Mannschaft, Datum, Saison, Geld, Lagerqualitäten und Angebote kommen aus der
Engine. Katalog und Engine müssen dieselbe Welt-ID und Datenrevision haben.
- Der bestehende RmlUI-Schreibtisch verwendet die gemeinsamen App-Buttons und
@@ -285,3 +285,19 @@ 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).
## Ligaspiele · 28. Oktober 2026
`league-fixtures {leagueId,round?}` bindet den vorhandenen Begegnungspresenter
an die tatsächlichen Paarungen und Ergebnisse. `round` beginnt bei 1;
weggelassen wird der nächste Engine-Spieltag verwendet. Länder, Ligen und
Rundengrenzen kommen aus `report-index`. Rundenpfeile stoppen am Rand; ein
Wechsel zwischen 38 und 34 Spieltagen begrenzt die Auswahl. Profile verwenden
dieselben aktuellen Kader-Reads wie Tabellen/Stärken.
Offene/verlegte Paarungen enthalten `result: null`, keine vermeintlichen
Torzahlen aus Statusmarkern (#19). Der Controller bindet die Antwort an den
Snapshot und verwirft sie nach einer Sessionmutation. Browsing ändert weder
Revision, RNG noch Archiv. Private Nachweise mit realer Verlegung/Rücknahme:
`bmh_4k_ui/docs/qa/engine-fixtures-2026-10-28/`. „Übrige Spiele“ bleibt
vorerst separat. [Vertrag und Bedienung](../desktop/reports/README.md).
+6 -4
View File
@@ -165,13 +165,15 @@ J fixtures(const ModernState& g, int league, int matchday) {
const size_t at = size_t(league) * kResultsPerLeague + size_t(matchday - 1) * 10 + m;
const uint8_t r = at < g.results.size() ? g.results[at] : kNotPlayed;
O match{{"home", club_json(g, fx[m].home)}, {"away", club_json(g, fx[m].away)}};
if (r == kNotPlayed) {
match["result"] = nullptr, match["status"] = "open";
} else if (r == 0xcd) {
match["result"] = nullptr, match["status"] = "postponed";
if ((r & 0xcc) == 0xcc) {
const uint8_t marker = r & 0xcf;
match["result"] = nullptr;
match["status"] = marker == 0xcc ? "open" : marker == 0xcd ? "postponed"
: marker == 0xce ? "rescheduled" : "unavailable";
} else {
match["result"] = A{J(int(r >> 4)), J(int(r & 0xf))}, match["status"] = "played";
}
match["id"] = "fixture:league-" + std::to_string(league) + "-" + std::to_string(matchday) + "-" + std::to_string(m);
out.push_back(std::move(match));
}
return O{{"ok", true}, {"league", league_json(g, league)}, {"matchday", matchday}, {"matches", std::move(out)}};
+3
View File
@@ -9,6 +9,9 @@
// {kind: "leagues"} the leagues with size, matchdays and progress
// {kind: "table", league} a league's current table
// {kind: "fixtures", league, matchday?} a matchday's pairings and results
// Each match has a stable id, home/away club refs, status and result.
// Only played matches have [home, away] scores; open/postponed/rescheduled/
// unavailable matches have null results, including packed status variants.
// {kind: "squad", club?} a squad with names, values and fitness
#include "cli/json.hpp"
+15
View File
@@ -487,6 +487,21 @@ cli::Json ui_read(const ModernState& g, const UiContext& c, const cli::Json& req
A leagues;for(int l=0;l<kLeagueCount;++l)leagues.push_back(report_league(g,l,team_of(g,c.manager)));
return snapshot(request_id,std::move(m),O{{"kind","report-index"},{"leagues",std::move(leagues)}});
}
if(kind=="league-fixtures") {
const std::string id=text_field(request,"leagueId");int league=-1;
for(int l=0;l<kLeagueCount;++l)if(*std::get<O>(report_league(g,l,-1).value).at("id").string()==id){league=l;break;}
const auto* round=field(request,"round");
if(league<0||(round&&(!round->integer()||*round->integer()<1||*round->integer()>league_matchdays(league))))
return failure(request_id,"invalid_fixture_request","Liga oder Spieltag ist nicht verfügbar.",c.state_revision);
O query{{"kind","fixtures"},{"league",id}};
if(round)query["matchday"]=*round;
J data=query_projection(g,c.manager,query);
auto* values=std::get_if<O>(&data.value);
if(!values||!values->count("ok")||!std::holds_alternative<bool>(values->at("ok").value)||!std::get<bool>(values->at("ok").value))
return failure(request_id,"fixtures_unavailable","Die Paarungen sind derzeit nicht verfügbar.",c.state_revision);
values->erase("ok");(*values)["kind"]="league-fixtures";(*values)["leagueId"]=id;(*values)["round"]=values->at("matchday");(*values)["rounds"]=league_matchdays(league);
return snapshot(request_id,std::move(m),std::move(data));
}
if(kind=="league-report") {
const std::string id=text_field(request,"leagueId");int league=-1;
for(int l=0;l<kLeagueCount;++l)if(*std::get<O>(report_league(g,l,-1).value).at("id").string()==id){league=l;break;}
+1
View File
@@ -54,6 +54,7 @@ Json engine_almanac_projection(const Json &bundle, const Json &read, const Json
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);
Json engine_fixtures_projection(const Json &bundle,const Json &index,const Json &read,const std::string &league,int round);
// Single-session facade. Its owner serializes all calls on a background worker.
// No RmlUI objects or callbacks cross this boundary.
+5 -4
View File
@@ -75,7 +75,7 @@ void App::engine_frame() {
engine_sports_update();
if (ticket_) ticket_->update();
render_popup(); context_->Update();
if(almanac_layout_update())context_->Update();
if(center_fixture_columns())context_->Update();
if (rendered && menu_ == "friendlies") if (auto *list = element("friendly-opponents")) list->SetScrollTop(engine_friendly_scroll_);
if (menu_ == "contracts" && engine_contract_scroll_) {
if (auto *roster = element("contracts-roster-scroll")) roster->SetScrollTop(*engine_contract_scroll_);
@@ -138,7 +138,7 @@ void App::engine_event(Rml::Event &event) {
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" || menu_=="tables" || menu_=="strengths") && report_picker_event(event)) return;
if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league") && 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())
@@ -211,7 +211,7 @@ void App::engine_event(Rml::Event &event) {
if (engine_reports_action(action,node)) return;
if (almanac_action(action,node)) return;
if (engine_friendly_action(action, node)) return;
if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths") && report_picker_action(action,node)) return;
if ((menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league") && 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;
@@ -225,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=="league"){menu_=id;engine_reports_sync();const auto league=engine_reports_state_.at("league").get<std::string>();engine_fixtures_load(league,engine_fixtures_value_.is_object()&&engine_fixtures_value_.at("leagueId")==league?engine_fixtures_value_.at("round").get<int>():0);}
else if(action=="engine-open"&&(id=="tables"||id=="strengths")){menu_=id;engine_reports_sync();engine_reports_load(engine_reports_state_.at("league"),engine_reports_state_.at("filter"));}
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(); }
@@ -251,5 +252,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_}, {"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
{"response", engine_response_}, {"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_}};
}
+21
View File
@@ -819,4 +819,25 @@ Json engine_report_squad(const Json &bundle,const Json &read,const std::string &
}
auto result=data;for(auto &r:result["players"])r["live_strength"]=metric_value(r,"strength");return result;
}
Json engine_fixtures_projection(const Json &bundle,const Json &index,const Json &read,const std::string &league,int round) {
const auto data=engine_report_index(bundle,index);const Json *selected=nullptr;
for(const auto &l:data.at("leagues"))if(l.at("id")==league)selected=&l;
require(selected,"Paarungen gehören keiner aktiven Liga.");
auto context=bundle;context["league-fixtures"]=read;const auto &value=lineup_read(context,"league-fixtures");
require(value.at("leagueId")==league&&value.at("league").at("id")==league&&value.at("round")==round&&value.at("rounds")==selected->at("matchdays"),"Paarungen gehören einer anderen Liga oder Runde.");
(void)whole_in_range(value.at("round"),1,selected->at("matchdays"));
require(value.at("matches").is_array()&&value.at("matches").size()*2==selected->at("members").size(),"Unvollständiger Ligaspieltag.");
std::set<std::string> members,teams,ids;for(const auto &id:selected->at("members"))members.insert(id.get<std::string>());
Json out=value;out["league"]=*selected;
for(auto &m:out["matches"]) {
const auto id=m.at("id").get<std::string>();require(!id.empty()&&ids.insert(id).second,"Doppelte oder fehlende Paarungs-ID.");
for(const auto *side:{"home","away"}){const auto team=m.at(side).at("id").get<std::string>();require(members.contains(team)&&teams.insert(team).second&&m.at(side).at("name").is_string(),"Fremder oder doppelter Teilnehmer.");}
const auto status=m.at("status").get<std::string>();require(status=="played"||status=="open"||status=="postponed"||status=="rescheduled"||status=="unavailable","Unbekannter Paarungsstatus.");
if(status=="played"){require(m.at("result").is_array()&&m.at("result").size()==2,"Gespieltes Ergebnis fehlt.");for(const auto &n:m.at("result"))(void)whole_in_range(n,0,15);}
else require(m.at("result").is_null(),"Ungespielte Partie enthält ein erfundenes Ergebnis.");
m["home_team"]=m.at("home");m["away_team"]=m.at("away");m["home"]=m.at("home_team").at("id");m["away"]=m.at("away_team").at("id");
m["home_goals"]=status=="played"?m.at("result")[0]:Json();m["away_goals"]=status=="played"?m.at("result")[1]:Json();
}
return out;
}
} // namespace bmh::modern_ui
+23 -3
View File
@@ -4,6 +4,7 @@ void App::engine_reports_sync() {
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();
engine_fixtures_read_=Json();engine_fixtures_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) {
@@ -20,14 +21,31 @@ void App::engine_reports_load(const std::string &preferred,int filter) {
return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","league"},{"index",index},{"read",read},{"league",league},{"filter",filter}},nullptr};
});
}
void App::engine_fixtures_load(const std::string &preferred,int round) {
if(engine_busy_||!engine_fresh_)return;
if(engine_fixtures_value_.is_object()&&engine_fixtures_value_.at("leagueId")==preferred&&engine_fixtures_value_.at("round")==round){refresh();return;}
const int filter=engine_reports_state_.at("filter");auto link=engine_link_;
engine_start("Ligaspiele werden geladen …",[link,preferred,round,filter] {
const auto bundle=link->snapshot(),index=link->read({{"kind","report-index"}});const auto data=engine_report_index(bundle,index);
const Json *league=nullptr;for(const auto &l:data.at("leagues"))if(l.at("id")==preferred)league=&l;
if(!league)for(const auto &l:data.at("leagues"))if(l.at("own")==true){league=&l;break;}
if(!league)league=&data.at("leagues")[0];
const int total=league->at("matchdays");const int selected=round>0?std::clamp(round,1,total):std::min(league->at("played").get<int>()+1,total);
const auto id=league->at("id").get<std::string>();
const auto report=link->read({{"kind","league-report"},{"leagueId",id},{"filter",filter}}),fixtures=link->read({{"kind","league-fixtures"},{"leagueId",id},{"round",selected}});
return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","fixtures"},{"index",index},{"read",report},{"league",id},{"filter",filter},{"fixtures",fixtures},{"round",selected}},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") {
if(r.at("kind")=="league"||r.at("kind")=="fixtures") {
auto value=engine_report_projection(reply.bundle,r.at("index"),read,r.at("league"),r.at("filter"));
Json fixtures;if(r.at("kind")=="fixtures")fixtures=engine_fixtures_projection(reply.bundle,r.at("index"),r.at("fixtures"),r.at("league"),r.at("round"));
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");
if(r.at("kind")=="fixtures"){engine_fixtures_read_=r.at("fixtures");engine_fixtures_value_=std::move(fixtures);engine_reports_state_["round"]=r.at("round").get<int>()-1;}
} 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<std::string>())focus_after_render_=engine_reports_roster_value_.at("players").empty()?"report-detail-close":"report-detail-player-0";
@@ -35,6 +53,7 @@ void App::engine_reports_poll(const EngineReply &reply) {
engine_notice_="Ligabericht geladen.";
}
Json App::engine_reports_rows(const std::string &mode) const {
if(mode=="league")return engine_fixtures_value_.at("matches");
std::vector<Json> 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));
@@ -60,10 +79,11 @@ 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")return false;
if(menu_!="tables"&&menu_!="strengths"&&menu_!="league")return false;
const auto id=target?target->GetAttribute<Rml::String>("data-id",""):std::string();
if(action=="report-detail-close") {focus_after_render_=report_detail_return_focus_;report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear();refresh();return true;}
if(engine_busy_||!engine_fresh_)return action.starts_with("report-")||action=="club-detail"||action=="player-detail";
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;
@@ -87,7 +107,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")||report_detail_kind_.empty())return false;
if((menu_!="tables"&&menu_!="strengths"&&menu_!="league")||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;}
+5 -3
View File
@@ -37,6 +37,7 @@ Json App::engine_camp_view() const {
}
void App::engine_render() {
if (ticket_) ticket_->close(false);
fixture_half_width_=-1.f;
almanac_list_width_=-1.f;
if (menu_ == "friendlies") if (auto *list = element("friendly-opponents")) engine_friendly_scroll_ = list->GetScrollTop();
if (menu_ == "contracts") if (auto *roster = element("contracts-roster-scroll")) engine_contract_scroll_ = roster->GetScrollTop();
@@ -113,11 +114,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=="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());
const bool supported = ((route=="tables"||route=="strengths"||route=="league")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || route == "save" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
out += desktop_button(id, o, "engine-open", supported && !engine_busy_);
}
}
out += "</div>";
if(menu_=="league")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Ligaspiele",engine_fixtures_value_.is_object()?render_reports("league"):"<div class=\"fill center\">"+esc(engine_busy_?"Ligaspiele werden geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="tables"||menu_=="strengths")out+="<div class=\"fill\" style=\"z-index:100;\">"+window(menu_=="tables"?"Tabelle":"Stärken",engine_reports_read_.is_object()?render_reports(menu_):"<div class=\"fill center\">"+esc(engine_busy_?"Ligabericht wird geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="almanac") out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Almanach",engine_almanac_cache_.contains("index")?render_almanac():"<div class=\"fill center\">"+esc(engine_busy_?"Spielarchiv wird geladen …":engine_notice_)+"</div>")+"</div>";
if (menu_ == "friendlies") out += "<div class=\"fill\" style=\"z-index:100;\">" + window("Freundschaftsspiel", friendlies_available ? render_friendlies() : "<div class=\"fill center\">Freundschaftsplanung ist derzeit nicht verfügbar.</div>") + "</div>";
@@ -132,7 +134,7 @@ void App::engine_render() {
if (menu_ == "lineup") out += "<div class=\"fill\" style=\"z-index:100;\">" + window("Aufstellung", render_lineup()) + "</div>";
if (menu_ == "camp") out += "<div class=\"fill\" style=\"z-index:100;\">" + window("Trainingslager", render_camp()) + "</div>";
}
if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "<div class=\"panel\" style=\"position:absolute;bottom:12dp;left:700dp;right:700dp;padding:9dp;font-size:25dp;z-index:110;\" id=\"engine-status\">" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "</div>";
if ((menu_ == "bank" || menu_ == "environment" || menu_ == "advertising" || menu_ == "contracts" || menu_ == "calendar" || menu_ == "postpone" || menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league") && !amount_ && contracts_dialog_.empty() && planning_dialog_.empty()) out += "<div class=\"panel\" style=\"position:absolute;bottom:12dp;left:700dp;right:700dp;padding:9dp;font-size:25dp;z-index:110;\" id=\"engine-status\">" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "</div>";
if (menu_.empty() || engine_data_.empty()) out += "<div class=\"panel\" style=\"position:absolute;left:850dp;bottom:24dp;right:100dp;padding:18dp;font-size:27dp;\" id=\"engine-status\">" + esc(engine_busy_ ? engine_operation_ : engine_notice_) + "</div>";
element("canvas")->SetInnerRML(out); ++document_generation_;
scale_chalk_shadow();
@@ -155,7 +157,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(!report_detail_kind_.empty()&&(menu_=="tables"||menu_=="strengths"||menu_=="league")){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);
+2
View File
@@ -13,6 +13,8 @@
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_fixtures_read_, engine_fixtures_value_;
void engine_fixtures_load(const std::string &,int);
void engine_reports_sync();
void engine_reports_load(const std::string &,int);
void engine_reports_poll(const EngineReply &);
+4 -4
View File
@@ -16,7 +16,7 @@ App::report_picker_items(const std::string &kind) const {
std::vector<std::pair<std::string, std::string>> items;
if (!world_ || !report_picker_kind(kind))
return items;
if (engine_mode_ && (menu_=="tables"||menu_=="strengths")) return engine_reports_picker_items(kind);
if (engine_mode_ && (menu_=="tables"||menu_=="strengths"||menu_=="league")) 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);
@@ -75,7 +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<int>());if(kind=="league")return engine_reports_state_.at("league");const auto live_index=engine_report_index(engine_data_,engine_reports_index_);for(const auto &l:live_index.at("leagues"))if(l.at("id")==engine_reports_state_.at("league"))return l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";return {}; }
if(engine_mode_&&(menu_=="tables"||menu_=="strengths"||menu_=="league")){if(kind=="filter")return std::to_string(engine_reports_state_.at("filter").get<int>());if(kind=="league")return engine_reports_state_.at("league");const auto live_index=engine_report_index(engine_data_,engine_reports_index_);for(const auto &l:live_index.at("leagues"))if(l.at("id")==engine_reports_state_.at("league"))return l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";return {}; }
if (menu_ == "statistics")
return statistics_picker_value(kind);
if (kind == "year") return std::to_string(almanac_year_);
@@ -216,12 +216,12 @@ 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_=="tables"||menu_=="strengths")){
if(engine_mode_&&(menu_=="tables"||menu_=="strengths"||menu_=="league")){
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<std::string>():"__other__")==value){league=l.at("id");break;}}
engine_reports_load(league,filter);
if(menu_=="league")engine_fixtures_load(league,engine_fixtures_value_.at("round"));else engine_reports_load(league,filter);
} else if (engine_mode_ && menu_ == "friendlies") {
engine_friendly_filter(kind, value);
} else if (menu_ == "statistics") {
+5 -4
View File
@@ -70,10 +70,11 @@ std::string App::render_reports(const std::string &mode) {
: rows.size() >= 20 ? (1682 - heading_height) / rows.size() : 80;
std::string body = "<div id=\"report-underlay\" class=\"report-underlay\">";
if (matches) {
const int round = std::clamp(state.value("round", 0), 0,
const int round = engine_mode_?engine_fixtures_value_.at("round").get<int>()-1:std::clamp(state.value("round", 0), 0,
report_round_count(*world_, state, mode == "other") - 1);
std::string subtitle;
if (mode == "league" || state.value("competition", 0) == 0)
if(engine_mode_){const auto &l=engine_fixtures_value_.at("league");subtitle=(l.at("nationId").is_string()?world_->nation_name(l.at("nationId")):std::string())+" · "+l.at("name").get<std::string>();}
else if (mode == "league" || state.value("competition", 0) == 0)
subtitle = (league ? world_->nation_name(league->value("nation", "")) : "") +
" · " + (league ? world_->name(*league) : "");
else {
@@ -136,7 +137,7 @@ std::string App::render_reports(const std::string &mode) {
std::string value;
if (matches)
value = row.at("home_goals").is_null() || row.at("away_goals").is_null()
? "–" : report_number(row["home_goals"]) + " : " + report_number(row["away_goals"]);
? (engine_mode_&&(row.value("status","")=="rescheduled"||row.value("status","")=="postponed")?"verlegt":"–") : report_number(row["home_goals"]) + " : " + report_number(row["away_goals"]);
else if (!strengths && column == 5)
value = row.value("form_text", "");
else if (!strengths && column == 7)
@@ -171,7 +172,7 @@ std::string App::render_reports(const std::string &mode) {
body += btn("report-round", i ? "›" : "‹", "report-round",
"id=\"report-round-" + std::string(i ? "next" : "previous") +
"\" data-id=\"" + (i ? "1" : "-1") + "\" style=\"" +
rect(i * 130, 0, 110, 94) + "\" " + (opening ? "disabled" : ""));
rect(i * 130, 0, 110, 94) + "\" " + ((opening||(engine_mode_&&(i?engine_fixtures_value_.at("round")==engine_fixtures_value_.at("rounds"):engine_fixtures_value_.at("round")==1))) ? "disabled" : ""));
body += mode == "league" ? report_picker("country", 260, 1060) + report_picker("league", 1340, 1272)
: report_picker("competition", 260, 2352);
} else if (strengths)
+25 -1
View File
@@ -11,7 +11,7 @@ using namespace bmh::modern_ui;
int main(int argc, char **argv) {
try {
const std::string mode=argc>1?argv[1]:"";
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports"};
const std::set<std::string> modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures"};
if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe <prepare[-two|-national|-almanac]|inspect[-friendlies|-almanac]|verify[-lineup|-sports|-bank|-commerce|-contracts|-calendar|-friendlies|-national|-almanac|-shootouts]> <world.obw> <new-output-directory>");
const fs::path world = argv[2], out = argv[3]; fs::create_directories(out);
const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); };
@@ -337,6 +337,30 @@ int main(int argc, char **argv) {
write("saved.json",link->save_copy(out/"reports.obs"));link.reset();link=EngineBridge::open(world,out/"reports.obs");
if(link->read({{"kind","report-index"}}).at("data")!=index_read.at("data"))throw std::runtime_error("report index changed after OBS restart");
}
if(mode=="verify-fixtures") {
const auto ir=link->read({{"kind","report-index"}}),idx=engine_report_index(before,ir);write("fixture-index.json",ir);Json rounds=Json::array();
for(const auto &l:idx.at("leagues")) {
const auto id=l.at("id").get<std::string>();const int count=l.at("matchdays");
const auto next=link->read({{"kind","league-fixtures"},{"leagueId",id}});
if(next.at("data").at("round")!=std::min(l.at("played").get<int>()+1,count))throw std::runtime_error("incorrect default fixture round");
for(int round=1;round<=count;++round) {
const Json request={{"kind","league-fixtures"},{"leagueId",id},{"round",round}};const auto r=link->read(request);(void)engine_fixtures_projection(before,ir,r,id,round);if(link->read(request)!=r)throw std::runtime_error("fixture read not pure/repeatable");rounds.push_back(r);
}
}
write("all-rounds.json",rounds);if(link->snapshot()!=before)throw std::runtime_error("fixture reads changed state");
const auto schedule=engine_scheduling_projection(before);
if(!schedule.at("movable").empty()) {
const auto &m=schedule.at("movable")[0];const auto command=engine_reschedule_command(before,m.at("id"),m.at("targetDates")[0],"request:fixture-move");
const auto response=link->command(command);write("move-response.json",response);if(response.value("messageType","")!="command_result")throw std::runtime_error(response.dump());
const auto moved=link->snapshot();write("moved.json",moved);
const auto &owner=moved.at("desktop").at("meta").at("scope").at("teamId");
std::string league;for(const auto &l:idx.at("leagues"))if(std::find(l.at("members").begin(),l.at("members").end(),owner)!=l.at("members").end())league=l.at("id");
const auto read=link->read({{"kind","league-fixtures"},{"leagueId",league},{"round",m.at("round")}});write("moved-fixtures.json",read);
bool found=false;for(const auto &r:read.at("data").at("matches"))if(r.at("home").at("id")==m.at("home").at("id")&&r.at("away").at("id")==m.at("away").at("id")){found=true;if(r.at("status")!="rescheduled"||!r.at("result").is_null())throw std::runtime_error("reschedule marker displayed as score");}
if(!found)throw std::runtime_error("moved fixture identity missing");write("moved-saved.json",link->save_copy(out/"moved.obs"));
}
write("saved.json",link->save_copy(out/"fixtures.obs"));
}
std::cout << "engine bridge " << argv[1] << " passed\n"; return 0;
} catch (const std::exception &e) { std::cerr << e.what() << '\n'; return 1; }
}
+7
View File
@@ -372,6 +372,13 @@ int main() {
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);});
const Json fixture_read_data={{"kind","league-fixtures"},{"leagueId","league:live"},{"league",{{"id","league:live"},{"name","Live League"}}},{"round",1},{"rounds",2},{"matches",{{{"id","fixture:one"},{"home",{{"id","club:6"},{"name","Live A"}}},{"away",{{"id","club:7"},{"name","Live B"}}},{"status","open"},{"result",nullptr}}}}};
const auto fixture_read=report_wrap("league-fixtures",fixture_read_data);const auto fixture_value=engine_fixtures_projection(report_bundle,report_index_read,fixture_read,"league:live",1);
require(fixture_value.at("matches")[0].at("home_goals").is_null()&&fixture_value.at("matches")[0].at("home")=="club:6","fixture adapter invented an open result");
auto bad_fixture=fixture_read;bad_fixture["data"]["matches"][0]["result"]={12,14};rejects([&]{engine_fixtures_projection(report_bundle,report_index_read,bad_fixture,"league:live",1);});
bad_fixture=fixture_read;bad_fixture["data"]["round"]=2;rejects([&]{engine_fixtures_projection(report_bundle,report_index_read,bad_fixture,"league:live",1);});
bad_fixture=fixture_read;bad_fixture["data"]["matches"][0]["away"]["id"]="club:6";rejects([&]{engine_fixtures_projection(report_bundle,report_index_read,bad_fixture,"league:live",1);});
bad_fixture=fixture_read;bad_fixture["meta"]["stateRevision"]="42";rejects([&]{engine_fixtures_projection(report_bundle,report_index_read,bad_fixture,"league:live",1);});
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; }
+12
View File
@@ -47,6 +47,18 @@ int main() try {
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<ranks.size();++i)check(ranks[i]==int(i+1),"unplayed half has unique engine ranks");
for(const auto &r:*at(at(all,"data"),"strengths").array())check(std::holds_alternative<std::nullptr_t>(at(r,"strength").value),"absent squads do not receive fake strength");
const auto fixtures=[&](int round){return modern::ui_read(g,context,O{{"kind","league-fixtures"},{"leagueId","league:0"},{"round",round}});};
const auto played_fixture=fixtures(1);const auto& first_fixture=at(at(played_fixture,"data"),"matches").array()->at(0);
check(*at(first_fixture,"status").string()=="played" && integer(at(first_fixture,"result").array()->at(0))==2,"played fixture keeps its actual score");
for(const auto marker:{0xcc,0xcd,0xce,0xde,0xee,0xcf}) {
g.results[0]=uint8_t(marker);const auto r=fixtures(1);const auto& m=at(at(r,"data"),"matches").array()->at(0);
const std::string expected=(marker&0xcf)==0xcc?"open":(marker&0xcf)==0xcd?"postponed":(marker&0xcf)==0xce?"rescheduled":"unavailable";
check(*at(m,"status").string()==expected && std::holds_alternative<std::nullptr_t>(at(m,"result").value),"unplayed markers cannot become 12:14 scores");
}
g.results[0]=0x21;
const auto next=modern::ui_read(g,context,O{{"kind","league-fixtures"},{"leagueId","league:0"}});
check(integer(at(at(next,"data"),"round"))==3,"default round is the engine's next matchday");
check(*at(fixtures(0),"messageType").string()=="error"&&*at(fixtures(35),"messageType").string()=="error","round boundaries enforced");
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;