Bind the tablet to real mailbox states and engine press events (by Codex)

This commit is contained in:
Codex committed 2026-10-29 11:20:49 +01:00
1 parent 0fc26624d9
commit 256d6d5211
15 files changed
+633 -44

No files matched your search

+1
View File
@@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32"><rect x="4" y="7" width="24" height="18" rx="3" fill="none" stroke="#9fb5c5" stroke-width="2"/><path d="m5 9 11 9L27 9" fill="none" stroke="#9fb5c5" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/></svg>

After

Width:  |  Height:  |  Size: 304 B

+43
View File
@@ -1,6 +1,49 @@
<!-- SPDX-License-Identifier: GPL-3.0-only -->
# Nachrichten / Tablet
## Tatsächliches Spielpostfach · 29. Oktober 2026
Der Engine-Einstieg verwendet den bestehenden Tablet-Presenter mit echten
`news.messages` und `news.events` aus der Session. Postfachtexte einschließlich
Absätzen werden unverändert übernommen und sicher als RmlUI-Text dargestellt.
Stabile Nachrichten-IDs und die kanonische Manager-ID binden jede Aktion an das
aktuelle Postfach. Ein eigenes Vektor-Briefsymbol kennzeichnet Systemmeldungen,
ohne eine unbelegte historische Vereinszuordnung zu erfinden.
Lesen, Alle gelesen, Archivieren, Papierkorb und Wiederherstellen gehen über
`news.update`. Das Archiv nutzt das ursprüngliche Behalten-Bit; der Papierkorb
ist eine gespeicherte UI-Markierung, keine endgültige Entfernung. Der zusätzliche
Papierkorb-Reiter macht die Wiederherstellung nach einem Neustart erreichbar.
Rückgängig stellt unmittelbar die vorherige Ordnerzuordnung wieder her. Die
Markierungen werden im OBS gespeichert, Suche/Scrollen und geöffnete Details
bleiben lokale Ansichten. Nationale Postfächer beachten die gelieferten
Schreibrechte und werden nicht mit Vereinsbefehlen überschrieben.
Die vorhandenen 113 zweisprachigen Artikelvorlagen werden über einen expliziten
Adapter mit Engine-Fakten versorgt: unbenutzte Zusatzfelder und `variant: null`
werden nicht als Vorlagenparameter missverstanden; Money wird aus EUR/2 genau
in das Format mit ganzzahligen Centbeträgen des Artikelkatalogs übersetzt. Drei zusätzliche
Native-Vorlagen (Katalogversion 2) berichten Pokalrunden-/Finalergebnisse und
Pokalsiege. Ergebnisberichte behaupten kein Weiterkommen: insbesondere ist ein
gewonnenes Hallengruppenspiel noch keine gewonnene K.-o.-Runde. Die separate
HTML-/Demo-Referenz und ihr unveränderter Vorlagenkatalog bleiben erhalten.
Für abgeleitete Presseereignisse fehlen bisher gespeicherte Leser-/Ordnerfelder
in der Engine-Schnittstelle. Solche Berichte sind sichtbar, aber schreibgeschützt;
auch ihr unbekannter Lesestatus wird nicht als „ungelesen“ erfunden. Die Erweiterung
ist mit dem Engine-Team angefragt. Postfachmeldungen besitzen bereits den vollen
speicherbaren Ablauf. Noch nicht aufbereitbare Ereignisse werden gezählt und in
der Diagnoseprojektion behalten, statt Nachrichten über unbekannte Fakten zu
erfinden. Der geprüfte Saisonfall rendert alle 50 gelieferten Ereignisse.
Die private Abnahme umfasst drei Themes, echte Postfachaktionen, beide
Ordnermechanismen nach Prozessneustart und unveränderten RNG. Nationalaufstellung
und bestätigte Nationaltaktik wurden nach Claudes Schnittstellenerweiterung
zusätzlich nativ geprüft. Anstoß bleibt deaktiviert; keine Änderung der
Match-Engine, keine neue Welt-/Spielstandversion durch diesen UI-Adapter.
Die folgenden Abschnitte beschreiben die weiterhin getrennte **Demoansicht**.
Die native RmlUI-Ansicht auf Branch `0.3` überträgt den privaten HTML-Goldstand
vom 25.10.2026 (Referenzrevision `ddd8cab7`; native Ausgangsrevision
`349c416`; `desktop/news-menu.js`, `news-tablet.css`, gemeinsame Menüthemen
@@ -3,10 +3,10 @@
Dies ist eine Routenübersicht des nativen Engine-Einstiegs auf `0.3`, keine
Fertigstellungsquote des gesamten Spiels. HTML-/Demo-Presenter sind getrennt
von echten Karrierewerten. Stand einschließlich Transfermarkt und Erfolgsverlauf.
von echten Karrierewerten. Stand einschließlich Transfermarkt, Erfolgsverlauf und Nachrichtenpostfach.
Von 32 Desktoprouten sind 25 an Sessiondaten bzw. tatsächliche Aktionen
angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Sechs weitere
Von 32 Desktoprouten sind 26 an Sessiondaten bzw. tatsächliche Aktionen
angebunden. Anstoß bleibt auf ausdrücklichen Wunsch gesperrt. Fünf weitere
Routen besitzen ihre Präsentation, sind im echten Einstieg aber noch nicht
freigeschaltet. Rollen-, Termin- und Angebotssperren können auch eine angebundene
Route vorübergehend deaktivieren; insbesondere hat der Nationaltrainer weniger
@@ -15,7 +15,7 @@ Vereinsmenüs.
| Menügruppe | Tatsächlicher Umfang | Grenzen |
|---|---|---|
| Tabellen, Stärken, Ligaspiele, übrige Spiele | Aktuelle Sessiontabellen, Kaderstärken und tatsächliche Paarungen | Vereinsrollen; fehlende Daten bleiben unbekannt |
| Aufstellung, Taktik, Training | Tatsächlicher Kader, bestätigte Änderungen und gespeicherte Planung | National-Aufstellung/Taktik liefern derzeit `no_club` |
| Aufstellung, Taktik, Training | Tatsächlicher Kader, bestätigte Änderungen und gespeicherte Planung | Nationale Aufstellung und Taktik nach Claudes Schnittstellenerweiterung lesbar und bedienbar; andere Vereinsbereiche bleiben dort gesperrt |
| Trainingslager | Drei Regionen, 18 Lager, aktuelle Angebote und bestätigte Buchung | Datum, Rolle und Angebot aus der Engine |
| Bank und Eintritt | Konten, Käufe/Verkäufe, Kreditvorschau, bestätigte Buchungen und tatsächlicher Preisbereich | Keine erfundenen Nettobeträge oder zusätzlichen Kassenlimits |
| Werbung und Umfeld | Tatsächliche Verträge/Angebote, Rechte, Budgets und Investitionen | Preisbestätigungen und Angebotssperren bleiben bindend |
@@ -24,6 +24,7 @@ Vereinsmenüs.
| Spielerstatistik und Fairplay | Aktuelle Saisonereignisse aus dem Almanach | Heutige unbekannte Spielerwerte bleiben unbekannt |
| Transfermarkt | Tatsächliche Kader-/Marktwerte und Gebote, lokale Suche, bestätigte Listung und Kauf-/Leihangebote | Abwerben, Entfernen und Zurücknehmen sind sichtbar gesperrt; ursprüngliche Prämienstufen bleiben erhalten |
| Erfolge | Tatsächliche Manager-Saisonaufzeichnungen, Ligafarben aus Weltregeln, aktueller Zwischenstand und Karriereverlauf | Keine fiktiven Vorjahre oder erfundene historische Vereinszuordnung; Nationaltrainer gesperrt |
| Nachrichten | Tatsächliche Postfachtexte, bestätigte Leser-/Ordneraktionen, Wiederherstellung und aus Engine-Fakten gerenderte Berichte | Presseberichte bleiben bis zu ihrer eigenen Zustandsanbindung schreibgeschützt; Nationalrechte werden beachtet |
| Große Statistik | Vorhandene Almanachauswertungen, tatsächliche Transfer-/Analyticswerte | Titelchancen, fehlende Saisonfinanzen und nicht aufgezeichnete Turnierbereiche bleiben leer |
| Almanach | Tatsächlich aufgezeichnete Spiele, Details und Ereignisse | Keine Rekonstruktion unbekannter historischer Werte |
| Toto | Echte elf Spiele, sechs Spalten, Kostenprüfung, bestätigte Abgabe/Rücknahme und letzte Abrechnung | Abrechnung am Spieltagsende; unvollständiges Programm gesperrt |
@@ -39,7 +40,6 @@ Vereinsmenüs.
| Highscore | Gemeinsamer Presenter und ursprüngliche Ranglistenprojektion | Tatsächlichen Ranglistenbesitzer und Speicherweg anbinden |
| Bilanz | Gemeinsamer Presenter und bestehender Session-Planungsdienst | Aktuell/Zukunft ohne POC-Schätzwerte projizieren |
| Manager | Präsentation für Hinzufügen, Aufgeben und spätere Vereinssuche; Sessionaktionen vorhanden | Join/Abgabe an aktuelle Menschen und Besitzwechsel binden |
| Nachrichten | Tablet-Presenter, Artikelkatalog und semantischer Presseread | Echte Ereignisse darstellen; Lesen/Archiv/Löschen an persistente, managergebundene Zustände anschließen |
Desktop-Widgets sind ebenfalls noch nicht vollständig gebunden. Statusleiste,
Porträt, Kalender, Kasse und ein tatsächlich gemeldeter nächster Gegner sind
+7 -3
View File
@@ -1,5 +1,5 @@
# SPDX-License-Identifier: GPL-3.0-only
add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp engine_stadium.cpp engine_transfer.cpp engine_achievements.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp)
add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp engine_stadium.cpp engine_transfer.cpp engine_achievements.cpp engine_news.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp)
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
add_library(bmh_modern_ui_mods STATIC mod_library.cpp)
@@ -49,7 +49,7 @@ foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss report
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
endforeach()
foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_projection)
foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_projection news_projection)
add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp)
target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core)
if(MSVC)
@@ -57,7 +57,11 @@ foreach(component career_reports rankings career_files statistics_projection tot
else()
target_compile_options(modern_${component}_tests PRIVATE -Wall -Wextra -Wpedantic)
endif()
add_test(NAME modern_${component}_tests COMMAND modern_${component}_tests)
if(component STREQUAL "news_projection")
add_test(NAME modern_${component}_tests COMMAND modern_${component}_tests "${CMAKE_SOURCE_DIR}/assets/modern/news-catalog.json")
else()
add_test(NAME modern_${component}_tests COMMAND modern_${component}_tests)
endif()
endforeach()
file(GLOB modern_icons CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/assets/modern/icons/*.svg")
file(MAKE_DIRECTORY "${modern_assets}/icons")
+1 -1
View File
@@ -17,7 +17,7 @@ Json from_engine(const cli::Json &v) { return Json::parse(cli::dump_json(v)); }
namespace {
Json session_snapshot(modern::app::ModernSession &session,uint64_t revision) {
Json bundle=Json::object();
for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements","news"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
validate_engine_desk(bundle);const auto &season=bundle.at("desktop").at("meta").at("season");
bundle["calendar"]=from_engine(session.ui_read(cli::Json::Object{{"kind","calendar"},{"from",season.at("startDate").get<std::string>()},{"until",season.at("endDate").get<std::string>()}},revision));
bundle["scheduling"]=from_engine(session.ui_read(cli::Json::Object{{"kind","scheduling"}},revision));return bundle;
+6
View File
@@ -72,6 +72,12 @@ Json engine_toto_command(const Json &bundle,const Json &quote,const std::string
Json engine_statistics_projection(const Json &bundle,const Json &read);
class NewsCatalog;
NewsCatalog engine_news_catalogue(const NewsCatalog &);
Json engine_news_projection(const Json &,const Json &,const NewsCatalog &,const std::string &);
Json engine_news_view(const Json &,const std::string &,const std::string &);
Json engine_news_command(const Json &,const Json &,const std::string &,const std::string &,const std::string &);
Json engine_achievements_projection(const Json &,const Json &,int page);
Json engine_transfer_filters();
+7 -1
View File
@@ -32,6 +32,7 @@ void App::engine_accept(EngineReply result) {
engine_toto_poll();
engine_stadium_poll();
engine_transfer_sync();
engine_news_sync();
engine_contracts_poll();
engine_calendar_sync();
engine_friendly_sync();
@@ -80,6 +81,7 @@ void App::engine_poll() {
void App::engine_frame() {
engine_poll();
const bool rendered = needs_render_;
if(needs_render_&&menu_=="news"){last_rendered_menu_=menu_;news_before_render();}
if (needs_render_) engine_render();
engine_sports_update();
if (ticket_) ticket_->update();
@@ -93,6 +95,7 @@ void App::engine_frame() {
if(rendered&&(menu_=="scorers"||menu_=="fairplay")){rankings_restore_scroll();context_->Update();}
if(menu_=="statistics")statistics_restore_scroll();
if(menu_=="transfer")transfer_restore_scroll();
if(menu_=="news")news_after_render();
if(rendered&&files_native_){files_after_render();context_->Update();}
if (center_selects(*doc_)) context_->Update();
if (menu_ == "lineup" && lineup_roster_scroll_) {
@@ -170,6 +173,7 @@ void App::engine_event(Rml::Event &event) {
if(menu_=="stadium"&&stadium_event(event))return;
if(menu_=="transfer"&&transfer_event(event))return;
if(menu_=="achievements"&&career_report_event(event))return;
if(menu_=="news"&&news_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;
@@ -266,6 +270,7 @@ void App::engine_event(Rml::Event &event) {
if(menu_=="stadium"&&stadium_action(action,node))return;
if(menu_=="transfer"&&transfer_action(action,node))return;
if(menu_=="achievements"&&career_report_action(action,node))return;
if(menu_=="news"&&dispatch_news(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;
@@ -282,6 +287,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=="news"){menu_=id;news_dialog_.clear();refresh();}
else if(action=="engine-open"&&id=="achievements"){menu_=id;career_view_=Json::object();refresh();}
else if(action=="engine-open"&&id=="transfer"){menu_=id;transfer_view_=Json::object();transfer_dialog_.clear();engine_transfer_sync();refresh();}
else if(action=="engine-open"&&id=="stadium"){menu_=id;stadium_view_=Json::object();stadium_view_defaults(stadium_view_);engine_stadium_sync();refresh();}
@@ -318,5 +324,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_},
{"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
{"news_error",engine_news_error_},{"news_value",engine_news_value_},{"news_view",news_view_},{"news_undo",engine_news_undo_},{"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
}
+259
View File
@@ -0,0 +1,259 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/demo_news.hpp"
#include "modern/ui/engine_bridge.hpp"
#include "modern/ui/news_catalog.hpp"
#include <algorithm>
#include <set>
namespace bmh::modern_ui {
namespace {
void check(bool yes, const char *text) {
if (!yes)
throw editor::Error(text);
}
std::string text(const Json &v) {
return v.is_string() ? v.get<std::string>()
: v.is_object() ? v.value("text", std::string())
: std::string();
}
std::string fold(std::string s) {
for (size_t i = 0; i < s.size(); ++i) {
if (s[i] >= 'A' && s[i] <= 'Z')
s[i] = char(s[i] - 'A' + 'a');
else if (static_cast<unsigned char>(s[i]) == 0xc3 && i + 1 < s.size()) {
auto &n = s[++i];
const auto c = static_cast<unsigned char>(n);
if (c >= 0x80 && c <= 0x9e && c != 0x97)
n = char(c + 32);
}
}
return s;
}
} // namespace
NewsCatalog engine_news_catalogue(const NewsCatalog &base) {
auto data = base.data();
data["version"] = 2;
const auto add = [&](const std::string &type, const std::string &id,
bool result) {
Json p = {{"competition", {{"type", "entity"}}},
{"team", {{"type", "entity"}, {"source", "scope"}}}};
if (result) {
p["opponent"] = {{"type", "entity"}};
p["score"] = {{"type", "score"}};
}
data["templates"].push_back(
{{"id", id},
{"event", type},
{"variant", "recorded"},
{"kind", "fixture"},
{"scopes", {"club", "national"}},
{"tone", result ? "neutral" : "positive"},
{"parameters", p},
{"guards", Json::array()},
{"de",
{{"headline", result ? "Ergebnis in {{competition}}"
: "{{team}} gewinnt {{competition}}"},
{"sentences",
result ? Json::array({"{{team}} und {{opponent}} treffen in "
"{{competition}} aufeinander.",
"Das Ergebnis lautet {{score}}."})
: Json::array(
{"{{team}} hat {{competition}} gewonnen.",
"Der Wettbewerb endet mit {{team}} als Sieger."})}}},
{"en",
{{"headline", result ? "Result in {{competition}}"
: "{{team}} win {{competition}}"},
{"sentences",
result
? Json::array({"{{team}} meet {{opponent}} in {{competition}}.",
"The recorded result is {{score}}."})
: Json::array(
{"{{team}} have won {{competition}}.",
"The competition ends with {{team}} as winners."})}}},
{"fixture", Json::object()}});
};
add("cup.round_result", "engine-cup-round-recorded", true);
add("cup.final_result", "engine-cup-final-recorded", true);
add("cup.won", "engine-cup-title-recorded", false);
return NewsCatalog(std::move(data));
}
Json engine_news_projection(const Json &bundle, const Json &read,
const NewsCatalog &catalogue,
const std::string &language) {
validate_engine_desk(bundle);
const auto &meta = bundle.at("desktop").at("meta");
check(read.value("messageType", "") == "snapshot" &&
read.at("data").value("kind", "") == "news",
"Nachrichten sind nicht verfügbar.");
for (const auto *key : {"contractVersion", "careerId", "worldId",
"worldRevision", "stateRevision", "scope"})
check(read.at("meta").at(key) == meta.at(key),
"Das Nachrichtenpostfach hat sich geändert.");
check(language == "de" || language == "en", "Ungültige Nachrichtensprache.");
const auto &d = read.at("data"), &desk = bundle.at("desktop").at("data");
const auto owner = meta.at("scope").at("managerId");
const auto &commands = meta.at("scope").at("allowedCommands");
const bool can_change = std::find(commands.begin(), commands.end(),
Json("news.update")) != commands.end();
Json items = Json::array(), unsupported = Json::array();
std::set<std::string> ids;
const Json scope = {
{"kind", meta.at("scope").at("role") == "national" ? "national" : "club"},
{"id", meta.at("scope").at("teamId")},
{"name", text(desk.at("team").at("name"))}};
for (const auto &message : d.at("messages")) {
const auto id = message.at("id").get<std::string>();
check(!id.empty() && ids.insert(id).second &&
message.at("ownerManagerId") == owner,
"Fremde oder doppelte Postfachnachricht.");
const auto folder = message.at("folder").get<std::string>();
check(folder == "inbox" || folder == "archive" || folder == "trash",
"Unbekannter Nachrichtenordner.");
std::string body;
for (const auto &p : message.at("paragraphs")) {
if (!body.empty())
body += "\n\n";
body += text(p);
}
items.push_back({{"id", id},
{"date", message.at("date")},
{"display_date", news_display_date(message.at("date"))},
{"title", text(message.at("subject"))},
{"body", body},
{"kind", "mail"},
{"category", "Postfach"},
{"read", message.at("read")},
{"folder", folder},
{"scope", scope},
{"mutable", can_change},
{"source", "mail"}});
}
for (const auto &event : d.at("events")) {
const auto id = event.at("id").get<std::string>();
check(!id.empty() && ids.insert(id).second, "Doppelte Pressekennung.");
Json normalized = event;
if (event.at("type") == "cup.round_result" ||
event.at("type") == "cup.final_result" || event.at("type") == "cup.won")
normalized["variant"] = "recorded";
if (normalized.value("variant", Json()).is_null())
normalized.erase("variant");
Json parameters = Json::object();
for (const auto &t : catalogue.data().at("templates"))
if (t.at("event") == event.at("type"))
for (const auto &[key, spec] : t.at("parameters").items())
parameters[key] = spec;
Json data = Json::object();
for (const auto &[key, value] : event.at("data").items())
if (key != "team" && parameters.contains(key) && !value.is_null()) {
if (parameters.at(key).at("type") == "money") {
std::string error;
const auto amount = news_money_from_dto(value, error);
if (amount)
data[key] = amount->json();
else
data[key] = value;
} else
data[key] = value;
}
normalized["data"] = data;
const auto rendered = catalogue.from_event(
normalized,
{{"language", language},
{"asOf", meta.at("date")},
{"manager",
{{"id", owner}, {"name", text(desk.at("manager").at("name"))}}}});
if (!rendered.value("ok", false)) {
unsupported.push_back(
{{"id", id}, {"type", event.at("type")}, {"error", rendered}});
continue;
}
const auto &article = rendered.at("article");
const bool marked = event.contains("read") &&
event.at("read").is_boolean() &&
event.contains("folder");
items.push_back({{"id", id},
{"date", article.at("date")},
{"display_date", news_display_date(article.at("date"))},
{"title", article.at("headline")},
{"body", article.at("body")},
{"kind", article.at("kind")},
{"category", "Bericht"},
{"read", marked ? event.at("read") : Json()},
{"folder", marked ? event.at("folder") : Json("inbox")},
{"scope", article.at("scope")},
{"mutable", marked && can_change},
{"source", "press"},
{"article", article}});
}
std::stable_sort(
items.begin(), items.end(),
[](const auto &a, const auto &b) { return a.at("date") > b.at("date"); });
return {{"ok", true},
{"fictional", false},
{"items", items},
{"unsupported", unsupported},
{"club", meta.at("scope").at("teamId")},
{"club_name", text(desk.at("team").at("name"))},
{"manager", text(desk.at("manager").at("name"))},
{"date", news_display_date(meta.at("date"))},
{"scope", scope}};
}
Json engine_news_view(const Json &value, const std::string &folder,
const std::string &query) {
check(folder == "inbox" || folder == "archive" || folder == "trash",
"Ungültiger Nachrichtenordner.");
check(query.size() <= 480, "Suchbegriff ist zu lang.");
auto out = value;
Json shown = Json::array(),
counts = {{"inbox", 0}, {"archive", 0}, {"trash", 0}};
int unread = 0;
bool can_read = false;
for (const auto &row : value.at("items")) {
const auto where = row.at("folder").get<std::string>();
check(counts.contains(where), "Unbekannter Nachrichtenordner.");
counts[where] = counts.at(where).get<int>() + 1;
if (where != folder)
continue;
const bool is_unread =
row.at("read").is_boolean() && row.at("read") == false;
can_read |= is_unread && row.at("mutable") == true;
if (!query.empty() && fold(row.at("title").get<std::string>() + " " +
row.at("body").get<std::string>() + " " +
row.at("display_date").get<std::string>())
.find(fold(query)) == std::string::npos)
continue;
shown.push_back(row);
unread += is_unread;
}
out["items"] = shown;
out["counts"] = counts;
out["can_read"] = can_read;
out["shown_unread"] = unread;
return out;
}
Json engine_news_command(const Json &bundle, const Json &value,
const std::string &id, const std::string &action,
const std::string &request) {
validate_engine_desk(bundle);
const auto &meta = bundle.at("desktop").at("meta");
check(!request.empty(), "Anfragekennung fehlt.");
const auto &commands = meta.at("scope").at("allowedCommands");
check(std::find(commands.begin(), commands.end(), Json("news.update")) !=
commands.end(),
"Dieses Postfach ist schreibgeschützt.");
check(action == "read" || action == "unread" || action == "archive" ||
action == "trash" || action == "restore",
"Unbekannte Nachrichtenaktion.");
const auto found =
std::find_if(value.at("items").begin(), value.at("items").end(),
[&](const auto &m) { return m.at("id") == id; });
check(found != value.at("items").end() && found->at("mutable") == true,
"Diese Nachricht kann nicht geändert werden.");
return {{"messageType", "command"},
{"requestId", request},
{"careerId", meta.at("careerId")},
{"expectedRevision", meta.at("stateRevision")},
{"owner", {{"managerId", meta.at("scope").at("managerId")}}},
{"kind", "news.update"},
{"payload", {{"messageId", id}, {"action", action}}}};
}
} // namespace bmh::modern_ui
+165
View File
@@ -0,0 +1,165 @@
// SPDX-License-Identifier: GPL-3.0-only
Json App::news_data(const std::string &folder, const std::string &query) const {
if (engine_mode_)
return engine_news_view(engine_news_value_, folder, query);
const auto s = snap();
return demo_news_view(
*s.world, s.state, folder, query,
ui_preferences_.at("display").value("language", std::string("de")));
}
void App::engine_news_sync() {
const auto &meta = engine_data_.at("desktop").at("meta");
const bool same =
engine_news_context_.is_object() &&
engine_news_context_.value("careerId", Json()) == meta.at("careerId") &&
engine_news_context_.at("scope").at("managerId") ==
meta.at("scope").at("managerId");
if (!same) {
reset_news();
engine_news_undo_ = Json();
}
if (engine_news_undo_.is_object() && engine_news_undo_.at("context") != meta)
engine_news_undo_ = Json();
engine_news_context_ = meta;
engine_news_value_ = Json();
engine_news_error_.clear();
try {
if (!engine_news_catalog_)
engine_news_catalog_ =
std::make_unique<NewsCatalog>(engine_news_catalogue(
NewsCatalog::load(assets_ / "news-catalog.json")));
engine_news_value_ = engine_news_projection(
engine_data_, engine_data_.at("news"), *engine_news_catalog_,
ui_preferences_.at("display").value("language", std::string("de")));
} catch (const std::exception &e) {
engine_news_error_ = e.what();
}
if (!engine_news_operation_.empty()) {
if (engine_response_.value("messageType", "") == "command_result") {
if (engine_news_pending_undo_.is_object()) {
engine_news_undo_ = engine_news_pending_undo_;
engine_news_undo_["context"] = meta;
}
news_view_["feedback"] =
engine_response_.value("outcome", "") == "no_change"
? "Unverändert."
: "Postfach aktualisiert.";
} else
news_view_["feedback"] = engine_notice_;
engine_news_operation_.clear();
engine_news_pending_undo_ = Json();
}
}
void App::engine_news_send(const std::vector<Json> &requests,
const std::string &operation) {
if (requests.empty() || engine_busy_ || !engine_fresh_)
return;
auto link = engine_link_;
engine_news_operation_ = operation;
engine_start(
"Postfach wird aktualisiert …",
[link, requests] {
Json response;
for (auto request : requests) {
const auto b = link->snapshot();
request["expectedRevision"] =
b.at("desktop").at("meta").at("stateRevision");
response = link->command(request);
if (response.value("messageType", "") != "command_result")
break;
}
return EngineReply{link, link->snapshot(), response, nullptr};
},
true);
}
bool App::engine_news_action(const std::string &action, Rml::Element *target) {
if (!action.starts_with("news-"))
return false;
if (menu_ != "news" || engine_busy_ || !engine_fresh_ ||
!engine_news_value_.is_object())
return true;
const auto id =
target ? target->GetAttribute<Rml::String>("data-id", "") : std::string();
if (action == "news-detail-close") {
news_dialog_.clear();
focus_after_render_ = news_return_focus_;
refresh();
return true;
}
if (!news_dialog_.empty() && action != "news-detail-move")
return true;
if (action == "news-folder") {
if (id == "inbox" || id == "archive" || id == "trash") {
news_view_["folder"] = id;
news_scroll_ = 0;
focus_after_render_ = target->GetId();
refresh();
}
return true;
}
if (action == "news-read-all") {
std::vector<Json> requests;
for (const auto &m : engine_news_value_.at("items"))
if (m.at("folder") == news_view_.value("folder", std::string("inbox")) &&
m.at("read") == false && m.at("mutable") == true)
requests.push_back(engine_news_command(engine_data_, engine_news_value_,
m.at("id"), "read",
editor::new_id("request:ui-")));
engine_news_undo_ = Json();
engine_news_send(requests, "read-all");
return true;
}
if (action == "news-undo") {
if (!engine_news_undo_.is_object() ||
engine_news_undo_.at("context") != engine_news_context_)
return true;
const auto undo = engine_news_undo_;
engine_news_undo_ = Json();
engine_news_send({engine_news_command(
engine_data_, engine_news_value_, undo.at("id"),
undo.at("folder") == "archive" ? "archive" : "restore",
editor::new_id("request:ui-"))},
"undo");
return true;
}
const auto requested = action == "news-detail-move" ? news_dialog_ : id;
const auto &items = engine_news_value_.at("items");
const auto found =
std::find_if(items.begin(), items.end(),
[&](const auto &m) { return m.at("id") == requested; });
if (found == items.end())
return true;
if (action == "news-open") {
news_dialog_ = requested;
news_return_focus_ = "news-read-" + requested;
focus_after_render_ = "news-detail-close";
if (found->at("mutable") == true && found->at("read") == false) {
engine_news_undo_ = Json();
engine_news_send(
{engine_news_command(engine_data_, engine_news_value_, requested,
"read", editor::new_id("request:ui-"))},
"read");
}
refresh();
return true;
}
if (found->at("mutable") != true)
return true;
if (action == "news-delete" || action == "news-move" ||
action == "news-detail-move") {
const auto folder = found->at("folder").get<std::string>();
const auto kind = action == "news-delete" ? "trash"
: folder == "archive" || folder == "trash" ? "restore"
: "archive";
engine_news_pending_undo_ = {{"id", requested}, {"folder", folder}};
news_dialog_.clear();
focus_after_render_ =
"news-tab-" + news_view_.value("folder", std::string("inbox"));
engine_news_send(
{engine_news_command(engine_data_, engine_news_value_, requested, kind,
editor::new_id("request:ui-"))},
kind);
return true;
}
return true;
}
+2 -1
View File
@@ -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=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
const bool supported = ((route=="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=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (route=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
out += desktop_button(id, o, "engine-open", supported && !engine_busy_);
}
}
@@ -129,6 +129,7 @@ void App::engine_render() {
if(menu_=="scorers")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Spielerstatistiken",engine_rankings_value_.is_object()?render_scorers():"<div class=\"fill center\">"+esc(engine_busy_?"Spielerstatistiken werden geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="fairplay")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Fairplay",engine_fairplay_value_.is_object()?render_fairplay():"<div class=\"fill center\">"+esc(engine_busy_?"Fairplay wird geladen …":engine_notice_)+"</div>")+"</div>";
if(menu_=="other")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Übrige Spiele",engine_other_value_.is_object()?render_reports("other"):"<div class=\"fill center\">"+esc(engine_busy_?"Wettbewerbe werden geladen …":engine_other_index_.is_object()?"Keine aktiven Wettbewerbe.":engine_notice_)+"</div>")+"</div>";
if(menu_=="news")out+="<div class=\"fill\" style=\"z-index:100;\">"+render_news()+"</div>";
if(menu_=="achievements")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Erfolge",render_achievements())+"</div>";
if(menu_=="transfer")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Transfers",render_transfer())+"</div>";
if(menu_=="stadium")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Stadion",render_stadium())+"</div>";
+8
View File
@@ -136,3 +136,11 @@
int career_max_page() const;
Json achievements_data(int) const;
Json engine_news_context_,engine_news_value_,engine_news_undo_,engine_news_pending_undo_;
std::string engine_news_operation_,engine_news_error_;
std::unique_ptr<NewsCatalog> engine_news_catalog_;
void engine_news_sync();
Json news_data(const std::string &,const std::string &) const;
void engine_news_send(const std::vector<Json> &,const std::string &);
bool engine_news_action(const std::string &,Rml::Element *);
+3 -6
View File
@@ -51,11 +51,7 @@ void App::news_after_render() {
}
}
void App::news_update_feed() {
const auto s = snap();
const auto data = demo_news_view(
*s.world, s.state, news_view_.value("folder", "inbox"),
news_view_.value("query", ""),
ui_preferences_.at("display").value("language", std::string("de")));
const auto data=news_data(news_view_.value("folder","inbox"),news_view_.value("query",""));
if (!data.value("ok", false))
return;
if (auto *feed = element("news-feed")) {
@@ -110,6 +106,7 @@ bool App::news_commit(const Json &action, const std::string &feedback,
return true;
}
bool App::dispatch_news(const std::string &action, Rml::Element *target) {
if(engine_mode_)return engine_news_action(action,target);
if (!action.starts_with("news-"))
return false;
if (menu_ != "news" || !popup_.empty() || amount_)
@@ -238,7 +235,7 @@ bool App::news_event(Rml::Event &event) {
target->GetId() == "news-search" && news_dialog_.empty()) {
if (auto *input = dynamic_cast<Rml::ElementFormControl *>(target)) {
auto query = input->GetValue();
if (query.size() > 120)
if (!engine_mode_ && query.size() > 120)
query.resize(120);
news_view_["query"] = query;
news_view_["feedback"] = "";
+22 -27
View File
@@ -1,8 +1,10 @@
// SPDX-License-Identifier: GPL-3.0-only
namespace {std::string news_body_markup(const std::string &text){auto value=esc(text);size_t at=0;while((at=value.find('\n',at))!=std::string::npos){value.replace(at,1,"<br/>");at+=5;}return value;}}
std::string App::render_news_art(const Json &message, double size) {
const auto kind = message.at("kind").get<std::string>();
std::string art;
if (kind == "national" ||
if(kind=="mail")art=glyph("mail",size*.65);
else if (kind == "national" ||
(message.contains("scope") &&
message.at("scope").value("kind", "") == "national"))
art = picture(
@@ -11,7 +13,7 @@ std::string App::render_news_art(const Json &message, double size) {
else if (kind == "club" || kind == "career") {
const auto id =
message.value("scope", Json::object()).value("id", std::string());
art = crest(snap().world->find("clubs", id), size * .69);
art = crest(world_->find("clubs", id), size * .69);
if (art.empty())
art = glyph("world", size * .55);
} else {
@@ -33,8 +35,8 @@ std::string App::render_news_feed(const Json &data) {
for (const auto &m : data.at("items")) {
const auto id = m.at("id").get<std::string>(),
name = m.at("title").get<std::string>();
const bool unread = !m.at("read").get<bool>(),
archived = m.at("folder") == "archive";
const bool unread = m.at("read").is_boolean() && !m.at("read").get<bool>(),
archived = m.at("folder") == "archive" || (engine_mode_&&m.at("folder")=="trash");
out += "<div id=\"news-row-" + id + "\" class=\"news-message" +
(unread ? " is-unread" : "") + "\">";
if (unread)
@@ -68,11 +70,11 @@ std::string App::render_news_feed(const Json &data) {
: "Archivieren: ") +
esc(name) + "\" title=\"" +
std::string(archived ? "Ins Postfach verschieben" : "Archivieren") +
"\"");
"\" " + std::string(engine_mode_&&m.value("mutable",false)==false?"disabled":""));
out += btn("news-delete", glyph("trash", 36), "news-icon-button",
"id=\"news-delete-" + id + "\" data-id=\"" + id +
"\" aria-label=\"Löschen: " + esc(name) +
"\" title=\"Löschen\"");
"\" title=\"Löschen\" " + std::string(engine_mode_&&(m.value("mutable",false)==false||m.at("folder")=="trash")?"disabled":""));
out += "</div></div>";
}
if (out.empty()) {
@@ -104,27 +106,23 @@ std::string App::render_news_detail(const Json &message) {
esc(message.at("category").get<std::string>()) + "</p><p>" +
esc(message.at("display_date").get<std::string>()) +
"</p></div></div><p class=\"news-detail-body\">" +
esc(message.at("body").get<std::string>()) +
"</p><small>Fiktive Meldung für den "
"Oberflächen-Prototyp.</small></div><div "
(engine_mode_?news_body_markup(message.at("body").get<std::string>()):esc(message.at("body").get<std::string>())) +
"</p><small>" + std::string(engine_mode_?(message.value("source",std::string())=="mail"?"Aus dem Spielpostfach":"Bericht aus dem Almanach"):"Fiktive Meldung für den Oberflächen-Prototyp.") + "</small></div><div "
"class=\"news-detail-actions\">" +
btn("news-detail-close", "Schließen", {}, "id=\"news-detail-close\"") +
btn("news-detail-move",
message.at("folder") == "archive" ? "Ins Postfach" : "Archivieren",
{}, "id=\"news-detail-move\"") +
(message.at("folder") == "archive" || (engine_mode_&&message.at("folder")=="trash")) ? "Ins Postfach" : "Archivieren",
{}, "id=\"news-detail-move\" " + std::string(engine_mode_&&message.value("mutable",false)==false?"disabled":"")) +
"</div></div></div>";
}
std::string App::render_news() {
const auto s = snap();
if (news_world_ != s.world || news_source_ != source_.get()) {
const auto s = engine_mode_?Snapshot{}:snap();
if (!engine_mode_ && (news_world_ != s.world || news_source_ != source_.get())) {
reset_news();
news_world_ = s.world;
news_source_ = source_.get();
}
const auto data = demo_news_view(
*s.world, s.state, news_view_.value("folder", "inbox"),
news_view_.value("query", ""),
ui_preferences_.at("display").value("language", std::string("de")));
const auto data = news_data(news_view_.value("folder","inbox"),news_view_.value("query",""));
if (!data.value("ok", false))
return window("Nachrichten",
"<p>Das Nachrichtenpostfach ist nicht verfügbar.</p>");
@@ -142,15 +140,15 @@ std::string App::render_news() {
? picture(renderer_.diagram("news-header-national",
ui_nation_flag_svg("de"), 176),
88, 59)
: crest(s.world->find("clubs", data.value("club", std::string())),
: crest(world_->find("clubs", data.value("club", std::string())),
88)) +
"</div></div>";
content += "<div class=\"news-navigation\"><div class=\"news-tabs\" "
"role=\"tablist\" aria-label=\"Postfach und Archiv\">";
for (const auto &f : {std::string("inbox"), std::string("archive")})
for (const auto &f : (engine_mode_?std::vector<std::string>{"inbox","archive","trash"}:std::vector<std::string>{"inbox","archive"}))
content +=
btn("news-folder",
"<span>" + std::string(f == "inbox" ? "Postfach" : "Archiv") +
"<span>" + std::string(f == "inbox" ? "Postfach" : f=="archive"?"Archiv":"Papierkorb") +
"</span><span class=\"news-tab-count\">" +
std::to_string(data.at("counts").at(f).get<int>()) + "</span>",
std::string("news-tab ") + (folder == f ? "active" : ""),
@@ -188,19 +186,18 @@ std::string App::render_news() {
(data.at("unbound_count").get<size_t>() == 1
? " Altbestand ohne Besitzerbeleg unverändert erhalten"
: " Altbestände ohne Besitzerbeleg unverändert erhalten"));
if(engine_mode_&&!data.at("unsupported").empty())content+=esc(" · "+std::to_string(data.at("unsupported").size())+" weitere Berichte sind noch nicht aufbereitet");
content += "</p>" +
btn("news-undo", glyph("undo", 32) + "<span>Rückgängig</span>",
"news-undo",
"id=\"news-undo\" style=\"display:" +
std::string(news_undo_.is_array() && !news_undo_.empty()
std::string((engine_mode_?engine_news_undo_.is_object():news_undo_.is_array() && !news_undo_.empty())
? "flex"
: "none") +
";\"") +
"</div></div>";
if (!news_dialog_.empty()) {
const auto all = demo_news_view(
*s.world, s.state, folder, "",
ui_preferences_.at("display").value("language", std::string("de")));
const auto all = news_data(folder,"");
const auto &items = all.at("items");
const auto found =
std::find_if(items.begin(), items.end(),
@@ -215,9 +212,7 @@ std::string App::render_news() {
btn("close", "<span>×</span>", "close",
"id=\"window-close\" aria-label=\"Fenster schließen\"") +
"<h1>Nachrichten</h1></div><div class=\"content\">" + content +
"</div><div class=\"news-screen-footer\"><span>Fiktive "
"Meldungen · Modern UI "
"Demo</span><span>OpenBMH</span></div><div "
"</div><div class=\"news-screen-footer\"><span>" + std::string(engine_mode_?"Dein Spieljournal":"Fiktive Meldungen · Modern UI Demo") + "</span><span>OpenBMH</span></div><div "
"class=\"news-homebar\"></div></div>";
}
+2
View File
@@ -7,6 +7,7 @@
#include "modern/ui/controls.hpp"
#include "modern/ui/crest_contrast.hpp"
#include "modern/ui/engine_bridge.hpp"
#include "modern/ui/news_catalog.hpp"
#include "modern/ui/career_files.hpp"
#include "modern/ui/live_match_info.hpp"
#include "modern/ui/script_locator.hpp"
@@ -1548,6 +1549,7 @@ public:
#include "modern/ui/engine_stadium.inc"
#include "modern/ui/engine_transfer.inc"
#include "modern/ui/engine_achievements.inc"
#include "modern/ui/engine_news.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {
+102
View File
@@ -0,0 +1,102 @@
// SPDX-License-Identifier: GPL-3.0-only
#include "modern/ui/engine_bridge.hpp"
#include "modern/ui/news_catalog.hpp"
#include <iostream>
#include <stdexcept>
using namespace bmh::modern_ui;
namespace {
void check(bool yes, const char *s) {
if (!yes)
throw std::runtime_error(s);
}
template <class F> void rejected(F f) {
bool caught = false;
try {
f();
} catch (const std::exception &) {
caught = true;
}
check(caught, "invalid news accepted");
}
} // namespace
int main(int argc, char **argv) try {
if (argc != 2)
throw std::runtime_error("catalogue path required");
const auto catalog = engine_news_catalogue(NewsCatalog::load(argv[1]));
const Json meta = {{"contractVersion", "bmh-modern-ui@draft1"},
{"careerId", "career:test"},
{"worldId", "world:test"},
{"worldRevision", "1"},
{"stateRevision", "3"},
{"date", "2026-07-01"},
{"scope",
{{"role", "club"},
{"managerId", "manager:test"},
{"teamId", "club:test"},
{"allowedCommands", {"news.update"}}}}};
Json b;
for (auto *k : {"session", "desktop", "camps"})
b[k] = {
{"messageType", "snapshot"}, {"meta", meta}, {"data", {{"kind", k}}}};
b["desktop"]["data"].update(
{{"manager", {{"id", "manager:test"}, {"name", "Synthetic Manager"}}},
{"team", {{"id", "club:test"}, {"name", "Synthetic Club"}}},
{"accounts",
{{"cash",
{{"currency", "EUR"}, {"minorUnits", 2}, {"minor", "100"}}}}}});
b["camps"]["data"]["camps"] = Json::array();
Json r = {{"messageType", "snapshot"},
{"meta", meta},
{"data",
{{"kind", "news"},
{"events", Json::array()},
{"messages",
Json::array({{{"id", "message:1"},
{"ownerManagerId", "manager:test"},
{"date", "2026-07-01"},
{"subject", {{"text", "Änderung"}}},
{"paragraphs",
Json::array({{{"text", "First paragraph"}},
{{"text", "Second paragraph"}}})},
{"folder", "inbox"},
{"read", false}}})}}}};
const auto before = r;
const auto value = engine_news_projection(b, r, catalog, "de");
check(r == before, "news read mutated source");
check(value.at("items")[0].at("body") ==
"First paragraph\n\nSecond paragraph",
"paragraph loss");
auto view = engine_news_view(value, "inbox", "ÄNDERUNG");
check(view.at("items").size() == 1 && view.at("shown_unread") == 1 &&
view.at("can_read"),
"unicode search or unread wrong");
check(engine_news_view(value, "archive", "").at("items").empty(),
"folder filter wrong");
const auto command =
engine_news_command(b, value, "message:1", "archive", "request:test");
check(command.at("expectedRevision") == "3" &&
command.at("payload").at("messageId") == "message:1",
"command lost owner/id");
auto bad = r;
bad["data"]["messages"][0]["ownerManagerId"] = "foreign";
rejected([&] { engine_news_projection(b, bad, catalog, "de"); });
bad = r;
bad["meta"]["stateRevision"] = "4";
rejected([&] { engine_news_projection(b, bad, catalog, "de"); });
rejected(
[&] { engine_news_command(b, value, "missing", "read", "request:x"); });
rejected([&] {
engine_news_command(b, value, "message:1", "erase", "request:x");
});
auto immutable = value;
immutable["items"][0]["mutable"] = false;
rejected([&] {
engine_news_command(b, immutable, "message:1", "trash", "request:x");
});
std::cout << "news ownership, actual text, folders, Unicode search and "
"commands passed\n";
return 0;
} catch (const std::exception &e) {
std::cerr << e.what() << '\n';
return 1;
}