Line-up and training as pages; the friendlies' opponents as tiles

The line-up of the real game is the squad as a grouped table and the eleven as
shirts on a pitch seen from behind the own goal, or the whole squad as shirts.
Training keeps the game's own arrangement and pictures in the page's size and
inks. The opponents of a friendly are tiles in four columns with both crests.
The demo keeps the older line-up sheet.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Fable 5.2 committed 2026-11-15 18:42:07 +01:00
1 parent 9faf0acf81
commit c7d23185ec
7 files changed
+268 -109

No files matched your search

+53
View File
@@ -323,3 +323,56 @@ body .popup-box input {height:84dp;padding:0 26dp;border:2dp var(--p-div);border
.alm-row .pg-match-side strong {display:block;white-space:nowrap;}
.alm-ball {display:block;width:30dp;height:30dp;border:3dp var(--p-n9);border-radius:15dp;background-color:var(--p-n1);}
.alm-event span {display:block;}
/* --- the line-up: the squad as a table, the eleven as shirts on the pitch --- */
.pg-root .lp-cell,.pg-root .lp-cell:hover {display:block;flex:none;height:100%;padding:0 8dp;border:0dp;border-radius:0dp;background-color:transparent;decorator:none;font-family:Modern;font-size:30dp;font-weight:normal;color:var(--p-text);text-align:center;white-space:nowrap;overflow:hidden;}
.lp-cell span,.lp-cell strong {display:inline-block;}
.lp-cell .pg-pos,.lp-cell .pg-dots,.lp-cell .pg-tag,.lp-flag {display:inline-block;vertical-align:middle;}
.lp-cell .pg-dots span {display:inline-block;margin:0 3dp;}
.lp-flag {width:45dp;height:27dp;}
.lp-pitch {display:block;position:relative;flex:none;border:2dp var(--p-n5);border-radius:58dp;overflow:hidden;}
.lp-shirt,.lp-shirt:hover,.lp-shirt:disabled {display:flex;flex-direction:column;align-items:center;width:220dp;padding:4dp 0;border:0dp;border-radius:27dp;background-color:transparent;decorator:none;}
.lp-shirt:hover {background-color:#ffffff40;}
.lp-shirt.sel,.lp-shirt.sel:hover {background-color:#ffffff80;border:6dp var(--p-a8);padding:0;width:220dp;}
.lp-shirt-art {display:block;position:relative;width:100dp;height:100dp;}
.lp-num {display:block;position:absolute;left:0;top:24dp;width:100dp;line-height:44dp;text-align:center;font-family:Display;font-size:34dp;color:#ffffff;}
.lp-name {display:block;max-width:214dp;height:38dp;line-height:38dp;padding:0 16dp;border-radius:19dp;background-color:var(--p-n1);font-family:Modern;font-size:26dp;font-weight:bold;color:var(--p-text);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.lp-team {gap:14dp;overflow-y:auto;}
.lp-team-row {display:flex;flex-wrap:wrap;gap:14dp 0dp;}
.lp-team .lp-shirt {width:206dp;}
.lp-team .lp-shirt:hover {background-color:var(--p-row);}
.lp-team .lp-shirt.sel {background-color:var(--p-a1);width:206dp;}
.lp-dot {border-radius:14dp;}
.lp-dot.a {background-color:#3fae6a;} .lp-dot.b {background-color:#e0b23c;} .lp-dot.c {background-color:#d9534f;}
.pg-root .lp-cell {line-height:64dp;}
.lp-pairs {display:flex;flex-wrap:wrap;margin-top:6dp;}
.lp-pair {display:block;width:50%;font-size:28dp;line-height:38dp;}
.lp-pair strong {font-weight:bold;}
/* --- friendlies: the opponents as tiles, both crests on each --- */
.fr-tiles {display:flex;flex-wrap:wrap;gap:18dp;align-content:flex-start;padding:4dp;}
.pg-root .fr-tile,.pg-root .fr-tile:hover {display:flex;align-items:center;gap:18dp;width:677dp;height:150dp;padding:0 27dp;border:2dp var(--p-div);border-radius:45dp;background-color:var(--p-n1);decorator:none;font-family:Modern;font-size:30dp;color:var(--p-text);text-align:left;}
.pg-root .fr-tile:hover {border-color:var(--p-a6);}
.pg-root .fr-tile.sel,.pg-root .fr-tile.sel:hover {background-color:var(--p-a1);border-color:var(--p-a6);}
.fr-versus {display:block;flex:none;font-family:Display;font-size:26dp;color:var(--p-n6);}
.fr-tile-text {display:block;flex:1;min-width:0;}
.fr-tile-text strong {display:block;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.fr-tile-text small {display:block;font-size:26dp;line-height:34dp;color:var(--p-n7);}
.fr-tile .pg-num {flex:none;}
/* --- training: the game's own arrangement and pictures on the page --- */
.tr-skill {display:flex;flex:none;align-items:center;gap:22dp;height:84dp;border-bottom:2dp var(--p-rule);}
.pg-root .training-balls {display:flex;flex:none;align-items:center;}
.pg-root .training-ball,.pg-root .training-ball:hover,.pg-root .training-ball:disabled {display:block;flex:none;padding:0;border:0dp;border-radius:40dp;background-color:transparent;decorator:none;}
.pg-root .training-ball.is-empty {opacity:.22;}
.pg-root .training-ball:hover {opacity:.75;}
.tr-pitch {display:block;position:relative;flex:none;width:540dp;height:440dp;border:2dp var(--p-n5);border-radius:36dp;overflow:hidden;}
.tr-stripe {position:absolute;top:0;width:54dp;height:440dp;}
.tr-line {position:absolute;border:3dp #fdfbf4;}
.tr-line.mid {left:268dp;top:0;width:0dp;height:440dp;border-width:0dp 0dp 0dp 3dp;}
.tr-line.circle {left:215dp;top:165dp;width:104dp;height:104dp;border-radius:55dp;}
.tr-line.box {top:120dp;width:70dp;height:194dp;}
.tr-line.box.left {left:-3dp;} .tr-line.box.right {right:-3dp;}
.tr-type {position:absolute;padding:8dp 14dp;border-radius:27dp;background-color:#fdfbf4cc;}
.pg-root .tr-auto {height:60dp;font-size:28dp;}
.tr-player select {width:360dp;height:54dp;padding:0 18dp;border:2dp var(--p-div);border-radius:27dp;background-color:var(--p-n1);font-size:27dp;color:var(--p-text);}
+164
View File
@@ -0,0 +1,164 @@
// SPDX-License-Identifier: GPL-3.0-only
// The line-up as a page of the notebook (the real game): the squad as a table at the left,
// grouped into starting eleven, bench and the rest; at the right the pitch seen from behind
// the own goal with the eleven as shirts, or the whole squad as shirts. Two players are
// clicked to swap them; any other cell of a row opens the player's card.
std::string App::render_lineup_page() {
const auto projection = engine_lineup_projection(engine_data_);
if (!projection.value("ok", false)) return "<div class=\"pg-page\"><div class=\"pg-empty\">Die Aufstellung ist derzeit nicht verfügbar.</div></div>";
const auto &l = projection.at("board");
const auto &rows = projection.at("rows");
const int field_count = projection.at("field_count").get<int>();
const bool indoor = projection.at("surface") == "indoor";
if (lineup_slot(l, lineup_selected_) < 0) lineup_selected_.clear();
lineup_data_ = lineup_data_ == 1 ? 1 : 0;
const auto attr = [](const std::string &key, const std::string &value) { return " " + key + "=\"" + esc(value) + "\""; };
const auto player_attrs = [&](const Json &row, const std::string &prefix) {
const auto id = row.at("id").get<std::string>();
return attr("id", prefix + id) + attr("data-id", id) + attr("data-squad-player", id) + attr("data-slot", std::to_string(row.at("slot").get<size_t>())) +
attr("aria-pressed", lineup_selected_ == id ? "true" : "false") + attr("aria-label", row.at("name").get<std::string>() + ", " + lineup_position(row.at("position")));
};
const auto last_name = [](const std::string &name) { const auto at = name.rfind(' '); return at == std::string::npos ? name : name.substr(at + 1); };
const auto flag = [&](const Json &nation) -> std::string {
if (!nation.is_string()) return "—";
auto code = nation.get<std::string>();
if (code.starts_with("nation:")) code = code.substr(7);
const auto svg = code == "de" ? lineup_svg("<path fill=\"#111111\" d=\"M0 0H40V8H0Z\"/><path fill=\"#bc302e\" d=\"M0 8H40V16H0Z\"/><path fill=\"#edc758\" d=\"M0 16H40V24H0Z\"/>", "0 0 40 24") : ui_nation_flag_svg(code);
if (!svg.empty()) return "<span class=\"lp-flag\">" + picture(renderer_.diagram("lineup-flag-" + code, svg, 80), 45, 27) + "</span>";
std::transform(code.begin(), code.end(), code.begin(), [](unsigned char c) { return char(std::toupper(c)); });
return code.size() == 2 ? esc(code) : std::string("—");
};
// --- the table ---
struct Column { const char *label, *key; double width; const char *align; };
const std::vector<Column> columns = lineup_data_ == 0
? std::vector<Column>{{"Nr.", "", 40, "r"}, {"Name", "", 0, ""}, {"Pos.", "position", 60, "c"}, {"Ko", "condition", 42, "c"}, {"Te", "technique", 42, "c"}, {"Fo", "form", 42, "c"}, {"Stärke", "strength", 60, "c"},
{"Status", "status", 104, "c"}, {"Land", "nation", 50, "c"}, {"Sp.", "games", 42, "c"}, {"Tore", "goals", 46, "c"}, {"Vorl.", "assists", 46, "c"}}
: std::vector<Column>{{"Nr.", "", 40, "r"}, {"Name", "", 0, ""}, {"Alter", "age", 54, "c"}, {"Eck.", "corner", 58, "c"}, {"Frei.", "free_kick", 58, "c"}, {"Zwei.", "tackling", 58, "c"}, {"Pass", "passing", 58, "c"},
{"Schuss", "shooting", 58, "c"}, {"Schn.", "speed", 58, "c"}, {"Team", "teamplay", 58, "c"}, {"Spiele", "games", 56, "c"}, {"Note", "grade", 52, "c"}};
std::string out = "<div id=\"lineup-underlay\" class=\"pg-page" + std::string(indoor ? " indoor-lineup" : "") + "\"><div class=\"pg-body\"><div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:0px;padding:6px 10px;") +
"\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\" role=\"row\">";
for (const auto &column : columns) out += pg_th(column.label, column.width, column.align);
out += "</div><div id=\"lineup-roster-scroll\" class=\"pg-tbody\" tabindex=\"0\" aria-label=\"Kaderliste, scrollbar\">";
int group = -1;
for (const auto &row : rows) {
const auto slot = row.at("slot").get<int>();
const auto id = row.at("id").get<std::string>();
const int part = slot < field_count ? 0 : row.value("role", std::string()) == "bench" ? 1 : 2;
if (part != group) {
group = part;
out += "<div class=\"pg-tr grp\">" + pg_td(pg_upper(part == 0 ? (indoor ? "Aufgebot" : "Startelf") : part == 1 ? "Ersatzbank" : "Übriger Kader"), 0) + "</div>";
}
out += "<div class=\"pg-tr " + std::string(lineup_selected_ == id ? "sel" : "") + "\" role=\"row\" style=\"height:" + pg(30) + ";\">";
size_t field = 0;
for (const auto &column : columns) {
const std::string key = column.key;
if (std::string(column.label) == "Nr.") { out += pg_td(slot < field_count ? std::to_string(slot + 1) : std::string("–"), column.width, "r"); continue; }
if (std::string(column.label) == "Name") {
auto name = esc(row.at("name").get<std::string>());
if (row.at("pair_number").is_number_integer()) name += "</span><span class=\"pg-tag sage\" style=\"margin-left:" + pg(6) + ";\">P" + std::to_string(row.at("pair_number").get<int>());
out += pg_td(btn("lineup-player", "<span>" + name + "</span>", "pg-link", player_attrs(row, "lineup-name-")), 0, "", true);
continue;
}
std::string value;
if (key == "position") value = pg_pos(lineup_position(row.at("position")));
else if (key == "nation") value = flag(row.at("nation"));
else if (key == "status") {
const auto text = row.at("status").get<std::string>();
const bool out_of_action = text.find("erletz") != std::string::npos || text.find("esperr") != std::string::npos;
value = out_of_action ? "<span class=\"pg-tag accent\">" + esc(text) + "</span>" : "<span>" + esc(text) + "</span>";
} else if (key == "strength") value = "<strong>" + esc(lineup_value(row.at(key))) + "</strong>";
else if (lineup_data_ == 1 && key != "age" && key != "games" && key != "grade" && row.at(key).is_number_integer() && row.at(key).get<int>() >= 0 && row.at(key).get<int>() <= 3)
value = pg_dots(row.at(key).get<int>(), 3);
else value = "<span>" + esc(lineup_value(row.at(key))) + "</span>";
out += btn("player-detail", value, std::string("pg-td lp-cell ") + column.align,
attr("id", "lineup-detail-" + id + "-" + std::to_string(field++)) + attr("data-id", id) + attr("aria-label", row.at("name").get<std::string>() + ", Spielerinformationen") + " style=\"width:" + pg(column.width) + ";\"");
}
out += "</div>";
}
if (rows.empty()) out += "<div class=\"pg-empty\">Für diesen Verein sind keine Spieler überliefert.</div>";
out += "</div></div></div>";
// --- the pitch or the squad as shirts ---
std::string shirt_colour;
if (const auto *club = world_->find("clubs", engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>()); club && !club->value("crest", "").empty())
shirt_colour = renderer_.crest_colour(club->value("crest", ""));
if (shirt_colour.empty()) shirt_colour = "#b2622d";
const double shirt_size = 100;
const auto shirt = [&](const Json &row, size_t index, const std::string &style) {
const auto &condition = row.contains("condition") ? row.at("condition") : Json();
const bool selected = lineup_selected_ == row.at("id").get<std::string>();
const std::string level = condition.is_number_integer() ? (condition.get<int>() >= 85 ? "a" : condition.get<int>() >= 70 ? "b" : "c") : "n";
return btn("lineup-player", "<span class=\"lp-shirt-art\">" + picture(renderer_.diagram("lineup-shirt-" + shirt_colour + (selected ? "-s-" : "-n-") + level, lineup_shirt(shirt_colour, selected, condition), 160), shirt_size, shirt_size) +
"<span class=\"lp-num\">" + (index < size_t(field_count) ? std::to_string(index + 1) : std::string()) + "</span></span><span class=\"lp-name\">" + esc(last_name(row.at("name").get<std::string>())) + "</span>",
std::string("lp-shirt") + (selected ? " sel" : ""), player_attrs(row, "lineup-player-") + (style.empty() ? std::string() : " style=\"" + style + "\""));
};
const double side_width = 900, pitch_height = 1512 - 27 - (indoor ? 420 : 250);
out += "<div class=\"pg-col\" style=\"width:" + scalar(side_width) + "dp;\">";
if (lineup_pitch_) {
std::string stripes;
for (int band = 0; band < 8; ++band)
stripes += "<rect y=\"" + scalar(band * 16.25) + "\" width=\"100\" height=\"16.25\" fill=\"" + (indoor ? (band % 2 ? "#d2ad7a" : "#c79d68") : (band % 2 ? "#b6cf97" : "#a9c489")) + "\"/>";
const auto field = "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 100 130\" preserveAspectRatio=\"none\">" + stripes +
"<g fill=\"none\" stroke=\"#fdfbf4\" stroke-width=\".7\"><rect x=\"5\" y=\"5\" width=\"90\" height=\"120\" rx=\"1\"/><path d=\"M5 65h90M30 5v17h40V5M30 125v-17h40v17M41 5v6h18V5M41 125v-6h18v6\"/><ellipse cx=\"50\" cy=\"65\" rx=\"11\" ry=\"9\"/></g></svg>";
out += "<div id=\"lineup-pitch\" class=\"lp-pitch\" role=\"group\" aria-label=\"Spielfeld, Spieler auswählen\" style=\"height:" + scalar(pitch_height) + "dp;\">" +
picture(renderer_.diagram(std::string("lineup-page-field") + (indoor ? "-indoor" : ""), field, 900), side_width, pitch_height, true);
const double depth_max = l.value("depth_max", 18), lane_max = l.value("lane_max", 8);
for (size_t i = 0; i < std::min(size_t(field_count), rows.size()); ++i) {
const auto &row = rows[i], &point = l.at("points")[i];
if (point.is_null()) continue;
// the own goal is at the bottom: depth runs up the pitch, the lanes from left to right
const bool paired = row.at("pair_number").is_number_integer();
const double x = (14 + point[1].get<int>() / lane_max * 72) / 100 * side_width + (paired ? (row.at("pair_member") == 0 ? -0.62 : 0.62) * shirt_size : 0);
const double y = (87 - point[0].get<int>() / depth_max * 76) / 100 * pitch_height;
out += shirt(row, i, "position:absolute;left:" + scalar(x - 110) + "dp;top:" + scalar(y - 70) + "dp;");
}
out += "</div>";
} else {
out += "<div class=\"pg-panel pg-col lp-team\" style=\"height:" + scalar(pitch_height) + "dp;\">";
for (int part = 0; part < 3; ++part) {
std::string shirts;
for (size_t i = 0; i < rows.size(); ++i) {
const int slot = rows[i].at("slot").get<int>();
if ((slot < field_count ? 0 : rows[i].value("role", std::string()) == "bench" ? 1 : 2) == part) shirts += shirt(rows[i], size_t(slot), "");
}
if (!shirts.empty()) out += pg_kicker(part == 0 ? (indoor ? "Aufgebot" : "Startelf") : part == 1 ? "Ersatzbank" : "Reserve") + "<div class=\"lp-team-row\">" + shirts + "</div>";
}
out += "</div>";
}
out += "<div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:4px;padding:10px 14px;") + "\"><div class=\"pg-row\" style=\"justify-content:space-between;\"><strong class=\"pg-h\">Aufstellung</strong><span class=\"pg-legend\">"
"<span class=\"pg-legend-item\"><span class=\"pg-legend-mark lp-dot a\"></span><span>ab 85</span></span><span class=\"pg-legend-item\"><span class=\"pg-legend-mark lp-dot b\"></span><span>ab 70</span></span>"
"<span class=\"pg-legend-item\"><span class=\"pg-legend-mark lp-dot c\"></span><span>darunter</span></span></span></div><span style=\"display:block;\">Zwei Spieler zum Tauschen anklicken.</span>"
"<span class=\"pg-mut\" style=\"display:block;font-size:" + pg(12.5) + ";\">Der Tausch wird erst nach Bestätigung übernommen.</span>";
if (indoor) {
out += "<div id=\"lineup-engine-pairs\" class=\"lp-pairs\">" + pg_kicker("Halle · Wechselpaare", "width:100%;");
for (const auto &pair : projection.at("pairs")) {
std::string names;
for (const auto &id : pair.at("playerIds"))
for (const auto &row : rows) if (row.at("id") == id) names += (names.empty() ? "" : " / ") + last_name(row.at("name").get<std::string>());
out += "<span class=\"pg-nowrap lp-pair\"><strong>P" + std::to_string(pair.at("number").get<int>()) + "</strong> · " + esc(names) + "</span>";
}
if (projection.at("pairs").empty()) out += "<span class=\"pg-mut\" style=\"display:block;\">Keine Wechselpaare bestätigt.</span>";
out += "</div>";
}
out += "</div></div></div>";
// --- the foot ---
const auto pair_of = [&](const char *action, const char *id, const std::string &first, const std::string &second, bool second_on) {
std::string seg = "<div class=\"pg-seg\">";
for (int i = 0; i < 2; ++i) {
const bool on = (i == 1) == second_on;
seg += btn(action, "<span>" + (i ? second : first) + "</span>", std::string(i ? "" : "first ") + (on ? "on" : ""), on ? std::string("style=\"pointer-events:none;\" aria-pressed=\"true\"") : "id=\"" + std::string(id) + "\" aria-pressed=\"false\"");
}
return seg + "</div>";
};
std::string status = engine_busy_ ? engine_operation_ : engine_notice_;
if (!lineup_selected_.empty())
for (const auto &row : rows) if (row.at("id") == lineup_selected_) status = row.at("name").get<std::string>() + " markiert · zweiten Spieler wählen.";
if (status.empty()) status = "Kein Spieler markiert.";
out += "<nav class=\"pg-foot\">" + pair_of("lineup-data", "lineup-data", "Daten A", "Daten B", lineup_data_ == 1) + pair_of("lineup-view", "lineup-view", "Spielfeld", "Team", !lineup_pitch_) + "<div class=\"pg-seg\">";
for (const auto &[side, label] : std::array<std::pair<const char *, const char *>, 3>{{{"formations", "Aufst."}, {"orders", "Anweis."}, {"takers", "Schütze"}}})
out += btn("lineup-side", "<span>" + std::string(label) + "</span>", std::string(side) == "formations" ? "first" : "", attr("id", "lineup-side-" + std::string(side)) + attr("data-id", side) + " disabled title=\"Im Spiel nicht verfügbar\"");
out += "</div><span class=\"pg-tag sage\">" + std::string(indoor ? "Halle · 40 Min." : "Rasen · 90 Min.") + "</span><span class=\"pg-sp\"></span>" + pg_status(status) + "</nav></div>";
return out + engine_player_profile(projection);
}
+1
View File
@@ -164,6 +164,7 @@ std::string lineup_zone(const Json &l, const std::string &id) {
} // namespace
std::string App::render_lineup() {
if (engine_mode_ && page_native()) return render_lineup_page();
const auto s = engine_mode_ ? Snapshot{0, world_, Json()} : snap();
if (!s.world)
return "<p class=\"lineup-empty\">Die Aufstellung ist derzeit nicht "
+2 -2
View File
@@ -5,8 +5,8 @@
// The menus that are laid out as a page of the notebook. Every other career menu is still a
// sheet of the old format, shown scaled inside the book.
bool App::page_native() const {
static const std::set<std::string> native{"almanac", "tactics", "achievements", "highscore", "balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"};
if (menu_ == "calendar" || menu_ == "postpone") return notebook_page() && engine_mode_;
static const std::set<std::string> native{"training", "almanac", "tactics", "achievements", "highscore", "balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"};
if (menu_ == "calendar" || menu_ == "postpone" || menu_ == "lineup") return notebook_page() && engine_mode_;
// a national coach arranges friendlies on the older sheet
if (menu_ == "friendlies") return notebook_page() && engine_mode_ && engine_data_.contains("desktop") && engine_data_.at("desktop").at("meta").at("scope").at("role") == "club";
if (menu_ == "calendar") return notebook_page() && engine_mode_; // the demo keeps its older calendar
+7 -4
View File
@@ -85,13 +85,16 @@ std::string App::engine_friendlies_view() {
std::string out="<div id=\"report-underlay\" class=\"pg-page\"><header class=\"pg-row\" style=\"align-items:flex-end;\"><div class=\"pg-grow\">"+pg_kicker(league?world_->name(*league):std::string("Weitere Vereine"))+"<h2 class=\"pg-h\" style=\"font-size:"+pg(22)+";line-height:"+pg(28)+
";\">Freundschaftsspiel vereinbaren · Saison "+esc(engine_data_.at("desktop").at("meta").at("season").at("label").get<std::string>())+"</h2></div>"+page_steps("Gegner","Termin",booking)+"</header>";
if(!booking) {
out+="<div class=\"pg-panel pg-col pg-grow\" style=\""+pg_css("gap:0px;padding:4px 12px;")+"\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\">"+pg_th("Gegner",0)+pg_th("Stärke",110,"r")+"</div><div id=\"friendly-opponents\" class=\"pg-tbody\">";
// the opponents as tiles in four columns: the own crest, the opponent's, its name and strength
const auto *own_club=world_->find("clubs",engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>());
out+="<div id=\"friendly-opponents\" class=\"pg-tbody fr-tiles\">";
for(const auto &r:plan.at("opponents"))if(friendly_league_key(r)==engine_friendly_league_) {
const auto &team=r.at("team");const auto id=team.at("id").get<std::string>();
out+="<div class=\"pg-tr "+std::string(id==engine_friendly_opponent_?"sel":"")+"\">"+pg_td(btn("friendly-opponent",crest(world_->find("clubs",id),50)+"<span>"+esc(engine_text(team.at("name")))+"</span>","pg-link","id=\"friendly-opponent-"+esc(id)+"\" data-id=\""+esc(id)+"\" aria-pressed=\""+(id==engine_friendly_opponent_?"true":"false")+"\""),0,"",true)+
pg_td("<strong>"+(r.at("strength").is_number_integer()?number(r.at("strength")):std::string("—"))+"</strong>",110,"r")+"</div>";
out+=btn("friendly-opponent",crest(own_club,84)+"<span class=\"fr-versus\">–</span>"+crest(world_->find("clubs",id),84)+"<span class=\"fr-tile-text\"><strong>"+esc(engine_text(team.at("name")))+"</strong><small>Stärke</small></span><span class=\"pg-num\">"+
(r.at("strength").is_number_integer()?number(r.at("strength")):std::string("—"))+"</span>",std::string("fr-tile ")+(id==engine_friendly_opponent_?"sel":""),
"id=\"friendly-opponent-"+esc(id)+"\" data-id=\""+esc(id)+"\" aria-pressed=\""+(id==engine_friendly_opponent_?"true":"false")+"\"");
}
out+="</div></div></div><nav class=\"pg-foot\">"+report_picker("country",-1,0)+report_picker("league",-1,0)+pg_button("friendly-calendar","Termin auswählen","primary","id=\"friendly-calendar\" "+std::string(opponent?"":"disabled"))+
out+="</div><nav class=\"pg-foot\">"+report_picker("country",-1,0)+report_picker("league",-1,0)+pg_button("friendly-calendar","Termin auswählen","primary","id=\"friendly-calendar\" "+std::string(opponent?"":"disabled"))+
pg_button("friendly-list",count,"","id=\"friendly-list\"")+"<span class=\"pg-sp\"></span>"+pg_status(opponent?"Gegner: "+engine_text(opponent->at("name")):std::string("Einen Gegner anklicken."))+"</nav>";
} else {
const auto calendar=engine_calendar_view();const auto &dates=quote.at("dates");const bool available=std::find(dates.begin(),dates.end(),Json(engine_friendly_date_))!=dates.end();
+39 -103
View File
@@ -22,89 +22,41 @@ std::string App::training_balls(const std::string &group, int index, int value,
"dp;\" " + (automatic ? "disabled" : ""));
return body + "</div>";
}
// Training as a page of the notebook, in the game's own arrangement and pictures: the nine
// areas with their marks at the left, under them the pitch with the four kinds of session and
// the automatic switches; at the right every player with his focus and intensity.
std::string App::render_training() {
const auto t = engine_mode_ ? engine_training_draft_ : snap().state.at("training");
const auto &automatic = t.at("autos");
const std::array<const char *, 9> skills = {
"Kondition", "Technik", "Eckball", "Freistoß", "Zweikampf",
"Pass", "Schuss", "Schnelligkeit", "Teamplay"};
const std::vector<std::pair<std::string, std::string>> focuses = {
{"0", "Allgemein"}, {"1", "Eckball"}, {"2", "Freistoß"},
{"3", "Zweikampf"}, {"4", "Pass"}, {"5", "Schuss"},
{"6", "Schnelligkeit"}, {"7", "Teamplay"}};
const std::array<const char *, 9> skills = {"Kondition", "Technik", "Eckball", "Freistoß", "Zweikampf", "Pass", "Schuss", "Schnelligkeit", "Teamplay"};
const std::vector<std::pair<std::string, std::string>> focuses = {{"0", "Allgemein"}, {"1", "Eckball"}, {"2", "Freistoß"}, {"3", "Zweikampf"}, {"4", "Pass"}, {"5", "Schuss"}, {"6", "Schnelligkeit"}, {"7", "Teamplay"}};
int skill_total = 0, type_total = 0;
for (size_t i = 2; i < 9; ++i)
skill_total += t["areas"][i].get<int>();
for (const auto &v : t["types"])
type_total += v.get<int>();
std::string body = "<div class=\"training-skills\">";
for (size_t i = 2; i < 9; ++i) skill_total += t["areas"][i].get<int>();
for (const auto &v : t["types"]) type_total += v.get<int>();
// the areas
std::string body = "<div class=\"pg-page\"><div class=\"pg-body\"><div class=\"pg-col\" style=\"width:" + pg(470) + ";\"><div class=\"pg-panel pg-col\" style=\"" + pg_css("gap:0px;padding:6px 16px;") + "\">";
for (size_t i = 0; i < 9; ++i)
body +=
"<div class=\"training-skill\"><div style=\"width:86dp;\">" +
img("training.skill." + std::to_string(i), 80, 80, false, false, 160) +
"</div><span style=\"width:677dp;\">" + skills[i] +
"</span><span style=\"width:35dp;\">:</span><div "
"style=\"width:220dp;\">" +
training_balls("area", int(i), t["areas"][i].get<int>(),
!engine_mode_ && automatic[i < 2 ? 1 : 2].get<bool>(), {}, 56, 10,
!engine_mode_ && i >= 2 && skill_total > 14) +
"</div></div>";
body += "</div><div class=\"training-pitch\">";
for (int i = 0; i < 10; ++i)
body += "<div style=\"position:absolute;left:0;right:0;top:" +
std::to_string(i * 43) + "dp;height:43dp;background-color:" +
std::string(i % 2 ? "#306b4c" : "#2d6447") + ";\"></div>";
body += "<div class=\"training-midline\"></div><div "
"class=\"training-circle\"></div><div class=\"training-box "
"left-box\"></div><div class=\"training-box right-box\"></div>";
body += "<div class=\"tr-skill\">" + img("training.skill." + std::to_string(i), 72, 72, false, false, 160) + "<span class=\"pg-grow\" style=\"display:block;font-weight:bold;\">" + skills[i] + "</span>" +
training_balls("area", int(i), t["areas"][i].get<int>(), !engine_mode_ && automatic[i < 2 ? 1 : 2].get<bool>(), {}, 54, 10, !engine_mode_ && i >= 2 && skill_total > 14) + "</div>";
// the pitch with the four kinds of session, the budget and the switches beside it
body += "</div><div class=\"pg-row pg-grow\" style=\"" + pg_css("gap:12px;") + "align-items:stretch;\"><div class=\"tr-pitch\">";
for (int i = 0; i < 10; ++i) body += "<div class=\"tr-stripe\" style=\"left:" + std::to_string(i * 54) + "dp;background-color:" + std::string(i % 2 ? "#b6cf97" : "#a9c489") + ";\"></div>";
body += "<div class=\"tr-line mid\"></div><div class=\"tr-line circle\"></div><div class=\"tr-line box left\"></div><div class=\"tr-line box right\"></div>";
for (int i = 0; i < 4; ++i)
body += "<div class=\"training-type-cell\" style=\"left:" +
std::to_string(30 + (i % 2) * 277) +
"dp;top:" + std::to_string(26 + (i / 2) * 176) + "dp;\">" +
training_balls("type", i, t["types"][size_t(i)].get<int>(),
!engine_mode_ && automatic[0].get<bool>(), {}, 48, 5) +
"</div>";
body += "</div>";
const std::array<const char *, 4> auto_names = {
"AUTO · Arten", "AUTO · Kondition", "AUTO · Fertigkeiten",
"AUTO · Spieler"};
const std::array<std::array<int, 4>, 4> auto_boxes = {
{{0, 1456, 570, 76},
{604, 1040, 440, 76},
{604, 1136, 440, 76},
{2312, 1803, 300, 61}}};
for (size_t i = 0; i < 4; ++i) {
const auto a = auto_boxes[i];
body += btn(
"training-auto", auto_names[i],
std::string(i == 3 ? "training-auto auto-players " : "training-auto ") +
(automatic[i].get<bool>() ? "primary" : ""),
"id=\"training-auto-" + std::to_string(i) + "\" data-id=\"" +
std::to_string(i) + "\" style=\"position:absolute;" +
rect(a[0], a[1], a[2], a[3]) + "\" " + (engine_mode_ ? "disabled" : ""));
}
const bool all_auto = engine_mode_ ? t.at("master_auto").get<bool>() : std::all_of(automatic.begin(), automatic.end(),
[](const auto &v) { return v == true; });
body += btn("training-auto-all", "Automatisch",
std::string("training-auto ") + (all_auto ? "primary" : ""),
"id=\"training-auto-all\" style=\"position:absolute;" +
rect(604, 1232, 440, 76) + "\" " + (engine_mode_ ? "disabled" : ""));
body += "<p class=\"training-budget\">Arten: " + std::to_string(type_total) +
" / " + std::to_string(engine_mode_ ? t.at("limits").at("types").get<int>() : 8) + " Bälle ·<br/>Kondition/Technik: " +
std::to_string(t["areas"][0].get<int>() + t["areas"][1].get<int>()) +
" / " + std::to_string(engine_mode_ ? t.at("limits").at("fitnessAndSkill").get<int>() : 4) + " ·<br/>Fertigkeiten: " + std::to_string(skill_total) + " / " + std::to_string(engine_mode_ ? t.at("limits").at("otherAreas").get<int>() : 18) +
(!engine_mode_ && skill_total > 14 ? " · hohe<br/>Belastung" : "") +
"</p><div id=\"training-roster\" class=\"training-roster\"><div "
"class=\"training-row "
"training-header\">";
const std::array<const char *, 5> headings = {"Pos.", "Spieler", "Stärke",
"Schwerpunkt", "Intensität"};
const std::array<int, 5> widths = {90, 760, 95, 330, 217};
for (size_t i = 0; i < 5; ++i)
body += "<div class=\"" + std::string(i == 1 ? "training-player-heading" : "") +
"\" style=\"width:" + std::to_string(widths[i]) + "dp;\">" +
headings[i] + "</div>";
body += "</div>";
body += "<div class=\"tr-type\" style=\"left:" + std::to_string(26 + (i % 2) * 270) + "dp;top:" + std::to_string(70 + (i / 2) * 170) + "dp;\">" +
training_balls("type", i, t["types"][size_t(i)].get<int>(), !engine_mode_ && automatic[0].get<bool>(), {}, 52, 6) + "</div>";
body += "</div><div class=\"pg-col pg-grow\" style=\"" + pg_css("gap:6px;") + "\"><div class=\"pg-panel\" style=\"" + pg_css("padding:8px 12px;") + "\">" + pg_kicker("Ballbudget") +
"<div class=\"pg-kv\"><span>Arten</span><strong>" + std::to_string(type_total) + " / " + std::to_string(engine_mode_ ? t.at("limits").at("types").get<int>() : 8) + "</strong></div><div class=\"pg-kv\"><span>Kondition/Technik</span><strong>" +
std::to_string(t["areas"][0].get<int>() + t["areas"][1].get<int>()) + " / " + std::to_string(engine_mode_ ? t.at("limits").at("fitnessAndSkill").get<int>() : 4) + "</strong></div><div class=\"pg-kv\"><span>Fertigkeiten</span><strong>" +
std::to_string(skill_total) + " / " + std::to_string(engine_mode_ ? t.at("limits").at("otherAreas").get<int>() : 18) + (!engine_mode_ && skill_total > 14 ? " · hohe Belastung" : "") + "</strong></div></div>";
const std::array<const char *, 4> auto_names = {"AUTO · Arten", "AUTO · Kondition", "AUTO · Fertigkeiten", "AUTO · Spieler"};
for (size_t i = 0; i < 4; ++i)
body += pg_button("training-auto", auto_names[i], std::string("block tr-auto ") + (automatic[i].get<bool>() ? "on" : ""), "id=\"training-auto-" + std::to_string(i) + "\" data-id=\"" + std::to_string(i) + "\" " + (engine_mode_ ? "disabled" : ""));
const bool all_auto = engine_mode_ ? t.at("master_auto").get<bool>() : std::all_of(automatic.begin(), automatic.end(), [](const auto &v) { return v == true; });
body += pg_button("training-auto-all", "Automatisch", std::string("block tr-auto ") + (all_auto ? "on" : ""), "id=\"training-auto-all\" " + std::string(engine_mode_ ? "disabled" : "")) + "</div></div></div>";
// the players
body += "<div class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:0px;padding:4px 12px;") + "\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\">" + pg_th("Pos.", 56) + pg_th("Spieler", 0) + pg_th("Stärke", 70, "r") + pg_th("Schwerpunkt", 170) +
pg_th("Intensität", 100) + "</div><div id=\"training-roster\" class=\"pg-tbody\">";
std::vector<const Json *> players;
if (engine_mode_) { for (const auto &p : t.at("roster")) players.push_back(&p); }
else players = world_->squad(t.value("club", ""));
@@ -113,31 +65,15 @@ std::string App::render_training() {
const auto id = p->value("id", "");
const auto &row = t["players"].at(id);
const auto position = p->value("positions", Json::array());
const auto pos = position.empty() ? "" : position[0].get<std::string>();
body +=
"<div class=\"training-row " + std::string(i % 2 ? "striped" : "") +
"\"><div class=\"training-position\" style=\"width:90dp;\">" +
std::string(pos == "gk" ? "TW"
: pos == "def" ? "ABW"
: pos == "mid" ? "MIT"
: pos == "fwd" ? "STU"
: pos) +
"</div><div class=\"training-name\" style=\"width:760dp;\"><span "
"class=\"training-name-text\" title=\"" +
esc(world_->name(*p)) + "\">" + esc(world_->name(*p)) +
"</span></div><div style=\"width:95dp;\">" +
sports_number(p->value("attributes", Json::object()).value("strength", Json())) +
"</div><div style=\"width:330dp;\">";
auto selector =
select("training-focus-" + std::to_string(i), focuses,
std::to_string(row.value("focus", 0)), "training-focus");
const auto end = selector.find('>');
selector.insert(end, " data-player=\"" + esc(id) + "\" " +
(engine_mode_ || automatic[3] == true ? "disabled" : ""));
body += selector + "</div><div style=\"width:217dp;\">" +
training_balls("player", int(i), row.value("intensity", 0),
!engine_mode_ && automatic[3].get<bool>(), id, 50, 9) +
"</div></div>";
const auto pos = position.empty() ? std::string() : position[0].get<std::string>();
auto selector = select("training-focus-" + std::to_string(i), focuses, std::to_string(row.value("focus", 0)), "training-focus");
selector.insert(selector.find('>'), " data-player=\"" + esc(id) + "\" " + (engine_mode_ || automatic[3] == true ? "disabled" : ""));
body += "<div class=\"pg-tr tr-player\">" + pg_td(pg_pos(pos == "gk" ? "TW" : pos == "def" ? "ABW" : pos == "mid" ? "MIT" : pos == "fwd" ? "STU" : pos), 56, "", true) +
pg_td("<strong title=\"" + esc(world_->name(*p)) + "\">" + esc(world_->name(*p)) + "</strong>", 0) + pg_td("<strong>" + sports_number(p->value("attributes", Json::object()).value("strength", Json())) + "</strong>", 70, "r") +
pg_td(selector, 170, "", true) + pg_td(training_balls("player", int(i), row.value("intensity", 0), !engine_mode_ && automatic[3].get<bool>(), id, 50, 8), 100, "", true) + "</div>";
}
return body + "</div>" + (engine_mode_ ? engine_sports_footer() : "");
body += "</div></div></div></div><nav class=\"pg-foot\">";
if (engine_mode_) body += pg_button("sports-reset", "Zurücksetzen", "", "id=\"sports-reset\"") + pg_button("sports-apply", "Anwenden", "primary", "id=\"sports-apply\"") + "<span class=\"pg-sp\"></span><span id=\"sports-note\" class=\"pg-status\"></span>";
else body += "<span class=\"pg-sp\"></span>" + pg_status("Jede Änderung gilt sofort.");
return body + "</nav></div>";
}
+2
View File
@@ -892,6 +892,7 @@ class App final : public Rml::EventListener {
static std::string pg_dialog(const std::string &title, const std::string &sub, const std::string &body, const std::string &actions, double width, const std::string &attrs = {});
std::string pg_club(const std::string &id, double size = 50, bool reverse = false);
void notebook_finish(std::string &markup);
std::string render_lineup_page(); // lineup_page.inc
// postponing and friendlies (planning_page.inc)
std::string page_months(const Json &calendar, bool booking, bool postpone, const std::set<int> &movable);
static std::string page_steps(const std::string &first, const std::string &second, bool at_second);
@@ -1791,6 +1792,7 @@ public:
#include "modern/ui/pages.inc"
#include "modern/ui/tactics_page.inc"
#include "modern/ui/planning_page.inc"
#include "modern/ui/lineup_page.inc"
#include "modern/ui/finance_simulation.inc"
#include "modern/ui/statistics_analysis.inc"
#include "modern/ui/engine_rankings.inc"