diff --git a/.github/workflows/modern-ui.yml b/.github/workflows/modern-ui.yml index cf2b3e3..8ea3bde 100644 --- a/.github/workflows/modern-ui.yml +++ b/.github/workflows/modern-ui.yml @@ -52,7 +52,7 @@ jobs: - name: Configure opt-in UI without external assets run: cmake -S . -B build-ui -G Ninja -DCMAKE_BUILD_TYPE=Release -DOPENBMH_BUILD_MODERN_UI=ON -DOPENBMH_BUILD_EDITOR=OFF -DBMH_DATA= - name: Compile native frontend and synthetic checks - run: cmake --build build-ui --target openbmh_play modern_ui_core_tests modern_ticket_document_tests modern_control_layout_tests modern_reports_tests modern_planning_tests modern_almanac_ui_tests modern_finance_ui_tests modern_environment_ui_tests modern_advertising_ui_tests modern_toto_ui_tests modern_lineup_ui_tests modern_transfer_ui_tests modern_career_reports_tests modern_rankings_tests modern_career_files_tests modern_statistics_projection_tests modern_stadium_ui_tests modern_statistics_ui_tests modern_news_ui_tests modern_settings_ui_tests modern_desktop_ui_tests modern_files_ui_tests modern_mods_ui_tests modern_entry_ui_tests modern_opening_ui_tests modern_select_menu_tests modern_career_ui_tests modern_live_ui_tests modern_national_ui_tests modern_news_catalog_tests modern_post_match_ui_tests modern_engine_dto_tests modern_report_read_tests modern_other_read_tests modern_rankings_read_tests modern_winners_read_tests modern_manager_presentation_tests modern_coach_identity_tests --parallel 2 + 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_statistics_ui_tests modern_news_ui_tests modern_settings_ui_tests modern_desktop_ui_tests modern_files_ui_tests modern_mods_ui_tests modern_entry_ui_tests modern_opening_ui_tests modern_select_menu_tests modern_career_ui_tests modern_live_ui_tests modern_national_ui_tests modern_news_catalog_tests modern_post_match_ui_tests modern_engine_dto_tests modern_report_read_tests modern_other_read_tests modern_rankings_read_tests modern_winners_read_tests modern_manager_presentation_tests modern_coach_identity_tests --parallel 2 - name: Check controls, fonts, density and draft cancellation run: ctest --test-dir build-ui -R "^modern_(ui_|ticket_|control_|reports_|planning_|almanac_ui_|finance_ui_|environment_ui_|advertising_ui_|toto_ui_|lineup_ui_|transfer_ui_|career_reports_|rankings_|stadium_ui_|statistics_ui_|news_ui_|settings_ui_|desktop_ui_|files_ui_|mods_ui_|entry_ui_|opening_ui_|select_menu_|career_ui_|live_ui_|national_ui_|news_catalog_|post_match_ui_|engine_dto_|report_read_)" -LE external-data --output-on-failure --output-junit modern-ui-results.xml - name: Upload test report diff --git a/CMakeLists.txt b/CMakeLists.txt index fbcfa9a..9a9a1e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -346,7 +346,7 @@ add_library(bmh_modern_content STATIC src/modern/content/world.cpp src/modern/co src/modern/content/world_save.cpp src/modern/content/world_expand.cpp src/modern/content/statistics.cpp - src/modern/content/projections.cpp src/modern/content/ui_contract.cpp src/modern/content/press_journal.cpp) + src/modern/content/toto_quote.cpp src/modern/content/projections.cpp src/modern/content/ui_contract.cpp src/modern/content/press_journal.cpp) target_link_libraries(bmh_modern_content PUBLIC bmh_content bmh_season_modern PRIVATE bmh_miniz) if(MSVC) target_compile_options(bmh_modern_content PRIVATE /W4 /utf-8) @@ -1217,6 +1217,10 @@ add_test(NAME modern_camp_tests COMMAND modern_camp_tests) add_executable(modern_almanac_tests tests/modern_almanac_tests.cpp) target_link_libraries(modern_almanac_tests PRIVATE bmh_modern_content) add_test(NAME modern_almanac_tests COMMAND modern_almanac_tests) +add_executable(modern_toto_quote_tests tests/modern_toto_quote_tests.cpp) +target_link_libraries(modern_toto_quote_tests PRIVATE bmh_modern_content) +add_test(NAME modern_toto_quote_tests COMMAND modern_toto_quote_tests) + add_executable(modern_winners_read_tests tests/modern_winners_read_tests.cpp) target_link_libraries(modern_winners_read_tests PRIVATE bmh_modern_content) add_test(NAME modern_winners_read_tests COMMAND modern_winners_read_tests) diff --git a/assets/modern/toto.rcss b/assets/modern/toto.rcss index 43995a8..b7873d2 100644 --- a/assets/modern/toto.rcss +++ b/assets/modern/toto.rcss @@ -98,3 +98,6 @@ body.matchday .toto-dialog,body.matchday .toto-dialog.receipt {background-color: .toto-dialog.notice .toto-notice {position:absolute;left:52dp;right:52dp;top:124dp;height:54dp;margin:0;} .toto-dialog.notice .toto-dialog-actions {position:absolute;left:52dp;right:52dp;top:223dp;width:auto;height:65dp;margin:0;} .toto-program>header>span {position:absolute;left:10dp;top:125.5dp;height:31dp;line-height:31dp;} + +.toto-dialog.receipt.settlement {height:auto;width:1600dp;} +.toto-dialog.settlement .toto-receipt {height:auto;max-height:500dp;} diff --git a/docs/new_engine/toto.md b/docs/new_engine/toto.md index 6515776..314af00 100644 --- a/docs/new_engine/toto.md +++ b/docs/new_engine/toto.md @@ -35,3 +35,19 @@ Toto bleibt im Schnitt ein Verlustgeschäft; mit mehr Spalten gewinnt man öfter - Abrechnung: `settle_pools_coupon` (`matchday_setup.cpp`). - Lesen: `{kind: "toto"}` über `ModernSession::read` ([UI-Abfragen](ui-abfragen.md)): `open`, `matches [{home, away}]`, `stake`, `cost`, `columns`, `rules`, `last {paid, won, hits}`. - Tests: `modern_toto_tests` (Regeln, Kosten); Spielstand-Rundreise im Sim prüft die Spalten mit. + +## Nativer UI-Entwurf und Kostenprüfung + +Die Oberfläche hält angekreuzte Felder und den Einsatz zunächst als lokalen +Entwurf. `ui_read({kind:"toto", draft:{stake:Money, columns:[[...]]}})` prüft ihn +auf einer Zustandskopie mit demselben `submit_pools_columns` wie die Abgabe. +Die Antwort enthält bei Erfolg die normalisierte Abgabe, Gesamtkosten und +Bearbeitungsgebühr. Ohne Erfolg gibt es einen Fehlercode und keinen Preis. +Die Prüfung ist rein, hält keinen Angebotsbesitzer und zieht keine Zufallszahl. +`Money` ist streng EUR mit zwei Nachkommastellen; der Spieleinsatz bleibt ganzzahlig. + +Die Bestätigung sendet genau diesen Entwurf mit dem üblichen Karriere-/Manager-/ +Revisionskontext als `toto.submit`. Null Einsatz und leere Spalten ziehen einen +bereits vorgemerkten Schein zurück (vorhandener Core-Pfad); Null mit ausgefüllten +Spalten ist ungültig. Abrechnung und Gebühren bleiben am Ende des Spieltags. +Die bestehende Regel und das OBS-/OBW-Format werden nicht geändert. diff --git a/docs/new_ui/NATIVE_STATUS.md b/docs/new_ui/NATIVE_STATUS.md index be934d3..cf8b3ed 100644 --- a/docs/new_ui/NATIVE_STATUS.md +++ b/docs/new_ui/NATIVE_STATUS.md @@ -6,7 +6,7 @@ Die normale Classic-Konfiguration bleibt unverändert; die neue Oberfläche wird ausdrücklich mit `OPENBMH_BUILD_MODERN_UI=ON` gebaut. Der [Engine-Einstieg](integration/ENGINE_ENTRY.md) erzeugt über den -vorhandenen Wizard eine echte Karriere oder lädt eine Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung, Spielerverträge, Vereinskalender, Spielverlegung, Vereins-/Nationalfreundschaftsspiele, den Almanach sowie Tabellen, Stärken, Ligaspiele, übrige Spiele, Spielerstatistiken, Fairplay und die große Statistikansicht an die +vorhandenen Wizard eine echte Karriere oder lädt eine Modern-OBS-Karriere und bindet Schreibtisch, Trainingslager, Aufstellung, Taktik, Training, Bank, Eintrittspreis, Umfeld, Werbung, Spielerverträge, Vereinskalender, Spielverlegung, Vereins-/Nationalfreundschaftsspiele, den Almanach sowie Tabellen, Stärken, Ligaspiele, übrige Spiele, Spielerstatistiken, Fairplay, die große Statistikansicht und Toto an die Session. Kader und Profile zeigen die tatsächlichen Sessionwerte; Spielertausch verwendet die bestätigte Engineaktion. Preisbestätigung, Buchung und Speichern als neue OBS-Datei sind echte Engineoperationen. Die vorhandenen Speichern-/Laden-Fenster verwalten echte OBS-Dateien diff --git a/docs/new_ui/desktop/toto/README.md b/docs/new_ui/desktop/toto/README.md index 5294837..cf41ecf 100644 --- a/docs/new_ui/desktop/toto/README.md +++ b/docs/new_ui/desktop/toto/README.md @@ -51,3 +51,51 @@ Classic und OBW-Format bleiben davon unberührt. Die synthetischen Tests prüfen unabhängige Spalten, leere/teilweise Scheine, tiefe Ergebniskopien, Geldpräzision, Revisionsschutz und Wiederherstellung. Renderer-/HTML-Vergleich: [gemeinsame Menü-QA](../../menu-qa.md). + +## Reale Modern-Karriere + +Der Engine-Einstieg verwendet denselben roten Sechs-Spalten-Schein mit Kreuzen. +Begegnungen, Vereinsreferenzen, Liga, Standdatum, gespeicherte Spalten und letzte +Abrechnung kommen aus `ui_read({kind:"toto"})`. Es gibt keine feste Spielrunde 27 +und kein synthetisches Spielprogramm. Bei unvollständigem Programm bleibt die +Abgabe gesperrt. Im Nationalmodus gibt es keinen Vereins-Toto. + +Die Bedienung ändert zunächst ausschließlich den lokalen Entwurf. Der Einsatz +ist **je Spalte** und wird im Zahlendialog in ganzen Euro bearbeitet. Vor der +Abgabe fordert die UI eine reine Kostenprüfung für genau diesen Entwurf an. +Sie zeigt Gesamtbetrag und enthaltene Zusatzgebühr; erst die Bestätigung sendet +`toto.submit` mit Karriere, Manager und Revision. Die Engine rechnet den Schein +am Ende des Spieltags ab. Ein neuer bestätigter Schein ersetzt den bisherigen. +Leeren aller vorgemerkten Spalten kann nach Rückfrage den Schein zurückziehen. + +Vorschläge vergleichen die tatsächlichen gespeicherten Mannschaftsstärken; +unbekannte Werte werden neutral mit Unentschieden vorgeschlagen. Zusatzspalten +variieren jeweils ein anderes Spiel. Die Vorschläge ziehen keine Zufallszahl +und greifen nicht in den Spielablauf ein. Doppelte Spalten und unzulässige +Gesamteinsätze weist die autoritative Kostenprüfung zurück. + +Aktuelle vorgemerkte Tipps bleiben nach OBS-Neustart erhalten. Gibt es keinen +aktiven Schein, öffnet der bisherige Scheinbutton gegebenenfalls die tatsächlich +vorhandene letzte Abrechnung mit Treffern je Spalte, bezahltem Betrag und Gewinn. +Nicht gespeicherte frühere Tipps werden nicht rekonstruiert. Spielstände und +Weltformat bleiben unverändert (`pools` war bereits Teil der Modern-Karriere). + +Engine-Money trägt zwei Dezimalstellen, unabhängig von der Importwährung im +Weltmanifest. Einsatz, Scheinbestätigung und Abrechnung verwenden diese Einheit +explizit; das verhindert eine hundertfach vergrößerte Anzeige bei Importwelten +mit ganzzahligen Originalbeträgen. + +### Meilensteinprüfung + +60 synthetische Regressionstests, 120 Haupt-GUI-Prüfungen, 26 Randfälle, +11.092 Text-/Buttonpositionsprüfungen und zwei native Demo-Prüfungen bestanden. +Drei Themes in 1080p sowie Silver in 720p. Zusätzlich wurden die finalen +Steuerelementlayouts mit acht gezielten Tests geprüft. Eine echte Karriere +wurde bis zum vollständigen Programm mit elf Spielen geführt, zwei Spalten +über den tatsächlichen Spieltag abgerechnet und erneut geladen. Die GUI +prüft auch sechs Spalten, überhöhten Einsatz, gleiche Spalten, bestätigte +Rücknahme, unvollständiges Programm und gesperrte Nationalrolle. +Vorschau, Abgabe und Rücknahme ziehen keine Spielzufallszahlen; die tatsächliche +Spieltagssimulation bei der Abrechnung bleibt regulär. Screenshots und passende +OBS liegen privat in `bmh_4k_ui/docs/qa/engine-toto-2026-10-29/`. +Native Ausführung Linux x64; Windows/macOS hier nicht ausgeführt. diff --git a/docs/new_ui/integration/ENGINE_ENTRY.md b/docs/new_ui/integration/ENGINE_ENTRY.md index 958ba9e..d662610 100644 --- a/docs/new_ui/integration/ENGINE_ENTRY.md +++ b/docs/new_ui/integration/ENGINE_ENTRY.md @@ -18,7 +18,7 @@ werden. Die Quelle wird nicht in DemoSource überführt. ## Gebundener Umfang -- `ModernSession::ui_read`: `session`, `desktop`, `file-metadata`, `camps`, `squad`, `lineup`, `tactics`, `training`, `bank`, `stadium`, `credit`, `environment`, `advertising`, `contracts`, `calendar`, `scheduling`, `friendly-plan`, `report-index`, `league-report`, `league-fixtures`, `other-index`, `other-fixtures`, `player-rankings`, `fairplay`, `statistics`; parameterisierte Angebote über `friendly` und Archivabfragen über `almanac`. Karriere, Manager, +- `ModernSession::ui_read`: `session`, `desktop`, `file-metadata`, `camps`, `squad`, `lineup`, `tactics`, `training`, `bank`, `stadium`, `credit`, `environment`, `advertising`, `contracts`, `calendar`, `scheduling`, `friendly-plan`, `report-index`, `league-report`, `league-fixtures`, `other-index`, `other-fixtures`, `player-rankings`, `fairplay`, `statistics`, `toto`; 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 @@ -364,3 +364,11 @@ Siehe [Speichern/Laden](../desktop/save-load/README.md). Der Engine-Einstieg Metadaten, bestätigtem Ersetzen, Umbenennen/Löschen und Import/Export. Der normale Hauptmenü-Ladeweg führt in dieselbe Bibliothek. Ein fehlerhafter Ladevorgang ersetzt die aktive Session nicht. Die Demo-Dateiverwaltung bleibt separat. + + +## Toto + +Die bestehende Sechs-Spalten-Oberfläche ist an den tatsächlichen +[Toto-Read und die Abgabe](../desktop/toto/README.md) angebunden. Entwürfe, +Vorschläge und Kostenprüfungen sind rein; erst die bestätigte Abgabe oder +Rücknahme ändert die Karriere. Die Abrechnung bleibt am Spieltagsende. diff --git a/src/modern/app/modern_session.cpp b/src/modern/app/modern_session.cpp index bc4de27..8b3e015 100644 --- a/src/modern/app/modern_session.cpp +++ b/src/modern/app/modern_session.cpp @@ -5,6 +5,7 @@ #include "modern/content/press_journal.hpp" #include "modern/content/world_expand.hpp" #include "modern/content/world_package.hpp" +#include "modern/content/toto_quote.hpp" #include "modern/content/world_save.hpp" #include "modern/game/balance_plan.hpp" #include "modern/game/bank_credit.hpp" @@ -10440,25 +10441,12 @@ cli::Json ModernSession::ui_command(const cli::Json& request, uint64_t& revision {"terminationReason", "last_human_resigned"}}; } else if (kind == "toto.submit") { // payload {stake: Money per column, columns: [[11 tips: 1 home, 0 draw, 2 away], ... up to 6]} - const cli::Json* stake = ui_field(*payload, "stake"); - const cli::Json* columns = ui_field(*payload, "columns"); - int64_t cents = -1; - try { cents = stake ? std::stoll(ui_text(*stake, "minor")) : -1; } catch (const std::exception&) { cents = -1; } - if (cents <= 0 || cents % 100 || !columns || !columns->array()) return refuse("invalid_payload", "stake (Money) und columns nötig."); - std::vector> tips; - for (const auto& column : *columns->array()) { - const auto* c = column.array(); - if (!c || c->size() != 11) return refuse("invalid_payload", "Jede Spalte hat elf Tipps."); - std::array t{}; - for (size_t i = 0; i < 11; ++i) { - if (!(*c)[i].integer() || *(*c)[i].integer() < 0 || *(*c)[i].integer() > 2) return refuse("invalid_payload", "Tipps sind 0, 1 oder 2."); - t[i] = uint8_t(*(*c)[i].integer()); - } - tips.push_back(t); - } - if (!dispatch_pools_columns(manager, uint32_t(cents / 100), tips, revision, error)) { restore(); return refuse("toto_refused", error); } + const auto draft=modern::parse_toto_draft(*payload); + if(!draft)return refuse("invalid_payload","Ein gültiger Euro-Einsatz und vollständige Spalten sind nötig."); + const auto &tips=draft->columns; + if (!dispatch_pools_columns(manager, draft->stake, tips, revision, error)) { restore(); return refuse("toto_refused", error); } revision = previous + 1; - answer = modern::ui_command_result(request_id, previous, revision, {"toto", "desktop"}, "Tippschein abgegeben."); + answer = modern::ui_command_result(request_id, previous, revision, {"toto", "desktop"}, draft->stake==0?"Tippschein zurückgezogen.":"Tippschein abgegeben."); } else if (kind == "sponsor.answer") { // payload {accept: bool}: the answer to the exclusive sponsor offer from a camp stay const cli::Json* accept = ui_field(*payload, "accept"); diff --git a/src/modern/content/projections.cpp b/src/modern/content/projections.cpp index b60b5c2..456a512 100644 --- a/src/modern/content/projections.cpp +++ b/src/modern/content/projections.cpp @@ -336,9 +336,13 @@ J toto(const ModernState& g, int manager) { const uint32_t matches_at = ::bmh::layout::DeskActions_SubmitPoolsCoupon_RuntimeField; const int count = mem.has(::bmh::layout::CareerSession_DispatchToto_RuntimeField) ? mem.u8(::bmh::layout::CareerSession_DispatchToto_RuntimeField) : 0; A matches; - for (int k = 0; k < count && k < 11 && mem.has(matches_at + uint32_t(k) * 4 + 3); ++k) - matches.push_back(O{{"home", club_json(g, mem.u16(matches_at + uint32_t(k) * 4))}, - {"away", club_json(g, mem.u16(matches_at + uint32_t(k) * 4 + 2))}}); + for (int k = 0; k < count && k < 11 && mem.has(matches_at + uint32_t(k) * 4 + 3); ++k) { + const int home=mem.u16(matches_at+uint32_t(k)*4),away=mem.u16(matches_at+uint32_t(k)*4+2),league=team_league(home); + const auto saved_squad=[&](int team){const auto range=squad_range(team);return range.count&&range.first<=g.squad_slots.size()&&range.count<=g.squad_slots.size()-range.first;}; + J suggested=nullptr; + if(saved_squad(home)&&saved_squad(away)){const auto h=team_average(g,home,0xff),a=team_average(g,away,0xff);if(h.players>0&&a.players>0)suggested=h.value>a.value?1:h.value=0&&league +#include +namespace bmh::modern { +std::optional parse_toto_draft(const cli::Json &request) { + try { + const auto* object=request.object();if(!object)return {}; + const auto* money=object->at("stake").object();const auto* columns=object->at("columns").array(); + if(!money||!columns||columns->size()>64||!money->at("currency").string()||*money->at("currency").string()!="EUR"||!money->at("minorUnits").integer()||*money->at("minorUnits").integer()!=2||!money->at("minor").string())return {}; + const auto &raw=*money->at("minor").string();int64_t cents=-1;const auto parsed=std::from_chars(raw.data(),raw.data()+raw.size(),cents); + if(raw.empty()||parsed.ec!=std::errc()||parsed.ptr!=raw.data()+raw.size()||cents<0||cents%100||uint64_t(cents/100)>std::numeric_limits::max()||(cents==0&&!columns->empty()))return {}; + TotoDraft out;out.stake=uint32_t(cents/100); + for(const auto &column:*columns){const auto* values=column.array();if(!values||values->size()!=11)return {};std::array row{};for(size_t i=0;i2)return {};row[i]=uint8_t(*value);}out.columns.push_back(row);} + return out; + }catch(const std::exception&){return {};} +} +cli::Json quote_toto_draft(const ModernState &state,int manager,const cli::Json &request) { + using O=cli::Json::Object; + const auto refused=[](const char *code){return cli::Json(O{{"allowed",false},{"errorCode",code},{"cost",nullptr},{"fee",nullptr}});}; + const auto draft=parse_toto_draft(request);if(!draft)return refused("invalid_toto_draft"); + if(manager<0||size_t(manager)>=state.manager_teams.size()||state.manager_teams[size_t(manager)]<0||state.manager_teams[size_t(manager)]>=league_clubs())return refused("no_club"); + if(!state.memory.has(::bmh::layout::CareerSession_DispatchToto_RuntimeField)||state.memory.u8(::bmh::layout::CareerSession_DispatchToto_RuntimeField)!=11)return refused("toto_coupon_requires_eleven_matches"); + ModernState copy=state; + switch(modern::submit_pools_columns(copy,manager,draft->stake,draft->columns)) { + case PoolsColumnsResult::ok:break; + case PoolsColumnsResult::too_many_columns:return refused("too_many_columns"); + case PoolsColumnsResult::stake_out_of_range:return refused("stake_out_of_range"); + case PoolsColumnsResult::total_too_high:return refused("total_stake_too_high"); + case PoolsColumnsResult::duplicate_column:return refused("duplicate_column"); + case PoolsColumnsResult::invalid:return refused("invalid_toto_coupon"); + } + const int64_t cost=modern::pools_cost(draft->stake,draft->columns.size()); + return O{{"allowed",true},{"errorCode",nullptr},{"cost",ui_money(cost)},{"fee",ui_money(cost-int64_t(draft->stake)*int64_t(draft->columns.size()))},{"columnCount",int(draft->columns.size())},{"clearing",draft->stake==0},{"payload",request},{"settlement","end_of_matchday"}}; +} +} diff --git a/src/modern/content/toto_quote.hpp b/src/modern/content/toto_quote.hpp new file mode 100644 index 0000000..f3d4f69 --- /dev/null +++ b/src/modern/content/toto_quote.hpp @@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-3.0-only +#pragma once +#include "cli/json.hpp" +#include "modern/game/modern_state.hpp" +#include +#include +namespace bmh::modern { +struct TotoDraft {uint32_t stake=0;std::vector> columns;}; +std::optional parse_toto_draft(const cli::Json&); +// Executes the existing submission validation on a private state copy, without random streams. +cli::Json quote_toto_draft(const ModernState&,int manager,const cli::Json&); +} diff --git a/src/modern/content/ui_contract.cpp b/src/modern/content/ui_contract.cpp index 8551e57..fdb5409 100644 --- a/src/modern/content/ui_contract.cpp +++ b/src/modern/content/ui_contract.cpp @@ -16,6 +16,7 @@ #include "modern/content/statistics.hpp" #include "modern/content/world_package.hpp" #include "modern/content/world_save.hpp" +#include "modern/content/toto_quote.hpp" #include "modern/game/almanac.hpp" #include "modern/game/desk_actions.hpp" #include "modern/game/environment.hpp" @@ -729,6 +730,7 @@ cli::Json ui_read(const ModernState& g, const UiContext& c, const cli::Json& req o->erase("ok"); const auto money = [](J& v) { if (v.integer()) v = ui_money(*v.integer()); }; if (kind == "toto") { + if(const auto* draft=field(request,"draft"))(*o)["draftQuote"]=quote_toto_draft(g,c.manager,*draft); money((*o)["stake"]), money((*o)["cost"]); auto& last = std::get((*o)["last"].value); money(last["paid"]), money(last["won"]); diff --git a/src/modern/ui/CMakeLists.txt b/src/modern/ui/CMakeLists.txt index eb125ea..5068c6c 100644 --- a/src/modern/ui/CMakeLists.txt +++ b/src/modern/ui/CMakeLists.txt @@ -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 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 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) +foreach(component career_reports rankings career_files statistics_projection toto_projection) add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp) target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core) if(MSVC) diff --git a/src/modern/ui/engine_bridge.cpp b/src/modern/ui/engine_bridge.cpp index dc6ca35..112cf77 100644 --- a/src/modern/ui/engine_bridge.cpp +++ b/src/modern/ui/engine_bridge.cpp @@ -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"})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"})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()},{"until",season.at("endDate").get()}},revision)); bundle["scheduling"]=from_engine(session.ui_read(cli::Json::Object{{"kind","scheduling"}},revision));return bundle; diff --git a/src/modern/ui/engine_bridge.hpp b/src/modern/ui/engine_bridge.hpp index b578b85..35ec6db 100644 --- a/src/modern/ui/engine_bridge.hpp +++ b/src/modern/ui/engine_bridge.hpp @@ -62,6 +62,9 @@ Json engine_other_projection(const Json &bundle,const Json &index,const Json &re Json engine_rankings_projection(const Json &bundle,const Json &index,const Json &read,const std::string &league,int scope); Json engine_fairplay_projection(const Json &bundle,const Json &index,const Json &read); +Json engine_toto_projection(const Json &bundle); +Json engine_toto_command(const Json &bundle,const Json "e,const std::string &request_id); + Json engine_statistics_projection(const Json &bundle,const Json &read); Json engine_opening_projection(const Json &bundle,const Json &read); diff --git a/src/modern/ui/engine_controls.inc b/src/modern/ui/engine_controls.inc index aabc54f..82c59ad 100644 --- a/src/modern/ui/engine_controls.inc +++ b/src/modern/ui/engine_controls.inc @@ -29,6 +29,7 @@ void App::engine_accept(EngineReply result) { engine_reports_sync(); engine_almanac_sync(); engine_ticket_bind(); + engine_toto_poll(); engine_contracts_poll(); engine_calendar_sync(); engine_friendly_sync(); @@ -44,6 +45,7 @@ void App::engine_poll() { try { auto result = engine_job_.get(); validate_engine_desk(result.bundle); + if(result.response.value("messageType","")=="toto_preview"){engine_toto_preview(result);refresh();return;} if(result.response.value("messageType","")=="reports_preview"){engine_reports_poll(result);refresh();return;} if(result.response.value("messageType","")=="almanac_preview"){engine_almanac_poll(result);refresh();return;} if (result.response.value("messageType", "") == "friendly_preview") { @@ -160,6 +162,7 @@ void App::engine_event(Rml::Event &event) { if(files_native_&&files_event(event))return; if (engine_reports_event(event)) return; if(menu_=="statistics"&&statistics_event(event))return; + if(menu_=="toto"&&toto_event(event))return; if(!engine_busy_&&popup_.empty()&&rankings_event(event))return; if (!engine_busy_ && popup_.empty() && engine_friendly_event(event)) return; if (!engine_busy_ && planning_dialog_.empty() && popup_.empty() && (menu_ == "friendlies" || menu_ == "almanac" || menu_=="tables" || menu_=="strengths" || menu_=="league" || menu_=="other" || menu_=="scorers" || menu_=="statistics") && report_picker_event(event)) return; @@ -252,6 +255,7 @@ void App::engine_event(Rml::Event &event) { if(action.starts_with("rankings-")&&menu_=="scorers"){rankings_action(action,node);return;} if (engine_reports_action(action,node)) return; if(menu_=="statistics"&&statistics_action(action,node))return; + if(menu_=="toto"&&toto_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; @@ -268,6 +272,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=="toto"){menu_=id;engine_toto_sync();refresh();} else if(action=="engine-open"&&id=="statistics"){menu_=id;engine_reports_sync();engine_statistics_load();} else if(action=="engine-open"&&id=="load"){engine_files_begin("load");} else if(action=="engine-open"&&id=="scorers"){menu_=id;engine_reports_sync();engine_rankings_load(engine_rankings_state_.at("league"),engine_rankings_state_.at("scope"));} @@ -300,5 +305,5 @@ void App::engine_event(Rml::Event &event) { } Json App::engine_snapshot() const { return {{"mode", engine_mode_}, {"creation_busy",engine_creation_busy_}, {"busy", engine_busy_}, {"dirty", engine_dirty_}, {"fresh", engine_fresh_}, {"bundle", engine_data_}, - {"response", engine_response_}, {"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_}}; + {"response", engine_response_}, {"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_}}; } diff --git a/src/modern/ui/engine_files.inc b/src/modern/ui/engine_files.inc index 731ada8..3d64af8 100644 --- a/src/modern/ui/engine_files.inc +++ b/src/modern/ui/engine_files.inc @@ -21,7 +21,7 @@ void App::engine_files_poll() { try { auto result=engine_files_job_.get(); if(result.operation=="loaded") { - engine_reports_context_=Json();engine_almanac_context_=Json();engine_friendly_read_=Json();engine_friendly_stage_=0;engine_calendar_season_.clear();engine_calendar_day_=-1;engine_move_id_.clear();report_detail_kind_.clear();engine_player_.clear();lineup_selected_.clear();engine_opening_state_=Json();engine_opening_read_=Json(); + engine_toto_context_=Json();engine_toto_quote_=Json();engine_reports_context_=Json();engine_almanac_context_=Json();engine_friendly_read_=Json();engine_friendly_stage_=0;engine_calendar_season_.clear();engine_calendar_day_=-1;engine_move_id_.clear();report_detail_kind_.clear();engine_player_.clear();lineup_selected_.clear();engine_opening_state_=Json();engine_opening_read_=Json(); engine_mode_=true;engine_dirty_=engine_base_dirty_=false;engine_accept(std::move(*result.engine));source_.reset();entry_catalog_.reset();engine_files_current_id_=result.selected;engine_files_pending_load_.reset();scene_="engine";menu_.clear();reset_files();refresh();return; } files_rows_=std::move(result.rows);if(result.metadata.is_object())engine_files_metadata_=std::move(result.metadata); diff --git a/src/modern/ui/engine_screens.inc b/src/modern/ui/engine_screens.inc index dd328a8..905abb5 100644 --- a/src/modern/ui/engine_screens.inc +++ b/src/modern/ui/engine_screens.inc @@ -120,7 +120,7 @@ void App::engine_render() { const auto route = id.substr(4); const bool camp_allowed = desk.at("menuAvailability").at("camps").value("status", "") == "available"; const auto commands = meta.at("scope").value("allowedCommands", Json::array()); - const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || (route=="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=="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=="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_); } } @@ -129,6 +129,7 @@ void App::engine_render() { if(menu_=="scorers")out+="
"+window("Spielerstatistiken",engine_rankings_value_.is_object()?render_scorers():"
"+esc(engine_busy_?"Spielerstatistiken werden geladen …":engine_notice_)+"
")+"
"; if(menu_=="fairplay")out+="
"+window("Fairplay",engine_fairplay_value_.is_object()?render_fairplay():"
"+esc(engine_busy_?"Fairplay wird geladen …":engine_notice_)+"
")+"
"; if(menu_=="other")out+="
"+window("Übrige Spiele",engine_other_value_.is_object()?render_reports("other"):"
"+esc(engine_busy_?"Wettbewerbe werden geladen …":engine_other_index_.is_object()?"Keine aktiven Wettbewerbe.":engine_notice_)+"
")+"
"; + if(menu_=="toto")out+="
"+window("Toto",render_toto())+"
"; if(menu_=="statistics")out+="
"+window("Statistiken",engine_statistics_value_.is_object()?render_statistics():"
"+esc(engine_busy_?"Statistik wird geladen …":engine_notice_)+"
")+"
"; if(menu_=="league")out+="
"+window("Ligaspiele",engine_fixtures_value_.is_object()?render_reports("league"):"
"+esc(engine_busy_?"Ligaspiele werden geladen …":engine_notice_)+"
")+"
"; if(menu_=="tables"||menu_=="strengths")out+="
"+window(menu_=="tables"?"Tabelle":"Stärken",engine_reports_read_.is_object()?render_reports(menu_):"
"+esc(engine_busy_?"Ligabericht wird geladen …":engine_notice_)+"
")+"
"; @@ -171,6 +172,7 @@ void App::engine_render() { 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(!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);} if (engine_busy_) { Rml::ElementList controls; doc_->QuerySelectorAll(controls, "#canvas button,#canvas input"); diff --git a/src/modern/ui/engine_state.inc b/src/modern/ui/engine_state.inc index 98c10e5..7f0eb4d 100644 --- a/src/modern/ui/engine_state.inc +++ b/src/modern/ui/engine_state.inc @@ -100,3 +100,15 @@ Json statistics_data() const; void engine_statistics_load(); bool engine_statistics_player(const std::string &,Rml::Element *); + + Json engine_toto_context_,engine_toto_value_,engine_toto_edit_,engine_toto_quote_; + std::string engine_toto_feedback_; + bool engine_toto_submitting_=false; + void engine_toto_sync(); + void engine_toto_review(); + void engine_toto_preview(const EngineReply &); + void engine_toto_poll(); + bool engine_toto_action(const std::string &,Rml::Element *); + Json toto_value() const; + Json toto_summary() const; + Json toto_programme() const; diff --git a/src/modern/ui/engine_toto.cpp b/src/modern/ui/engine_toto.cpp new file mode 100644 index 0000000..64a6edf --- /dev/null +++ b/src/modern/ui/engine_toto.cpp @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/engine_bridge.hpp" +#include +namespace bmh::modern_ui { +namespace { +void check(bool value,const char *message){if(!value)throw editor::Error(message);} +const Json& toto_read(const Json &bundle,const Json &read) { + validate_engine_desk(bundle);check(read.value("messageType","")=="snapshot"&&read.at("data").value("kind","")=="toto","Toto ist an diesem Schreibtisch nicht verfügbar."); + for(const auto *key:{"contractVersion","careerId","worldId","worldRevision","stateRevision","scope"})check(read.at("meta").at(key)==bundle.at("desktop").at("meta").at(key),"Der Tippscheinkontext hat sich geändert."); + return read.at("data"); +} +} +Json engine_toto_projection(const Json &bundle) { + const auto &data=toto_read(bundle,bundle.at("toto"));const auto &meta=bundle.at("desktop").at("meta"); + check(meta.at("scope").at("role")=="club","Toto ist im Nationalmodus nicht verfügbar."); + const auto &rules=data.at("rules");check(rules.at("max_columns")==6&&rules.at("stake_min").is_number_integer()&&rules.at("stake_max").is_number_integer(),"Unbekannte Tippscheinregeln."); + Json columns=Json::array();for(int col=0;col<6;++col)columns.push_back(Json::array({-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1})); + check(data.at("columns").is_array()&&data.at("columns").size()<=6,"Ungültige gespeicherte Spalten."); + for(size_t col=0;col()>=0&&pick.get()<=2,"Ungültiges Tippzeichen.");columns[col]=row;} + const auto stake=engine_money_minor(data.at("stake")),cost=engine_money_minor(data.at("cost"));const bool registered=stake>0&&!data.at("columns").empty(); + const auto date=meta.at("date").get();check(date.size()==10,"Tippscheindatum fehlt.");const auto caption="Stand "+date.substr(8,2)+"."+date.substr(5,2)+"."+date.substr(0,4); + Json rows=Json::array(),suggestions=Json::array(); + for(const auto &match:data.at("matches")) { + const auto &home=match.at("home"),&away=match.at("away");check(home.at("id").is_string()&&away.at("id").is_string(),"Spielprogramm ohne Vereinskennung."); + std::string league="—";if(match.value("league",Json()).is_object()){const auto &l=match.at("league");league=l.at("index")==0?"1. BL":l.at("index")==1?"2. BL":l.at("name").get();} + rows.push_back({{"home",home.at("id")},{"away",away.at("id")},{"home_ref",home},{"away_ref",away},{"league_label",league}}); + const auto pick=match.value("suggested",Json());check(pick.is_null()||(pick.is_number_integer()&&pick.get()>=0&&pick.get()<=2),"Ungültiger Tippvorschlag.");suggestions.push_back(pick.is_null()?Json(0):pick); + } + check(rows.size()<=11,"Zu viele Begegnungen im Spielprogramm."); + const auto &last=data.at("last");Json last_view={{"paid",engine_money_minor(last.at("paid"))},{"won",engine_money_minor(last.at("won"))},{"hits",last.at("hits")}}; + return {{"programme",{{"rows",rows},{"complete",data.at("open")==true&&rows.size()==11},{"season",meta.at("season").at("label")},{"caption",caption},{"print_caption",date.substr(8,2)+"."+date.substr(5,2)+"."+date.substr(0,4)}}},{"suggestions",suggestions},{"rules",rules},{"registered",registered},{"columns",columns},{"stake",registered?stake:rules.at("stake_min").get()*100},{"coupon",registered?Json{{"columns",columns},{"stake",cost}}:Json()},{"last",last_view}}; +} +Json engine_toto_command(const Json &bundle,const Json "e,const std::string &request_id) { + const auto &data=toto_read(bundle,quote);const auto &offer=data.at("draftQuote");check(offer.value("allowed",false),"Dieser Schein kann nicht abgegeben werden.");(void)engine_money_minor(offer.at("cost")); + const auto &meta=bundle.at("desktop").at("meta");const auto commands=meta.at("scope").at("allowedCommands");check(std::find(commands.begin(),commands.end(),Json("toto.submit"))!=commands.end(),"An diesem Schreibtisch darf kein Tippschein abgegeben werden."); + return {{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"careerId",meta.at("careerId")},{"requestId",request_id},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","toto.submit"},{"payload",offer.at("payload")}}; +} +} diff --git a/src/modern/ui/engine_toto.inc b/src/modern/ui/engine_toto.inc new file mode 100644 index 0000000..d88cc8a --- /dev/null +++ b/src/modern/ui/engine_toto.inc @@ -0,0 +1,75 @@ +// SPDX-License-Identifier: GPL-3.0-only +namespace { +Json toto_draft_payload(const Json &edit) { + Json columns=Json::array();for(const auto &column:edit.at("columns"))if(std::any_of(column.begin(),column.end(),[](const auto &pick){return pick!=-1;}))columns.push_back(column); + const int64_t stake=columns.empty()?0:edit.at("stake").get();return {{"stake",{{"currency","EUR"},{"minorUnits",2},{"minor",std::to_string(stake)}}},{"columns",columns}}; +} +std::string toto_error(const std::string &code) { + if(code=="duplicate_column")return "Zwei Spalten sind gleich. Bitte ändere einen Tipp."; + if(code=="total_stake_too_high")return "Der Gesamteinsatz überschreitet die zulässige Grenze."; + if(code=="stake_out_of_range")return "Der Einsatz liegt außerhalb des zulässigen Bereichs."; + if(code=="toto_coupon_requires_eleven_matches")return "Es liegt gerade kein vollständiges Spielprogramm vor."; + if(code=="too_many_columns")return "Es sind höchstens sechs Tipp-Spalten möglich."; + return "Dieser Schein ist nicht gültig. Bitte prüfe die Eingaben."; +} +} +Json App::toto_value() const {return engine_mode_?engine_toto_edit_:snap().state.at("toto");} +Json App::toto_programme() const {return engine_mode_?engine_toto_value_.at("programme"):demo_toto_programme(*world_);} +Json App::toto_summary() const { + if(!engine_mode_)return demo_toto_summary(snap().state,*world_); + Json counts=Json::array();int complete=0,partial=0; + for(const auto &col:engine_toto_edit_.at("columns")){const int n=int(std::count_if(col.begin(),col.end(),[](const auto &pick){return pick!=-1;}));counts.push_back(n);complete+=n==11;partial+=n>0&&n<11;} + return {{"ok",true},{"counts",counts},{"complete",complete},{"partial",partial},{"can_submit",!partial&&(complete>0||(complete==0&&engine_toto_value_.at("registered")==true))}}; +} +void App::engine_toto_sync() { + const auto &meta=engine_data_.at("desktop").at("meta");if(meta==engine_toto_context_)return; + engine_toto_context_=meta;engine_toto_quote_=Json();engine_toto_value_=Json();engine_toto_edit_=Json();toto_dialog_.clear();engine_toto_feedback_.clear(); + try {engine_toto_value_=engine_toto_projection(engine_data_);engine_toto_edit_={{"columns",engine_toto_value_.at("columns")},{"stake",engine_toto_value_.at("stake")},{"coupon",engine_toto_value_.at("coupon")}}; + for(size_t col=0;colsnapshot();return EngineReply{link,bundle,{{"messageType","toto_preview"},{"draft",draft},{"read",link->read({{"kind","toto"},{"draft",draft}})}},nullptr};}); +} +void App::engine_toto_preview(const EngineReply &reply) { + const auto &read=reply.response.at("read");if(reply.bundle.at("desktop").at("meta")!=engine_toto_context_||reply.response.at("draft")!=toto_draft_payload(engine_toto_edit_))throw editor::Error("Der Tippscheinkontext hat sich geändert."); + if(read.value("messageType","")!="snapshot"){engine_toto_feedback_="Die Kosten konnten nicht geprüft werden.";return;} + const auto "e=read.at("data").at("draftQuote");engine_toto_quote_=read; + if(!quote.value("allowed",false)){engine_toto_feedback_=toto_error(quote.value("errorCode",""));return;} + const auto request=engine_toto_command(reply.bundle,read,editor::new_id("request:ui-")),context=engine_toto_context_; + const bool clear=quote.at("clearing");std::string text=clear?"Den vorgemerkten Tippschein zurückziehen?":std::to_string(quote.at("columnCount").get())+std::string(quote.at("columnCount")==1?" Tipp-Spalte für insgesamt ":" Tipp-Spalten für insgesamt ")+engine_price(quote.at("cost"))+(engine_toto_value_.at("registered")==true?" übernehmen und den bisherigen Schein ersetzen?":" abgeben?"); + if(!clear){if(engine_money_minor(quote.at("fee"))>0)text+=" Darin enthaltene Bearbeitungsgebühr: "+engine_price(quote.at("fee"))+".";text+=" Abrechnung am Ende des Spieltags.";} + confirmation(text,[this,request,context]{if(!engine_fresh_||engine_data_.at("desktop").at("meta")!=context){message("Die Partie hat sich geändert. Bitte den Schein erneut prüfen.");return;}engine_toto_submitting_=true;auto link=engine_link_;engine_start("Tippschein wird übernommen …",[link,request]{const auto response=link->command(request);return EngineReply{link,link->snapshot(),response,nullptr};});});popup_accept_=clear?"Zurückziehen":"Abgeben"; +} +bool App::engine_toto_action(const std::string &action,Rml::Element *target) { + if(engine_busy_||!engine_fresh_||!engine_toto_value_.is_object())return true; + if(action=="toto-dialog-close"){toto_dialog_.clear();focus_after_render_=toto_return_focus_;refresh();return true;} + if(!toto_dialog_.empty()||amount_||!popup_.empty())return true; + const auto edited=[&]{engine_toto_quote_=Json();engine_toto_feedback_="Entwurf · Noch nicht abgegeben.";refresh();}; + const int column=target?target->GetAttribute("data-column",-1):-1; + if(action=="toto-column"){if(column>=0&&column<6){toto_column_=column;focus_after_render_="toto-column-"+std::to_string(column);refresh();}return true;} + if(action=="toto-stake") { + const auto context=engine_toto_context_;AmountRequest request;request.title="TOTO · Einsatz je Spalte";request.unit="€";request.return_focus="toto-stake";request.value=engine_toto_edit_.at("stake").get()/100;request.min=engine_toto_value_.at("rules").at("stake_min");request.max=engine_toto_value_.at("rules").at("stake_max");request.suggestion_step=10000;request.review=false; + request.accept=[this,context](int64_t value){if(menu_!="toto"||engine_toto_context_!=context||value()||value>engine_toto_value_.at("rules").at("stake_max").get())return false;engine_toto_edit_["stake"]=value*100;engine_toto_quote_=Json();engine_toto_feedback_="Entwurf · Noch nicht abgegeben.";refresh();return true;};open_amount(std::move(request));return true; + } + if(action=="toto-pick") { + const int row=target->GetAttribute("data-row",-1),pick=target->GetAttribute("data-pick",-1);if(column<0||column>=6||row<0||row>=11||pick<0||pick>2)return true;auto &value=engine_toto_edit_["columns"][size_t(column)][size_t(row)];value=value==pick?Json(-1):Json(pick);toto_column_=column;toto_focus_[size_t(column)]={row,pick};focus_after_render_=toto_pick_id(column,row,pick);edited();return true; + } + if(action=="toto-auto"||action=="toto-clear") { + auto &column=engine_toto_edit_["columns"][size_t(toto_column_)];for(size_t row=0;row<11;++row)column[row]=action=="toto-clear"?Json(-1):row0){auto &pick=column[size_t(toto_column_-1)];pick=pick==0?1:0;} + const int pick=column[0];toto_focus_[size_t(toto_column_)]={0,pick<0?1:pick};focus_after_render_=action=="toto-clear"?"toto-column-"+std::to_string(toto_column_):"toto-auto";edited();return true; + } + if(action=="toto-submit"){engine_toto_review();return true;} + if(action=="toto-last"){toto_dialog_=engine_toto_edit_.at("coupon").is_null()?"settlement":"receipt";toto_return_focus_="toto-last";focus_after_render_="toto-dialog-close";refresh();return true;} + return true; +} diff --git a/src/modern/ui/toto_controls.inc b/src/modern/ui/toto_controls.inc index ad27a48..bc31017 100644 --- a/src/modern/ui/toto_controls.inc +++ b/src/modern/ui/toto_controls.inc @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-3.0-only bool App::toto_action(const std::string &action, Rml::Element *target) { if (menu_ != "toto" || !action.starts_with("toto-")) return false; + if(engine_mode_)return engine_toto_action(action,target); if (action == "toto-dialog-close") { toto_dialog_.clear(); focus_after_render_ = toto_return_focus_; refresh(); return true; } diff --git a/src/modern/ui/toto_screens.inc b/src/modern/ui/toto_screens.inc index 5117640..8b3de05 100644 --- a/src/modern/ui/toto_screens.inc +++ b/src/modern/ui/toto_screens.inc @@ -5,19 +5,19 @@ std::string toto_pick_id(int col, int row, int pick) { } } std::string App::render_toto() { - const auto state = snap().state; - const auto &t = state.at("toto"); - const auto summary = demo_toto_summary(state, *world_), programme = demo_toto_programme(*world_); + const auto t=toto_value(); + const auto toto_cash=[&](int64_t value){return engine_mode_?money(value,{{"code","EUR"},{"minor_units",2}}):cash(value);}; + const auto summary=toto_summary(),programme=toto_programme(); const bool available = programme.at("complete").get(); const auto &games = programme.at("rows"); const std::array picks{1, 0, 2}; std::string out = "
" - "

Die Begegnungen

Spielprogramm

Spielrunde 27 · Saison " + esc(programme.at("season").get()) + + "

Die Begegnungen

Spielprogramm

"+esc(programme.value("caption",std::string("Spielrunde 27")))+" · Saison " + esc(programme.at("season").get()) + "
Nr.Heim – GastLiga
"; - const auto club_name = [&](const Json *club, bool home) { - if (!club) return std::string("—"); - const auto name = "" + esc(world_->name(*club)) + "", logo = crest(club, 34); - return "name(*club)) + "\">" + + const auto club_name = [&](const Json *club, bool home,const Json &reference) { + const auto label=reference.is_object()?reference.at("name").get():club?world_->name(*club):std::string("—"); + const auto name = "" + esc(label) + "", logo = crest(club, 34); + return "" + (home ? name + logo : logo + name) + ""; }; for (int r = 0; r < 11; ++r) { @@ -26,14 +26,14 @@ std::string App::render_toto() { const auto *away = has ? world_->find("clubs", games[size_t(r)].at("away")) : nullptr; out += "
" "" + std::to_string(r + 1) + "
" + - club_name(home, true) + "
–
" + club_name(away, false) + - "
" + (has ? std::to_string(games[size_t(r)].at("tier").get()) + ". BL" : "—") + "
"; + club_name(home,true,has?games[size_t(r)].value("home_ref",Json()):Json()) + "
–
" + club_name(away,false,has?games[size_t(r)].value("away_ref",Json()):Json()) + + "
" + (has ? games[size_t(r)].value("league_label",std::to_string(games[size_t(r)].value("tier",0))+". BL") : "—") + ""; } out += "

" + std::string(available ? "Heim links · Gast rechts
Die Spielnummer steht in jeder Tipp-Spalte." : "Das Spielprogramm ist unvollständig.
Ein Schein kann derzeit nicht vorgemerkt werden.") + "

" "
" "
TOTO

ELFERWETTE

" - "
Spielschein11 Spiele · 6 Tipp-SpaltenSpielprogramm 27
"; + "
Spielschein11 Spiele · 6 Tipp-Spalten"+esc(programme.value("print_caption",std::string("Spielprogramm 27")))+"
"; const auto cross = renderer_.diagram("toto-ink-cross", "", 160); constexpr double col_width = 221.619792, gap = 14, pick_width = (col_width - 43) / 3; for (int c = 0; c < 6; ++c) { @@ -63,23 +63,24 @@ std::string App::render_toto() { out += "

" + (count == 0 ? "Leer" : count == 11 ? "Vollständig" : std::to_string(count) + " / 11") + "

"; } out += "

1 Heimsieg · 0 Unentschieden · 2 Auswärtssieg

" - "Pro Spiel und Spalte ein Kreuz. Leere Spalten bleiben unberücksichtigt.OpenBMH · Musterschein · Grafik-POC
"; + "Pro Spiel und Spalte ein Kreuz. Leere Spalten bleiben unberücksichtigt."+std::string(engine_mode_?"OpenBMH · Digitaler Tippschein":"OpenBMH · Musterschein · Grafik-POC")+""; const int complete = summary.at("complete"), partial = summary.at("partial"); out += "
" + std::to_string(complete) + (complete == 1 ? " vollständige Spalte" : " vollständige Spalten") + - "" + (partial ? std::to_string(partial) + (partial == 1 ? " Spalte noch unvollständig" : " Spalten noch unvollständig") : - "Spalte " + std::to_string(toto_column_ + 1) + " für Tippvorschlag und Leeren ausgewählt") + "

Einsatz gesamt " + esc(cash(t.at("stake"))) + "

"; + "" + (engine_mode_&&!engine_toto_feedback_.empty()?esc(engine_toto_feedback_):partial ? std::to_string(partial) + (partial == 1 ? " Spalte noch unvollständig" : " Spalten noch unvollständig") : + "Spalte " + std::to_string(toto_column_ + 1) + " für Tippvorschlag und Leeren ausgewählt") + "

"+std::string(engine_mode_?"Einsatz je Spalte":"Einsatz gesamt")+" " + esc(toto_cash(t.at("stake"))) + "

"; out += ""; + btn("toto-last", engine_mode_&&t.at("coupon").is_null()?"Letzte Abrechnung":"Letzter Schein", "toto-control", "id=\"toto-last\" " + std::string(t.at("coupon").is_null()&&(!engine_mode_||engine_toto_value_.at("last").at("paid").get()==0) ? "disabled" : "")) + ""; if (toto_dialog_.empty()) return out; + if(engine_mode_&&toto_dialog_=="settlement") {const auto &last=engine_toto_value_.at("last");std::string detail="

Letzte Toto-Abrechnung

SpalteTreffer
";size_t n=0;for(const auto &hit:last.at("hits"))detail+="
Spalte "+std::to_string(++n)+""+std::to_string(hit.get())+" Richtige
";return out+detail+"

Bezahlt "+esc(toto_cash(last.at("paid")))+" · Gewonnen "+esc(toto_cash(last.at("won")))+"

";} const auto &coupon = t.at("coupon"); if (coupon.is_null()) { toto_dialog_.clear(); return out; } std::vector active; for (int c = 0; c < 6; ++c) if (coupon.at("columns")[size_t(c)][0] != -1) active.push_back(c); out += "
" - "

" + std::string(toto_dialog_ == "receipt" ? "Letzter vorgemerkter Schein" : "Tippschein vorgemerkt") + "

"; + "

" + std::string(toto_dialog_ == "receipt" ? engine_mode_?"Aktuell vorgemerkter Schein":"Letzter vorgemerkter Schein" : "Tippschein vorgemerkt") + "

"; const auto caption = std::to_string(active.size()) + (active.size() == 1 ? " Spalte" : " Spalten"); if (toto_dialog_ == "receipt") { out += "
"; @@ -89,8 +90,8 @@ std::string App::render_toto() { (row == -1 ? "Spalte " + std::to_string(c + 1) : std::to_string(coupon.at("columns")[size_t(c)][size_t(row)].get())) + ""; out += "
"; } - out += "

" + caption + " · Einsatz gesamt " + esc(cash(coupon.at("stake"))) + "

"; - } else out += "

" + caption + " · " + std::to_string(active.size() * 11) + " Tipps · Einsatz gesamt " + esc(cash(coupon.at("stake"))) + "

"; + out += "

" + caption + " · Einsatz gesamt " + esc(toto_cash(coupon.at("stake"))) + "

"; + } else out += "

" + caption + " · " + std::to_string(active.size() * 11) + " Tipps · Einsatz gesamt " + esc(toto_cash(coupon.at("stake"))) + "

"; out += ""; return out; } diff --git a/src/modern/ui/view.cpp b/src/modern/ui/view.cpp index eec8824..20fe888 100644 --- a/src/modern/ui/view.cpp +++ b/src/modern/ui/view.cpp @@ -1542,6 +1542,7 @@ public: #include "modern/ui/engine_creation.inc" #include "modern/ui/engine_files.inc" #include "modern/ui/engine_statistics.inc" +#include "modern/ui/engine_toto.inc" } // namespace bool is_modern_world(const fs::path &file) { try { diff --git a/tests/modern_engine_bridge_probe.cpp b/tests/modern_engine_bridge_probe.cpp index d3b05f8..a2a4a3e 100644 --- a/tests/modern_engine_bridge_probe.cpp +++ b/tests/modern_engine_bridge_probe.cpp @@ -15,25 +15,26 @@ using namespace bmh::modern_ui; int main(int argc, char **argv) { try { const std::string mode=argc>1?argv[1]:""; - const std::set modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics"}; + const std::set modes{"prepare","prepare-two","prepare-national","prepare-almanac","inspect","inspect-friendlies","inspect-almanac","verify","verify-lineup","verify-sports","verify-bank","verify-commerce","verify-contracts","verify-calendar","verify-friendlies","verify-national","verify-almanac","verify-shootouts","verify-reports","verify-fixtures","verify-other","verify-rankings","prepare-rankings-archived","verify-create","inspect-coach-identity","prepare-coach-identity","verify-coach-almanac","verify-files","verify-statistics","prepare-statistics","inspect-statistics","prepare-toto","verify-toto","settle-toto"}; if(argc!=4||!modes.contains(mode))throw std::runtime_error("usage: modern_engine_bridge_probe "); const fs::path world = argv[2], out = argv[3]; fs::create_directories(out); const auto write = [&](const char *file, const Json &j) { editor::write_atomic(out / file, j.dump(2)); }; - if (mode == "prepare-statistics" || mode == "prepare-almanac" || std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") { + if (mode == "prepare-toto" || mode == "prepare-statistics" || mode == "prepare-almanac" || std::string(argv[1]) == "prepare-national" || std::string(argv[1]) == "prepare" || std::string(argv[1]) == "prepare-two") { auto package = modern::open_world_package(world); content::Mount mount(world, package.classic); modern::set_current_world(package.world); modern::app::ModernSession session(mount.root(), 17u); - ui::SetupOptions options; options.mode = 3; if(mode=="prepare-almanac"||mode=="prepare-statistics") options.world=false; if (std::string(argv[1]) == "prepare-national") options.league = false; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1; + ui::SetupOptions options; options.mode = 3; if(mode=="prepare-almanac"||mode=="prepare-statistics"||mode=="prepare-toto") options.world=false; if (std::string(argv[1]) == "prepare-national") options.league = false; options.managers = std::string(argv[1]) == "prepare-two" ? 2 : 1; ui::ManagerChoice manager; manager.name = "Codex Engine QA"; manager.master_club = 0; std::string error; ui::CareerInitializationResult result; if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error); if (options.managers == 2) { manager.name = "Codex Opponent QA"; manager.master_club = 1; manager.portrait = 1; if (!session.confirm_manager(options, manager, error)) throw std::runtime_error(error); } if (!session.finish(result, error)) throw std::runtime_error(error); - if (mode == "prepare-national" || mode == "prepare-almanac" || mode == "prepare-statistics") { + if (mode == "prepare-national" || mode == "prepare-almanac" || mode == "prepare-statistics" || mode == "prepare-toto") { uint64_t rev = 0; bool found = false; Json expiry = Json::object(), log = Json::array(); for (int k = 0; k < 200; ++k) { const auto desk = Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},rev))); if (mode=="prepare-national" && desk.at("meta").at("scope").at("role") == "national") { found = true; break; } + if(mode=="prepare-toto"){const auto value=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","toto"}},rev)));if(value.value("messageType","")=="snapshot"&&value.at("data").at("open")==true){found=true;break;}} if(mode=="prepare-statistics"&&!session.state().almanac.finished.empty()){found=true;break;} if(mode=="prepare-almanac") {const auto index=Json::parse(cli::dump_json(session.read_almanac(cli::Json::Object{{"kind","index"}})));if(index.value("ok",false)&&index.at("years").size()>=2){found=true;break;}} const auto &meta = desk.at("meta"); @@ -132,9 +133,22 @@ int main(int argc, char **argv) { auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false); write("winner-records.json",Json::parse(cli::dump_json(session.read_statistics(cli::Json::Object{{"kind","winners"}}))));modern::set_current_world(nullptr);return 0; } + if(mode=="settle-toto") { + auto package=modern::open_world_package(world);content::Mount mount(world,package.classic);modern::set_current_world(package.world);modern::app::ModernSession session(mount.root(),1u,out/"input.obs",false);uint64_t revision=0;Json expiry=Json::object(),log=Json::array();bool settled=false; + for(int step=0;step<100;++step){const auto before=Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","desktop"}},revision)));const auto &meta=before.at("meta");const Json command={{"messageType","command"},{"contractVersion",meta.at("contractVersion")},{"requestId","request:settle-toto-"+std::to_string(step)},{"careerId",meta.at("careerId")},{"expectedRevision",meta.at("stateRevision")},{"owner",{{"managerId",meta.at("scope").at("managerId")}}},{"kind","session.advance"},{"payload",{{"contractExpiry",expiry}}}};const auto reply=Json::parse(cli::dump_json(session.ui_command(cli::parse_json(command.dump()),revision)));log.push_back(reply);if(reply.value("messageType","")!="command_result"){if(reply.value("code","")=="decision_pending"){const auto id=reply.at("message").at("args").at("playerId").get();expiry[id]={{"action","release"}};continue;}throw std::runtime_error(reply.dump());}if(!session.state().pools.empty()&&session.state().pools[0].paid>0){settled=true;break;}} + if(!settled)throw std::runtime_error("Toto settlement not reached");write("advance.json",log);write("settlement.json",Json::parse(cli::dump_json(session.ui_read(cli::Json::Object{{"kind","toto"}},revision))));std::string error;const int active=session.state().memory.u8(::bmh::layout::ActiveManager);if(!session.save_game(out/"settled.obs",active,false,error))throw std::runtime_error(error);modern::set_current_world(nullptr);std::cout<<"actual Toto settlement saved\n";return 0; + } auto link = EngineBridge::open(world, out / "input.obs"); const auto before = link->snapshot(); write("before.json", before); if (before != link->snapshot()) throw std::runtime_error("reads changed the engine projection"); + if(mode=="verify-toto") { + const auto value=engine_toto_projection(before);if(value.at("programme").at("complete")!=true)throw std::runtime_error("fixture has no eleven-match coupon");Json rows=Json::array();for(int column=0;column<2;++column){auto tips=value.at("suggestions");if(column){tips[0]=tips[0]==0?1:0;}rows.push_back(tips);}const Json payload={{"stake",{{"currency","EUR"},{"minorUnits",2},{"minor","5000000"}}},{"columns",rows}}; + const auto quote=link->read({{"kind","toto"},{"draft",payload}});write("quote.json",quote);if(link->read({{"kind","toto"},{"draft",payload}})!=quote||link->snapshot()!=before)throw std::runtime_error("Toto quote changed session");const auto &offer=quote.at("data").at("draftQuote");if(offer.at("allowed")!=true||engine_money_minor(offer.at("cost"))!=10500000||engine_money_minor(offer.at("fee"))!=500000)throw std::runtime_error("wrong actual two-column cost"); + Json invalid=payload;invalid["columns"][1]=invalid["columns"][0];const auto duplicate=link->read({{"kind","toto"},{"draft",invalid}});write("duplicate.json",duplicate);if(duplicate.at("data").at("draftQuote").at("errorCode")!="duplicate_column"||link->snapshot()!=before)throw std::runtime_error("duplicate preview not pure/refused"); + const auto request=engine_toto_command(before,quote,"request:toto-two");const auto response=link->command(request);write("submit.json",response);if(response.value("messageType","")!="command_result"||link->command(request)!=response)throw std::runtime_error("submission failed or not idempotent");const auto after=link->snapshot();write("queued.json",after);if(after.at("toto").at("data").at("columns")!=rows||engine_money_minor(after.at("toto").at("data").at("cost"))!=10500000||after.at("desktop").at("data").at("accounts")!=before.at("desktop").at("data").at("accounts"))throw std::runtime_error("queue/cost/wrong immediate debit");link->save_copy(out/"queued.obs"); + const Json clear={{"stake",{{"currency","EUR"},{"minorUnits",2},{"minor","0"}}},{"columns",Json::array()}};const auto clear_quote=link->read({{"kind","toto"},{"draft",clear}});const auto cancel=engine_toto_command(after,clear_quote,"request:toto-clear");write("clear.json",link->command(cancel));const auto cleared=link->snapshot();if(!cleared.at("toto").at("data").at("columns").empty()||engine_money_minor(cleared.at("toto").at("data").at("stake"))!=0)throw std::runtime_error("withdrawal failed");link->save_copy(out/"cleared.obs"); + auto stale=request;stale["requestId"]="request:toto-stale";const auto refused=link->command(stale);if(refused.value("code","")!="stale_revision"||link->snapshot()!=cleared)throw std::runtime_error("stale coupon changed session");write("receipt.json",{{"status","passed"},{"costMinor","10500000"},{"feeMinor","500000"},{"quoteReadOnly",true},{"deferredSettlement",true},{"withdrawal",true},{"idempotent",true}});std::cout<<"actual Toto preview, two columns, deferred cost, idempotency and withdrawal passed\n";return 0; + } if(mode=="verify-statistics") { Json all=Json::array(); const auto run=[&](const Json &query){const auto read=link->read({{"kind","statistics"},{"query",query}});auto value=engine_statistics_projection(before,read);if(link->read({{"kind","statistics"},{"query",query}})!=read)throw std::runtime_error("statistics read not repeatable");all.push_back({{"query",query},{"read",read},{"projection",value}});return value;}; diff --git a/tests/modern_toto_projection_tests.cpp b/tests/modern_toto_projection_tests.cpp new file mode 100644 index 0000000..1995ee5 --- /dev/null +++ b/tests/modern_toto_projection_tests.cpp @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-3.0-only +#include "modern/ui/engine_bridge.hpp" +#include +#include +using namespace bmh::modern_ui; +namespace { +void check(bool yes,const char* why){if(!yes)throw std::runtime_error(why);} +templatevoid rejected(F f){bool caught=false;try{f();}catch(const std::exception&){caught=true;}check(caught,"bad Toto DTO accepted");} +Json money(int euros){return {{"currency","EUR"},{"minorUnits",2},{"minor",std::to_string(euros*100)}};} +Json fixture(){const Json meta={{"contractVersion","bmh-modern-ui@draft1"},{"careerId","career:test"},{"worldId","world:test"},{"worldRevision","1"},{"stateRevision","3"},{"date","2026-08-22"},{"season",{{"label","2026/27"}}},{"scope",{{"role","club"},{"managerId","manager:test"},{"teamId","club:test"},{"allowedCommands",{"toto.submit"}}}}};Json b;for(const auto*kind:{"session","desktop","camps","toto"})b[kind]={{"messageType","snapshot"},{"meta",meta},{"data",{{"kind",kind}}}};b["desktop"]["data"].update({{"manager",{{"id","manager:test"}}},{"team",{{"id","club:test"}}},{"accounts",{{"cash",money(5000000)}}}});b["camps"]["data"]["camps"]=Json::array();auto &t=b["toto"]["data"];t.update({{"open",true},{"rules",{{"max_columns",6},{"stake_min",10000},{"stake_max",400000}}},{"columns",{{1,0,2,1,0,2,1,0,2,1,0}}},{"stake",money(10000)},{"cost",money(10000)},{"last",{{"paid",money(20000)},{"won",money(0)},{"hits",{8}}}},{"matches",Json::array()}});for(int row=0;row<11;++row)t["matches"].push_back({{"home",{{"id","club:home"},{"name","Recorded Home"}}},{"away",{{"id","club:away"},{"name","Recorded Away"}}},{"league",{{"index",0},{"id","league:test"},{"name","League"}}},{"suggested",1}});return b;} +} +int main()try{ + const auto b=fixture(),before=b;const auto v=engine_toto_projection(b);check(b==before&&v.at("columns").size()==6&&v.at("columns")[0][1]==0&&v.at("columns")[1][0]==-1,"saved tips or empty columns lost");check(v.at("programme").at("rows")[0].at("home_ref").at("name")=="Recorded Home"&&v.at("programme").at("caption").get().find("22.08.2026")!=std::string::npos,"programme uses guessed teams/date");check(v.at("last").at("paid")==2000000&&v.at("coupon").at("stake")==1000000,"money scaled twice"); + auto quote=b.at("toto");const Json payload={{"stake",money(10000)},{"columns",b.at("toto").at("data").at("columns")}};quote["data"]["draftQuote"]={{"allowed",true},{"cost",money(10000)},{"payload",payload}};const auto c=engine_toto_command(b,quote,"request:qa");check(c.at("payload")==payload&&c.at("expectedRevision")=="3"&&c.at("owner").at("managerId")=="manager:test","command does not preserve reviewed payload/owner");quote["meta"]["scope"]["managerId"]="manager:other";rejected([&]{engine_toto_command(b,quote,"request:bad");});auto invalid=b;invalid["toto"]["data"]["columns"][0][0]=3;rejected([&]{engine_toto_projection(invalid);});invalid=b;invalid["toto"]["meta"]["stateRevision"]="4";rejected([&]{engine_toto_projection(invalid);}); + std::cout<<"Toto DTO: actual programme, stored columns, last settlement, exact money and context passed\n";return 0; +}catch(const std::exception&e){std::cerr< +#include +using namespace bmh;using namespace bmh::modern; +namespace { +using J=cli::Json;using O=J::Object;using A=J::Array; +const J& at(const J& v,const char* key){return v.object()->at(key);} +void check(bool yes,const char* why){if(!yes)throw std::runtime_error(why);} +J draft(int stake,int count){A rows;for(int c=0;c(std::get(duplicate.value).at("columns").value);rows[1]=rows[0];check(error(quote_toto_draft(g,0,duplicate))=="duplicate_column","duplicate columns accepted"); + auto bad=draft(10000,1);std::get(std::get(bad.value).at("stake").value)["currency"]="USD";check(!parse_toto_draft(bad),"wrong currency accepted");bad=draft(10000,1);std::get(std::get(bad.value).at("stake").value)["minor"]="1000000garbage";check(!parse_toto_draft(bad),"partial money parsed");bad=draft(10000,1);std::get(std::get(bad.value).at("stake").value)["minor"]="1000001";check(!parse_toto_draft(bad),"fractional euro accepted"); + const auto clear=quote_toto_draft(g,0,draft(0,0));check(*at(clear,"allowed").boolean()&&*at(clear,"clearing").boolean()&&*at(at(clear,"cost"),"minor").string()=="0","withdrawal does not follow existing clear path");check(!parse_toto_draft(draft(0,1)),"zero stake with tips accepted");g.memory.set8(::bmh::layout::CareerSession_DispatchToto_RuntimeField,9);check(error(quote_toto_draft(g,0,draft(10000,1)))=="toto_coupon_requires_eleven_matches","closed programme accepted"); + std::cout<<"Toto preview: real rules, fee, duplicate columns, strict money, clear and read purity passed\n";return 0; +}catch(const std::exception&e){std::cerr<