Bind native manager actions and preserve ongoing Modern standings (by Codex)

This commit is contained in:
Codex committed 2026-10-29 21:24:49 +01:00
1 parent f9f950fc7f
commit cf424b6be1
31 files changed
+466 -100

No files matched your search

+14 -13
View File
@@ -1,9 +1,8 @@
// SPDX-License-Identifier: GPL-3.0-only
std::string App::render_career() {
const auto s = snap();
const auto c = demo_career_context(s.state, *s.world);
const auto c = engine_mode_?engine_career_context():demo_career_context(snap().state,*snap().world);
const bool ended = c.at("ended");
const auto &m = manager(s);
const Json m = engine_mode_?engine_manager_value_.at("active"):manager(snap());
std::string body =
"<section class=\"career-hub\"><header><div><h2>" +
esc(ended ? "Karriere beendet" : m.value("name", "")) + "</h2><p>" +
@@ -16,7 +15,7 @@ std::string App::render_career() {
person.value("portrait", 0) == m.value("portrait", 0) ? "selected" : "",
"id=\"career-manager-" + std::to_string(person.value("portrait", 0)) +
"\" data-id=\"" + std::to_string(person.value("portrait", 0)) +
"\" aria-pressed=\"" +
"\" " + (engine_mode_?"disabled ":"") + "aria-pressed=\"" +
(person.value("portrait", 0) == m.value("portrait", 0) ? "true"
: "false") +
"\"");
@@ -33,11 +32,11 @@ std::string App::render_career() {
"id=\"" + action + "\" " + (disabled ? "disabled" : ""));
};
body += card("career-resign", "manager.resign", "Aufgeben",
"Dein Amt abgeben", "career-resign", ended) +
engine_mode_&&engine_manager_value_.at("can_resign")!=true?"Mehrspieler folgt":"Dein Amt abgeben", "career-resign", ended||(engine_mode_&&engine_manager_value_.at("can_resign")!=true)) +
card("career-search", "manager.search", "Vereinssuche", "Später",
"career-search", true) +
card("career-add", "manager.add", "Neuer Spieler",
"Weiteren Menschen einrichten", "career-add", ended) +
"Weiteren Menschen einrichten", "career-add", ended||(engine_mode_&&engine_manager_value_.at("can_join")!=true)) +
"</div><footer><section><span>Dein Aufgabenbereich</span><div>";
for (const auto &role : c.at("available_roles")) {
const auto id = role.get<std::string>();
@@ -46,21 +45,23 @@ std::string App::render_career() {
"id=\"career-role-" + id + "\" data-id=\"" + id +
"\" aria-pressed=\"" +
(c.at("role") == role ? "true" : "false") + "\" " +
(ended ? "disabled" : ""));
(ended||engine_mode_ ? "disabled" : ""));
}
body += "</div></section><section><span>Aufstellung · Vorschau</span><div>";
for (const auto *surface : {"outdoor", "indoor"})
for (const auto *surface : {"outdoor", "indoor"}) {
if(engine_mode_&&c.at("surface")!=surface)continue;
body += btn("career-surface",
std::string(surface) == "indoor" ? "Halle · 6 Spieler"
std::string(surface) == "indoor" ? (engine_mode_?"Halle · Wechselpaare":"Halle · 6 Spieler")
: "Rasen · 11 Spieler",
c.at("surface") == surface ? "selected" : "",
"id=\"career-surface-" + std::string(surface) +
"\" data-id=\"" + surface + "\" aria-pressed=\"" +
(c.at("surface") == surface ? "true" : "false") + "\" " +
(ended || (std::string(surface) == "indoor" &&
(ended || engine_mode_ || (std::string(surface) == "indoor" &&
c.at("role") == "national")
? "disabled"
: ""));
}
body += "</div></section></footer></section>";
if (career_resign_open_ || career_game_end_) {
body = "<div id=\"career-underlay\" aria-hidden=\"true\">" + body +
@@ -79,12 +80,12 @@ std::string App::render_career() {
else {
std::vector<std::pair<std::string, std::string>> people;
for (const auto &person : c.at("active_managers")) {
const auto *club = s.world->find("clubs", person.value("club", ""));
const auto *club = world_->find("clubs", person.value("club", ""));
people.emplace_back(
std::to_string(person.value("portrait", 0)),
person.value("name", "") + " · " +
(s.state.at("edits").at("setup").value("league", true)
? (club ? s.world->name(*club) : "")
((engine_mode_?c.at("role")!="national":snap().state.at("edits").at("setup").value("league", true))
? (club ? world_->name(*club) : "")
: "Deutschland"));
}
body +=