Bind native balance planning and restore its saved runtime value (by Codex)

This commit is contained in:
Codex committed 2026-10-29 13:32:10 +01:00
1 parent 256d6d5211
commit fd5c2b5330
24 files changed
+717 -28

No files matched your search

+2 -2
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 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)
add_library(bmh_modern_ui_core STATIC catalog.cpp crest_contrast.cpp engine_dto.cpp engine_statistics.cpp engine_toto.cpp engine_stadium.cpp engine_transfer.cpp engine_achievements.cpp engine_news.cpp engine_balance.cpp model.cpp demo_career.cpp demo_national_ui.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_live.cpp demo_post_match.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp demo_stadium.cpp demo_statistics.cpp demo_news.cpp news_catalog.cpp news_journal.cpp demo_settings.cpp ui_preferences.cpp demo_widgets.cpp demo_files.cpp career_files.cpp demo_opening.cpp)
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
add_library(bmh_modern_ui_mods STATIC mod_library.cpp)
@@ -49,7 +49,7 @@ foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss report
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
endforeach()
foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_projection news_projection)
foreach(component career_reports rankings career_files statistics_projection toto_projection stadium_projection transfer_projection achievements_projection news_projection balance_projection)
add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp)
target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core)
if(MSVC)
+100
View File
@@ -0,0 +1,100 @@
// SPDX-License-Identifier: GPL-3.0-only
// OpenBMH deviates from the original: viewing a balance is read-only and publishing a changed plan requires explicit confirmation.
#include "modern/ui/engine_bridge.hpp"
#include <algorithm>
#include <set>
namespace bmh::modern_ui {
namespace {
void check(bool yes, const char *text) {
if (!yes)
throw editor::Error(text);
}
const Json &balance_read(const Json &b, const Json &r) {
validate_engine_desk(b);
check(r.value("messageType", "") == "snapshot" &&
r.at("data").value("kind", "") == "balance",
"Die Bilanz ist hier nicht verfügbar.");
for (auto *k : {"contractVersion", "careerId", "worldId", "worldRevision",
"stateRevision", "scope"})
check(r.at("meta").at(k) == b.at("desktop").at("meta").at(k),
"Die Bilanz gehört zu einem anderen Spielstand.");
check(r.at("data").at("teamId") ==
b.at("desktop").at("meta").at("scope").at("teamId") &&
r.at("meta").at("scope").at("role") == "club",
"Die Bilanz gehört einem anderen Verein.");
return r.at("data");
}
} // namespace
Json engine_balance_projection(const Json &b, const Json &r) {
const auto &d = balance_read(b, r);
check(d.at("items").size() == 18 && d.at("summaries").size() == 6,
"Die Bilanz ist unvollständig.");
Json income = Json::array(), costs = Json::array(), plan = Json::array();
std::set<std::string> ids;
for (const auto &row : d.at("items")) {
const auto id = row.at("id").get<std::string>();
check(ids.insert(id).second, "Doppelter Bilanzposten.");
Json entry = {
{"id", id},
{"name", row.at("label")},
{"amount", engine_money_minor(row.at("amount"))},
{"editable", row.at("editable")},
{"maximum", row.at("maximum").is_null()
? Json()
: Json(engine_money_minor(row.at("maximum")) / 100)}};
if (row.at("section") == "income")
income.push_back(entry);
else {
check(row.at("section") == "costs", "Unbekannter Bilanzbereich.");
costs.push_back(entry);
plan.push_back(entry);
}
}
const int64_t dep = engine_money_minor(d.at("depreciation"));
Json depreciation = {{"id", "balance:depreciation"},
{"name", d.at("depreciationLabel")},
{"amount", dep < 0 ? -dep : dep},
{"editable", false},
{"maximum", nullptr}};
if (dep < 0)
income.push_back(depreciation);
else
costs.push_back(depreciation);
const auto &s = d.at("summaries");
return {{"ok", true},
{"income", income},
{"costs", costs},
{"plan", plan},
{"plan_total", engine_money_minor(d.at("costs"))},
{"league_home_games", s[0].at("value")},
{"other_home_games", s[1].at("value")},
{"attendance_average", s[4].at("value")},
{"ticket", engine_money_minor(s[3].at("value"))},
{"cash", engine_money_minor(s[5].at("value"))},
{"balance", engine_money_minor(d.at("net"))},
{"warning", d.at("warning")},
{"warning_text", d.at("warningText")}};
}
Json engine_balance_command(const Json &b, const Json &r,
const std::string &id) {
const auto &d = balance_read(b, r), &m = b.at("desktop").at("meta");
const auto &commands = m.at("scope").at("allowedCommands");
check(!id.empty() && std::find(commands.begin(), commands.end(),
Json("balance.commit")) != commands.end(),
"Planänderungen sind hier gesperrt.");
check(d.at("view") == "future" && d.at("edits").is_array() &&
!d.at("edits").empty(),
"Kein bestätigter Planentwurf vorhanden.");
(void)engine_balance_projection(b, r);
return {{"messageType", "command"},
{"requestId", id},
{"careerId", m.at("careerId")},
{"expectedRevision", m.at("stateRevision")},
{"owner", {{"managerId", m.at("scope").at("managerId")}}},
{"kind", "balance.commit"},
{"payload",
{{"view", "future"},
{"edits", d.at("edits")},
{"acceptWarning", d.at("warning")}}}};
}
} // namespace bmh::modern_ui
+198
View File
@@ -0,0 +1,198 @@
// SPDX-License-Identifier: GPL-3.0-only
Json App::balance_rows() const {
if (!engine_mode_)
return demo_balance_rows(snap().state, *world_);
return engine_balance_projection(
engine_data_,
balance_future_ ? engine_balance_future_ : engine_data_.at("balance"));
}
std::string App::balance_cash(const Json &minor) const {
return engine_mode_
? engine_price({{"currency", "EUR"},
{"minorUnits", 2},
{"minor", std::to_string(minor.get<int64_t>())}})
: cash(minor.get<int64_t>());
}
void App::engine_balance_sync() {
const auto &meta = engine_data_.at("desktop").at("meta");
if (meta != engine_balance_context_) {
engine_balance_context_ = meta;
engine_balance_edits_ = Json::array();
engine_balance_future_ = Json();
engine_balance_base_ = Json();
balance_future_ = false;
}
if (engine_balance_committing_) {
engine_balance_committing_ = false;
if (engine_response_.value("messageType", "") == "command_result") {
const auto after = engine_balance_after_;
engine_balance_after_.clear();
engine_balance_continue(after);
} else {
engine_balance_after_.clear();
message(engine_notice_);
}
}
}
void App::engine_balance_preview(const EngineReply &reply) {
const auto &read = reply.response.at("read");
if (reply.response.at("edits") != engine_balance_edits_ ||
reply.bundle.at("desktop").at("meta") != engine_balance_context_)
throw editor::Error("Der Bilanzentwurf hat sich geändert.");
if (read.value("messageType", "") != "snapshot") {
engine_balance_edits_ = engine_balance_future_.is_object()
? engine_balance_future_.at("data").at("edits")
: Json::array();
engine_balance_feedback_ = engine_text(read.value("message", Json()));
message(engine_balance_feedback_);
return;
}
(void)engine_balance_projection(engine_data_, read);
engine_balance_future_ = read;
if (engine_balance_edits_.empty())
engine_balance_base_ = read;
balance_future_ = true;
engine_balance_feedback_ = engine_balance_edits_.empty()
? "Prognose der Engine für zwölf Monate."
: "Planentwurf · Noch nicht übernommen.";
focus_after_render_ = "balance-toggle";
}
void App::engine_balance_load_future() {
auto link = engine_link_;
const auto edits = engine_balance_edits_;
engine_start("Bilanzprognose wird berechnet …", [link, edits] {
const auto bundle = link->snapshot();
return EngineReply{link,
bundle,
{{"messageType", "balance_preview"},
{"edits", edits},
{"read", link->read({{"kind", "balance"},
{"view", "future"},
{"edits", edits}})}},
nullptr};
});
}
void App::engine_balance_continue(const std::string &after) {
engine_balance_edits_ = Json::array();
engine_balance_future_ = engine_balance_base_ = Json();
balance_future_ = false;
menu_.clear();
refresh();
if (after == "quit")
engine_quit();
else if (after == "save")
engine_save();
else if (after == "library-save")
engine_files_begin("save");
else if (after == "load")
engine_files_begin("load");
}
void App::engine_balance_close(const std::string &after) {
if (engine_balance_edits_.empty()) {
engine_balance_continue(after);
return;
}
if (engine_busy_ || !engine_fresh_)
return;
const auto request = engine_balance_command(
engine_data_, engine_balance_future_, editor::new_id("request:ui-"));
const auto &d = engine_balance_future_.at("data");
std::string text = "Zukunftsplanung mit einem Ergebnis von " +
engine_price(d.at("net")) + " übernehmen?";
if (d.at("warning") == true)
text += " " + engine_text(d.at("warningText"));
engine_balance_after_ = after;
confirmation(text, [this, request, after] {
engine_balance_after_ = after;
engine_balance_committing_ = true;
auto link = engine_link_;
engine_start(
"Bilanzplanung wird übernommen …",
[link, request] {
const auto response = link->command(request);
return EngineReply{link, link->snapshot(), response, nullptr};
},
true);
});
popup_accept_ = "Übernehmen";
popup_extra_ =
btn("balance-discard", "Entwurf verwerfen", "", "id=\"balance-discard\"");
}
bool App::engine_balance_action(const std::string &action,
Rml::Element *target) {
if (menu_ != "balance")
return false;
if (action == "balance-discard") {
const auto after = engine_balance_after_;
popup_.clear();
reset_popup();
engine_balance_after_.clear();
engine_balance_continue(after);
return true;
}
if (engine_busy_ || !engine_fresh_)
return true;
if (action == "close") {
engine_balance_close("menu");
return true;
}
if (action == "balance-toggle") {
if (balance_future_) {
balance_future_ = false;
refresh();
} else if (engine_balance_future_.is_object()) {
balance_future_ = true;
refresh();
} else
engine_balance_load_future();
return true;
}
if (action != "balance-plan" || !target || !balance_future_ ||
!engine_balance_future_.is_object())
return action.starts_with("balance-");
const int index = target->GetAttribute<int>("data-id", -1);
const auto rows = balance_rows();
if (index < 0 || size_t(index) >= rows.at("plan").size())
return true;
const auto row = rows.at("plan")[size_t(index)];
if (row.at("editable") != true)
return true;
const auto context = engine_balance_context_, before = engine_balance_edits_;
const auto id = row.at("id");
AmountRequest a;
a.title = row.at("name");
a.unit = "€";
a.min = 0;
a.max = row.at("maximum");
a.value = row.at("amount").get<int64_t>() / 100;
a.step = 1;
a.suggestion_step = 50000;
a.return_focus = target->GetId();
a.review = false;
a.accept = [this, context, before, id](int64_t value) {
if (menu_ != "balance" || engine_balance_context_ != context ||
engine_balance_edits_ != before || !engine_balance_base_.is_object())
return false;
auto edits = before;
edits.erase(std::remove_if(edits.begin(), edits.end(),
[&](const auto &e) { return e.at("id") == id; }),
edits.end());
const auto &items = engine_balance_base_.at("data").at("items");
const auto found =
std::find_if(items.begin(), items.end(),
[&](const auto &r) { return r.at("id") == id; });
if (found == items.end())
return false;
if (engine_money_minor(found->at("amount")) != value * 100)
edits.push_back({{"id", id},
{"amount",
{{"currency", "EUR"},
{"minorUnits", 2},
{"minor", std::to_string(value * 100)}}}});
engine_balance_edits_ = edits;
engine_balance_load_future();
return true;
};
open_amount(std::move(a));
return true;
}
+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","news"})bundle[kind]=from_engine(session.ui_read(cli::Json::Object{{"kind",kind}},revision));
for(const auto *kind:{"session","desktop","camps","squad","lineup","tactics","training","bank","stadium","credit","environment","advertising","contracts","friendly-plan","toto","transfer","achievements","news","balance"})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;
+3
View File
@@ -72,6 +72,9 @@ Json engine_toto_command(const Json &bundle,const Json &quote,const std::string
Json engine_statistics_projection(const Json &bundle,const Json &read);
Json engine_balance_projection(const Json &,const Json &);
Json engine_balance_command(const Json &,const Json &,const std::string &);
class NewsCatalog;
NewsCatalog engine_news_catalogue(const NewsCatalog &);
Json engine_news_projection(const Json &,const Json &,const NewsCatalog &,const std::string &);
+11 -2
View File
@@ -33,6 +33,7 @@ void App::engine_accept(EngineReply result) {
engine_stadium_poll();
engine_transfer_sync();
engine_news_sync();
engine_balance_sync();
engine_contracts_poll();
engine_calendar_sync();
engine_friendly_sync();
@@ -48,6 +49,7 @@ void App::engine_poll() {
try {
auto result = engine_job_.get();
validate_engine_desk(result.bundle);
if(result.response.value("messageType","")=="balance_preview"){engine_balance_preview(result);refresh();return;}
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;}
@@ -124,6 +126,7 @@ void App::engine_frame() {
renderer_.Clear(); renderer_.BeginFrame(); context_->Render(); renderer_.EndFrame(); video_.present(); dirty_ = false;
}
void App::engine_save() {
if(menu_=="balance"&&!engine_balance_edits_.empty()){engine_balance_close("save");return;}
if (engine_busy_ || engine_files_busy_ || !engine_link_) return;
if(config_.file_export.empty()){engine_files_begin("save");return;}
auto output = config_.file_export;
@@ -139,6 +142,7 @@ void App::engine_save() {
engine_start("Spielstand wird gespeichert …", [link, output] { auto response = link->save_copy(output); return EngineReply{link, link->snapshot(), response, nullptr}; });
}
void App::engine_quit() {
if(menu_=="balance"&&!engine_balance_edits_.empty()){engine_balance_close("quit");return;}
if(!engine_busy_&&engine_data_.value("stadium",Json()).is_object()&&engine_data_.at("stadium").value("messageType","")=="snapshot"&&engine_data_.at("stadium").at("data").at("quote").is_object()){engine_stadium_exit_=true;engine_stadium_send(engine_stadium_commit(engine_data_,false,editor::new_id("request:ui-")),"cancel");return;}
if (engine_busy_ || engine_files_busy_) { engine_notice_ = "Bitte den laufenden Vorgang abwarten."; dirty_ = true; return; }
if (engine_dirty_) {
@@ -174,6 +178,7 @@ void App::engine_event(Rml::Event &event) {
if(menu_=="transfer"&&transfer_event(event))return;
if(menu_=="achievements"&&career_report_event(event))return;
if(menu_=="news"&&news_event(event))return;
if(menu_=="balance"&&!engine_busy_&&popup_.empty()&&finance_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;
@@ -205,6 +210,7 @@ void App::engine_event(Rml::Event &event) {
if (!popup_.empty()) { popup_.clear(); reset_popup(); engine_files_pending_load_.reset(); engine_exit_after_save_=false; dirty_ = true; }
else if (!engine_busy_ && !engine_player_.empty()) { focus_after_render_ = "lineup-detail-" + engine_player_ + "-0"; engine_player_.clear(); refresh(); }
else if (!engine_busy_ && menu_ == "almanac") engine_almanac_action("alm-back",nullptr);
else if(!engine_busy_&&menu_=="balance"){engine_balance_close("menu");}
else if (!engine_busy_ && !menu_.empty()) { if (menu_ == "training" || menu_ == "tactics") engine_sports_reset(); if(menu_=="scorers"||menu_=="fairplay")rankings_remember_scroll(); menu_.clear(); refresh(); }
else engine_quit();
event.StopImmediatePropagation(); return;
@@ -227,7 +233,7 @@ void App::engine_event(Rml::Event &event) {
}
event.StopImmediatePropagation(); return;
}
if(type=="keydown"&&popup_.empty()&&menu_.empty()&&!engine_busy_&&!engine_files_busy_) {
if(type=="keydown"&&popup_.empty()&&(menu_.empty()||menu_=="balance")&&!engine_busy_&&!engine_files_busy_) {
const auto key=Rml::Input::KeyIdentifier(event.GetParameter<int>("key_identifier",0));
if(event.GetParameter<int>("ctrl_key",0)&&(key==Rml::Input::KI_S||key==Rml::Input::KI_O)){engine_files_begin(key==Rml::Input::KI_S?"save":"load");event.StopImmediatePropagation();return;}
}
@@ -256,6 +262,7 @@ void App::engine_event(Rml::Event &event) {
if (!node->HasAttribute("data-action") || node->HasAttribute("disabled")) continue;
const auto action = node->GetAttribute<Rml::String>("data-action", ""), id = node->GetAttribute<Rml::String>("data-id", "");
if (!popup_.empty()) {
if(action=="balance-discard"){engine_balance_action(action,node);return;}
if (action == "popup-close") { popup_.clear(); reset_popup(); engine_files_pending_load_.reset(); engine_exit_after_save_=false; dirty_ = true; }
if(action=="files-save-before-load"){const auto pending=engine_files_pending_load_;reset_popup();popup_.clear();engine_files_begin("save");engine_files_pending_load_=pending;return;}
if(action=="engine-save-exit"){reset_popup();popup_.clear();engine_exit_after_save_=true;try{engine_save();}catch(const std::exception &e){engine_exit_after_save_=false;message(e.what());}return;}
@@ -271,6 +278,7 @@ void App::engine_event(Rml::Event &event) {
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(menu_=="balance"&&engine_balance_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;
@@ -287,6 +295,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=="balance"){menu_=id;balance_future_=false;engine_balance_feedback_="Gebuchte Saisonwerte.";refresh();}
else if(action=="engine-open"&&id=="news"){menu_=id;news_dialog_.clear();refresh();}
else if(action=="engine-open"&&id=="achievements"){menu_=id;career_view_=Json::object();refresh();}
else if(action=="engine-open"&&id=="transfer"){menu_=id;transfer_view_=Json::object();transfer_dialog_.clear();engine_transfer_sync();refresh();}
@@ -324,5 +333,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_},
{"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_}};
{"balance_future",engine_balance_future_},{"balance_edits",engine_balance_edits_},{"balance_view_future",balance_future_},{"news_error",engine_news_error_},{"news_value",engine_news_value_},{"news_view",news_view_},{"news_undo",engine_news_undo_},{"achievements_value",engine_mode_&&engine_data_.value("achievements",Json()).value("messageType","")=="snapshot"?achievements_data(career_view_.value("page",0)):Json()},{"career_view",career_view_},{"transfer_value",engine_transfer_value_},{"transfer_filters",engine_transfer_filters_},{"transfer_draft",transfer_draft_},{"transfer_view",transfer_view_},{"response", engine_response_}, {"stadium_view",stadium_view_},{"stadium_value",engine_stadium_value_},{"toto_value",engine_toto_value_},{"toto_draft",engine_toto_edit_},{"toto_quote",engine_toto_quote_},{"toto_feedback",engine_toto_feedback_},{"statistics_read",engine_statistics_read_},{"statistics_value",engine_statistics_value_},{"statistics_query",engine_statistics_query_},{"files_native",files_native_},{"files_busy",engine_files_busy_},{"files_current",engine_files_metadata_},{"opening_read",engine_opening_read_},{"opening_state",engine_opening_state_},{"rankings_read",engine_rankings_read_},{"rankings_state",engine_rankings_state_},{"fairplay_read",engine_fairplay_read_},{"other_index",engine_other_index_},{"other_read",engine_other_read_},{"fixtures_read",engine_fixtures_read_},{"reports_state",engine_reports_state_},{"reports_index",engine_reports_index_},{"reports_read",engine_reports_read_},{"reports_roster",engine_reports_roster_},{"almanac_cache",engine_almanac_cache_}, {"almanac_context",engine_almanac_context_}, {"friendly_quote", engine_friendly_read_}, {"friendly_league", engine_friendly_league_}, {"friendly_opponent", engine_friendly_opponent_}, {"friendly_date", engine_friendly_date_}, {"friendly_home", engine_friendly_home_}, {"friendly_stage", engine_friendly_stage_}, {"friendly_month", engine_friendly_month_}, {"calendar_day", engine_calendar_day_}, {"move_id", engine_move_id_}, {"credit_preview", engine_credit_}, {"credit_edits", engine_credit_edits_}, {"training_draft", engine_training_draft_}, {"tactics_draft", engine_tactics_draft_}, {"player_profile", engine_player_}, {"lineup_selected", lineup_selected_}, {"focus", engine_focus_}, {"selected_camp", engine_camp_}, {"notice", engine_notice_}};
}
+2 -1
View File
@@ -6,6 +6,7 @@ void App::engine_files_start(std::string label,std::function<EngineFilesReply()>
if(engine_files_busy_||engine_busy_)return;engine_files_busy_=true;files_feedback_=std::move(label);engine_files_job_=std::async(std::launch::async,std::move(work));refresh();
}
void App::engine_files_begin(const std::string &mode) {
if(engine_mode_&&menu_=="balance"&&!engine_balance_edits_.empty()){engine_balance_close(mode=="save"?"library-save":"load");return;}
if(engine_files_busy_||engine_busy_)return;
if(!world_){const auto *active=mod(active_mod_);if(!active||active->type!="Modern"||!active->error.empty()){message("Bitte zuerst eine spielbare Modern-Mod aktivieren.");return;}load_world(active->file);}
reset_files();files_native_=true;files_mode_=mode;menu_=mode;files_world_=world_;files_name_="Spielstand 1";engine_files_metadata_=Json();
@@ -21,7 +22,7 @@ void App::engine_files_poll() {
try {
auto result=engine_files_job_.get();
if(result.operation=="loaded") {
stadium_view_=Json::object();engine_stadium_context_=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();
stadium_view_=Json::object();engine_stadium_context_=Json();engine_toto_context_=Json();engine_toto_quote_=Json();engine_reports_context_=Json();engine_balance_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);
+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=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (route=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
const bool supported = ((route=="tables"||route=="strengths"||route=="league"||route=="other"||route=="scorers"||route=="fairplay")&&engine_fresh_&&meta.at("scope").at("role")=="club") || (route == "almanac" && engine_fresh_) || (route == "friendlies" && friendlies_available && engine_fresh_) || (route == "calendar" && calendar_available && engine_fresh_) || (route == "postpone" && scheduling_available && engine_fresh_) || (route == "contracts" && contracts_available && engine_fresh_) || (route == "environment" && environment_available && engine_fresh_) || (route == "advertising" && advertising_available && engine_fresh_) || (route == "bank" && bank_available && engine_fresh_) || (route == "training" && training_available && engine_fresh_) || (route == "tactics" && tactics_available && engine_fresh_) || (route == "lineup" && lineup_available && engine_fresh_) || (route=="balance"&&engine_fresh_&&engine_data_.at("balance").value("messageType","")=="snapshot") || (route=="news"&&engine_fresh_&&engine_news_value_.is_object()) || (route=="achievements"&&engine_fresh_&&engine_data_.at("achievements").value("messageType","")=="snapshot"&&engine_data_.at("achievements").at("data").at("available")==true) || (route=="transfer"&&engine_fresh_&&engine_transfer_value_.is_object()) || (route=="stadium"&&engine_fresh_&&engine_stadium_value_.is_object()) || (route=="toto"&&engine_fresh_&&engine_toto_value_.is_object()) || (route=="statistics"&&engine_fresh_) || route == "save" || route == "load" || (route == "camp" && engine_fresh_ && camp_allowed && std::find(commands.begin(), commands.end(), Json("camp.book")) != commands.end());
out += desktop_button(id, o, "engine-open", supported && !engine_busy_);
}
}
@@ -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_=="balance")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Bilanz",render_balance())+"</div>";
if(menu_=="news")out+="<div class=\"fill\" style=\"z-index:100;\">"+render_news()+"</div>";
if(menu_=="achievements")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Erfolge",render_achievements())+"</div>";
if(menu_=="transfer")out+="<div class=\"fill\" style=\"z-index:100;\">"+window("Transfers",render_transfer())+"</div>";
+12
View File
@@ -144,3 +144,15 @@
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 *);
Json engine_balance_context_,engine_balance_future_,engine_balance_base_,engine_balance_edits_=Json::array();
std::string engine_balance_feedback_,engine_balance_after_;
bool engine_balance_committing_=false;
Json balance_rows() const;
std::string balance_cash(const Json &) const;
void engine_balance_sync();
void engine_balance_load_future();
void engine_balance_preview(const EngineReply &);
void engine_balance_close(const std::string &);
void engine_balance_continue(const std::string &);
bool engine_balance_action(const std::string &,Rml::Element *);
+1
View File
@@ -10,6 +10,7 @@ bool App::commit_finance(const Json &change, uint64_t revision) {
return true;
}
bool App::finance_action(const std::string &action, Rml::Element *target) {
if(engine_mode_)return engine_balance_action(action,target);
if (menu_ != "balance") return false;
if (action == "balance-toggle") {
balance_future_ = !balance_future_;
+10 -10
View File
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-3.0-only
std::string App::render_balance() {
const auto rows = demo_balance_rows(snap().state, *world_);
const auto rows = balance_rows();
if (!rows.value("ok", false)) throw editor::Error("Die Bilanzdaten sind ungültig.");
std::string out = "<div class=\"balance-native\">";
if (balance_future_) {
@@ -9,13 +9,13 @@ std::string App::render_balance() {
for (const auto &row : rows.at("plan")) {
const auto name = row.at("name").get<std::string>();
out += "<div class=\"balance-plan-row\"><span>" + esc(name) + "</span>" +
btn("balance-plan", esc(number(row.at("amount").get<int64_t>() / finance_currency_factor(*world_))),
btn("balance-plan", esc(number(row.at("amount").get<int64_t>() / (engine_mode_?100:finance_currency_factor(*world_)))),
"balance-plan-value amount-trigger", "id=\"balance-plan-" + std::to_string(i) +
"\" data-id=\"" + std::to_string(i) + "\" aria-label=\"" + esc(name + " in " + (money_unit() == "€" ? "Euro" : money_unit())) + "\"") + "</div>";
"\" data-id=\"" + std::to_string(i) + "\" aria-label=\"" + esc(name + " in " + (engine_mode_?"Euro":money_unit() == "€" ? "Euro" : money_unit())) + "\" " + std::string(engine_mode_&&row.at("editable")!=true?"disabled":"")) + "</div>";
++i;
}
out += "</div></section><p class=\"balance-plan-total\"><span>Geplante Ausgaben</span><span>" +
esc(cash(rows.at("plan_total").get<int64_t>())) + "</span></p>";
esc(balance_cash(rows.at("plan_total").get<int64_t>())) + "</span></p>";
} else {
int index = 0;
for (const auto &kind : {std::string("income"), std::string("costs")}) {
@@ -25,7 +25,7 @@ std::string App::render_balance() {
int n = 0;
for (const auto &row : rows.at(kind)) {
out += "<div class=\"balance-row" + std::string(n++ % 2 == 0 ? " striped" : "") + "\"><span>" +
esc(row.at("name").get<std::string>()) + "</span><span>" + esc(cash(row.at("amount").get<int64_t>())) + "</span></div>";
esc(row.at("name").get<std::string>()) + "</span><span>" + esc(balance_cash(row.at("amount").get<int64_t>())) + "</span></div>";
}
out += "</div></section>";
}
@@ -33,15 +33,15 @@ std::string App::render_balance() {
number(rows.at("league_home_games").get<int64_t>()) + " Liga-Heimspiele",
number(rows.at("other_home_games").get<int64_t>()) + " sonstige Heimspiele",
"Zuschauerschnitt: " + number(rows.at("attendance_average").get<int64_t>()),
"Eintrittspreis: " + cash(rows.at("ticket").get<int64_t>()),
"Kontostand: " + cash(rows.at("cash").get<int64_t>()),
"Saldo: " + cash(rows.at("balance").get<int64_t>())};
"Eintrittspreis: " + balance_cash(rows.at("ticket").get<int64_t>()),
"Kontostand: " + balance_cash(rows.at("cash").get<int64_t>()),
"Saldo: " + balance_cash(rows.at("balance").get<int64_t>())};
for (int i = 0; i < 6; ++i)
out += "<p class=\"balance-summary-item" + std::string(i == 5 ? " balance-net" : "") + "\" style=\"" +
out += "<p class=\"balance-summary-item" + std::string(i == 5 ? " balance-net" : "") + (engine_mode_&&(i==4||i==5)?" "+money_classes(rows.at(i==4?"cash":"balance").get<int64_t>()):std::string()) + "\" style=\"" +
rect(26 + (i % 2) * 1310, 1526 + (i / 2) * 68, 1250, 38) + "\">" + esc(values[size_t(i)]) + "</p>";
}
out += btn("balance-toggle", "<span>" + std::string(balance_future_ ? "Zukunft" : "Aktuell") +
"</span><span class=\"balance-cycle\" aria-hidden=\"true\"><span class=\"cycle-line cycle-top\"></span><span class=\"cycle-line cycle-bottom\"></span><span class=\"cycle-head cycle-right\"></span><span class=\"cycle-head cycle-left\"></span></span>", "balance-toggle report-reset",
"id=\"balance-toggle\" aria-label=\"Zwischen aktueller Bilanz und Zukunftsplanung wechseln\"");
return out + "</div>";
return out + (engine_mode_?"<p id=\"balance-engine-feedback\" style=\"position:absolute;left:0;right:0;bottom:106dp;font-size:24dp;line-height:28dp;\">"+esc(engine_busy_?engine_operation_:engine_balance_feedback_)+"</p>":"") + "</div>";
}
+1
View File
@@ -1550,6 +1550,7 @@ public:
#include "modern/ui/engine_transfer.inc"
#include "modern/ui/engine_achievements.inc"
#include "modern/ui/engine_news.inc"
#include "modern/ui/engine_balance.inc"
} // namespace
bool is_modern_world(const fs::path &file) {
try {