The almanac as a page: a year of twelve months, the matches of a day, a match report

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
MichaelandClaude Fable 5.2 committed 2026-11-15 18:27:07 +01:00
1 parent 76333e8d75
commit 9faf0acf81
4 files changed
+90 -300

No files matched your search

+3 -122
View File
@@ -1,123 +1,4 @@
/* SPDX-License-Identifier: GPL-3.0-only */
/* Historical DTO values only; logical coordinates match the HTML glass window. */
.almanac {position:absolute;left:0;top:0;width:2612dp;height:1864dp;font-size:32dp;line-height:1.3;color:var(--text);}
.almanac h2,.almanac h3,.almanac p {margin:0;}
.alm-toolbar {position:absolute;left:0;top:0;width:2612dp;height:94dp;z-index:22;}
.alm-control {display:flex;align-items:center;justify-content:center;height:94dp;padding:12dp 20dp;border:2dp var(--border);border-radius:12dp;background-color:transparent;decorator:linear-gradient(180deg,#c1d1e31c,#869eb312);font-size:32dp;font-weight:normal;color:var(--text);}
.alm-control:hover {decorator:none;background-color:var(--hover);}
.alm-control:focus-visible {border-color:var(--accent);}
.alm-control span {display:block;line-height:41.6dp;}
.alm-back {position:absolute;left:0;top:0;width:420dp;}
.alm-heading {position:absolute;left:444dp;top:21dp;width:1724dp;height:52dp;font-size:40dp;line-height:52dp;font-weight:normal;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.alm-year-context {position:absolute;left:2192dp;top:0;width:420dp;height:94dp;display:flex;align-items:center;justify-content:flex-end;font-size:34dp;color:var(--muted);}
.alm-year-context span {display:block;line-height:44.2dp;}
.alm-underlay {position:absolute;left:0;top:0;width:2612dp;height:1864dp;}
.alm-calendar {position:absolute;left:0;top:132dp;width:2612dp;height:1598dp;}
.alm-month {position:absolute;padding:14dp 16dp;border:2dp var(--border);border-radius:16dp;background-color:var(--soft);}
.alm-month h3 {position:absolute;left:16dp;right:16dp;top:14dp;height:38dp;font-size:30dp;line-height:38dp;font-weight:normal;text-align:center;}
.alm-month-grid {position:absolute;left:16dp;top:68dp;}
.alm-weekday {position:absolute;display:flex;align-items:center;font-size:28dp;color:var(--muted);}
.alm-weekday span {display:block;line-height:31.2dp;}
.alm-weekday.sunday {color:var(--danger);}
.alm-day {position:absolute;display:flex;align-items:center;justify-content:center;min-width:0;margin:0;padding:0;border:0dp;border-radius:8dp;background-color:transparent;color:var(--muted);font-size:30dp;}
.alm-day-text {display:block;line-height:39dp;}
.alm-day.future {opacity:0.4;}
.alm-day.played {background-color:var(--selected);color:var(--accent);}
.alm-day.played:hover {background-color:var(--hover);}
.alm-day.played:focus-visible {border:2dp var(--accent);}
.alm-footer {position:absolute;left:0;top:1770dp;width:2612dp;height:94dp;display:flex;align-items:center;justify-content:space-between;gap:24dp;font-size:28dp;color:var(--muted);}
.alm-key {display:flex;align-items:center;gap:16dp;flex-shrink:0;}
.alm-key span {display:block;line-height:36.4dp;}
.alm-key .alm-key-marker {width:20dp;height:20dp;flex-shrink:0;border-radius:5dp;background-color:var(--accent);}
.alm-footer-info {display:block;min-width:0;line-height:36.4dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;text-align:right;}
.alm-picker-shield {position:absolute;left:0;top:0;width:2612dp;height:1864dp;margin:0;padding:0;border:0dp;border-radius:0dp;background-color:transparent;z-index:20;}
/* The shared picker opens down from this toolbar and mirrors its check to the right. */
.alm-toolbar .report-picker-wrapper {top:0;bottom:auto;height:94dp;}
.alm-toolbar .report-picker-wrapper .report-picker-trigger {justify-content:center;gap:18dp;padding:12dp 20dp;text-align:center;}
.alm-toolbar .report-picker-label {flex:none;max-width:310dp;text-align:center;}
.alm-toolbar .report-picker-popup {top:108dp;bottom:auto;max-height:650dp;padding:12dp;border-radius:14dp;}
.alm-toolbar .report-picker-popup .report-picker-option {flex-direction:row;justify-content:space-between;gap:0dp;height:66dp;min-height:66dp;padding:8dp 20dp;border-radius:8dp;}
.alm-toolbar .report-picker-option-label {display:block;text-align:left;}
.almanac .alm-toolbar .report-picker-popup .report-picker-option[aria-checked=true] {background-color:var(--selected);color:var(--accent);}
.alm-day-list {position:absolute;left:0;top:132dp;width:2612dp;height:1598dp;overflow-y:auto;overflow-x:hidden;}
.alm-list-head {position:relative;display:flex;align-items:center;gap:18dp;width:100%;height:70dp;padding:0dp 28dp;border-bottom:2dp var(--border);font-size:28dp;color:var(--muted);}
.alm-row-home,.alm-row-away {display:flex;align-items:center;min-width:0;flex:1;}
.alm-row-score {display:flex;align-items:center;justify-content:center;flex-shrink:0;width:160dp;}
.alm-list-head .alm-row-home,.alm-list-head .alm-row-away {justify-content:center;}
.alm-list-head span {display:block;line-height:36.4dp;}
.alm-match-row {position:relative;display:block;width:100%;height:160dp;min-height:160dp;margin:0;padding:0;border:0dp;border-bottom:2dp var(--border);border-radius:12dp;background-color:transparent;color:var(--text);text-align:left;}
.alm-match-row.striped {background-color:var(--soft);}
.alm-match-row:hover {background-color:var(--hover);}
.alm-match-row:focus-visible {border-color:var(--accent);background-color:var(--hover);}
.alm-match-main {position:absolute;left:28dp;right:28dp;top:16dp;height:82dp;display:flex;align-items:center;gap:18dp;}
.alm-match-main .alm-row-home,.alm-match-main .alm-row-away {height:82dp;}
.alm-team {display:flex;align-items:center;gap:14dp;min-width:0;max-width:100%;font-size:34dp;line-height:44.2dp;}
.alm-row-home .alm-team,.alm-row-away .alm-team {width:100%;}
.alm-team-home {justify-content:flex-end;}
.alm-team-away {justify-content:flex-start;}
.alm-team-name {display:block;min-width:0;line-height:44.2dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.alm-crest {display:flex;align-items:center;justify-content:center;flex-shrink:0;overflow:hidden;}
.alm-crest .image-frame {flex-shrink:0;}
.alm-no-crest {display:block;font-size:28dp;line-height:31.2dp;text-align:center;}
.alm-list-score {height:82dp;flex-direction:column;gap:3dp;}
.alm-list-score-value {display:block;height:52dp;line-height:52dp;font-size:40dp;white-space:nowrap;}
.alm-list-score-phase {display:block;height:27dp;line-height:27dp;font-size:26dp;white-space:nowrap;color:var(--muted);}
.alm-match-meta {position:absolute;left:28dp;right:28dp;top:111dp;height:31.2dp;display:flex;align-items:center;justify-content:center;font-size:28dp;color:var(--muted);}
.alm-match-meta span {display:block;width:100%;max-width:100%;text-align:center;line-height:31.2dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.alm-summary {position:absolute;left:0;top:132dp;width:2612dp;height:360dp;padding:20dp 28dp;border:2dp var(--border);border-radius:18dp;background-color:var(--soft);}
.alm-summary-teams {position:absolute;left:28dp;right:28dp;top:20dp;height:250dp;}
.alm-summary-team {position:absolute;top:0;width:854dp;height:250dp;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:10dp;min-width:0;text-align:center;}
.alm-summary-team.home {left:0;}
.alm-summary-team.away {right:0;}
.alm-summary-team-name {display:block;width:100%;max-width:100%;height:50dp;line-height:50dp;font-size:42dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.alm-summary-manager {display:block;width:100%;max-width:100%;height:39dp;line-height:39dp;font-size:30dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:var(--muted);}
.alm-summary-result {position:absolute;left:886dp;top:0;width:780dp;height:250dp;display:flex;flex-direction:column;align-items:center;justify-content:center;gap:10dp;text-align:center;}
.alm-summary-score {display:block;height:80dp;line-height:80dp;font-size:68dp;}
.alm-summary-phase {display:block;max-width:780dp;line-height:33.8dp;font-size:28dp;color:var(--muted);}
.alm-summary-phases {display:block;max-width:780dp;line-height:31.2dp;font-size:28dp;color:var(--muted);}
.alm-match-facts {position:absolute;left:28dp;right:28dp;bottom:0;height:86dp;border-top:2dp var(--border);display:flex;align-items:center;gap:24dp;}
.alm-match-fact {display:flex;align-items:center;justify-content:center;gap:16dp;flex:1;min-width:0;height:84dp;font-size:28dp;}
.alm-fact-label {display:block;flex-shrink:0;line-height:36.4dp;white-space:nowrap;color:var(--muted);}
.alm-fact-value {display:block;min-width:0;line-height:36.4dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.alm-tabs {position:absolute;left:0;top:520dp;width:2612dp;height:82dp;padding:6dp;border:2dp var(--border);border-radius:16dp;background-color:var(--soft);display:flex;gap:12dp;}
.alm-tab {display:flex;align-items:center;justify-content:center;flex:1;min-width:0;height:66dp;padding:0;border:0dp;border-radius:10dp;background-color:transparent;font-size:32dp;color:var(--muted);}
.alm-tab span {display:block;line-height:41.6dp;}
.alm-tab.selected {background-color:var(--selected);color:var(--text);}
.alm-tab:hover {background-color:var(--hover);}
.alm-detail-content {position:absolute;left:0;top:626dp;width:2612dp;height:1104dp;overflow-y:auto;overflow-x:hidden;}
.alm-lineups {display:flex;align-items:stretch;gap:32dp;}
.alm-lineup {flex:1;min-width:0;padding:20dp 26dp;border:2dp var(--border);border-radius:16dp;background-color:var(--soft);}
.alm-lineup header {height:64dp;display:flex;align-items:center;justify-content:center;}
.alm-lineup h3 {height:46dp;line-height:46dp;margin-top:20dp;font-size:28dp;font-weight:normal;color:var(--muted);}
.alm-player {display:flex;align-items:center;height:66dp;gap:20dp;border-bottom:1dp var(--border);font-size:32dp;}
.alm-player-number {display:block;flex-shrink:0;width:70dp;line-height:41.6dp;text-align:right;color:var(--muted);}
.alm-position {display:block;flex-shrink:0;width:110dp;line-height:33.8dp;font-size:28dp;color:var(--muted);}
.alm-player-name {display:block;min-width:0;flex:1;line-height:41.6dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.alm-empty {padding:40dp 0;font-size:30dp;line-height:39dp;text-align:center;color:var(--muted);}
.alm-event {position:relative;display:flex;align-items:center;min-height:104dp;padding:12dp 18dp;gap:24dp;border-bottom:2dp var(--border);font-size:30dp;}
.alm-event.striped {background-color:var(--soft);}
.alm-event-minute {display:block;flex-shrink:0;width:160dp;line-height:36.4dp;font-size:28dp;white-space:nowrap;color:var(--accent);}
.alm-event-team {display:block;flex-shrink:0;min-width:0;width:500dp;line-height:39dp;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.alm-event-description {display:block;flex:1;min-width:0;}
.alm-event-kind {display:block;line-height:36.4dp;font-size:28dp;}
.alm-event-text {display:block;margin-top:5dp;line-height:36.4dp;font-size:28dp;white-space:normal;color:var(--muted);}
body.midnight .almanac {color:#dce3e9;}
body.midnight .alm-control {border-color:#d4e0ec29;color:#e0e6ec;}
body.midnight .alm-month,body.midnight .alm-summary,body.midnight .alm-tabs,body.midnight .alm-lineup {background-color:#101d2826;border-color:#c5d9e71a;}
body.midnight .alm-weekday,body.midnight .alm-day {color:#9aaab9;}
body.midnight .alm-weekday.sunday {color:#eb9f98;}
body.midnight .alm-day.played {background-color:#7d9eb83b;color:#a9dccb;}
body.midnight .alm-day.played:hover {background-color:#d0e2f226;}
body.midnight .alm-year-context,body.midnight .alm-footer,body.midnight .alm-list-head,body.midnight .alm-list-score-phase,body.midnight .alm-match-meta,body.midnight .alm-summary-manager,body.midnight .alm-summary-phase,body.midnight .alm-summary-phases,body.midnight .alm-fact-label,body.midnight .alm-lineup h3,body.midnight .alm-player-number,body.midnight .alm-position,body.midnight .alm-empty,body.midnight .alm-event-text {color:#9eb4c7;}
body.midnight .alm-key-marker {background-color:#a9dccb;}
body.midnight .alm-match-row {color:#dce3e9;border-color:#d5e3ed15;}
body.midnight .alm-match-row.striped,body.midnight .alm-event.striped {background-color:#e3edf605;}
body.midnight .alm-match-row:hover {background-color:#d0e2f226;}
body.midnight .alm-tab.selected {background-color:#7d9eb83b;color:#eff4f7;}
body.midnight .alm-event-minute {color:#a9dccb;}
body.midnight .alm-list-head {border-color:#d5e3ed26;}
body.midnight .alm-player,body.midnight .alm-event {border-color:#d5e3ed15;}
body.silver .alm-control {decorator:linear-gradient(180deg,#ffffffd8,#e9e1cf99);}
body.matchday .alm-control {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);}
body.midnight .almanac .alm-toolbar .report-picker-popup .report-picker-option[aria-checked=true] {background-color:#7d9eb83b;color:#a9dccb;}
/* The almanac is a page of the notebook; its styles are in pages.rcss. */
.alm-picker-shield,.alm-picker-shield:hover {position:absolute;left:0;top:0;width:2799dp;height:1620dp;margin:0;padding:0;border:0dp;border-radius:0dp;background-color:transparent;decorator:none;z-index:20;}
.almanac .pg-foot {z-index:30;}
+13
View File
@@ -310,3 +310,16 @@ body .popup-box input {height:84dp;padding:0 26dp;border:2dp var(--p-div);border
.pm-cell.tod span {line-height:42dp;}
.pm-cell.sel span,.pm-cell.sel:hover span {line-height:40dp;}
.pg-root .pm-cell.day[disabled],.pg-root .pm-cell.day:disabled {opacity:1;}
/* --- the almanac: a year of twelve months, the matches of a day, a match report --- */
.alm-grid .pm-month {width:679dp;height:436dp;}
.alm-grid .pm-cells {width:644dp;gap:3dp 0dp;margin-top:4dp;}
.alm-grid .pm-cell,.alm-grid .pm-cell:hover {width:92dp;height:44dp;line-height:44dp;}
.alm-grid .pm-cell.dim {color:var(--p-n5);}
.alm-grid .pm-cell.day:hover span {line-height:38dp;}
.pg-root .alm-row,.pg-root .alm-row:hover {width:100%;border:0dp;border-bottom:2dp var(--p-rule);border-radius:22dp;background-color:transparent;decorator:none;font-family:Modern;font-size:30dp;color:var(--p-text);}
.pg-root .alm-row:hover {background-color:var(--p-a1);}
.alm-row .pg-match-side {align-items:center;gap:18dp;}
.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;}
+73 -177
View File
@@ -146,193 +146,109 @@ std::string App::render_almanac() {
const auto crest_image = [&](const Json &team, double size) {
auto key = almanac_field(team, "crest");
if (engine_mode_ && key.is_null()) if (const auto *club = world_->find("clubs", almanac_text(almanac_field(team,"id"),""))) key=club->value("crest",Json());
return "<div class=\"alm-crest\" style=\"width:" + scalar(size) +
"dp;height:" + scalar(size) + "dp;\">" +
(key.is_string() && !key.get_ref<const std::string &>().empty()
? picture(renderer_.crest(key.get<std::string>(), theme_ == "silver"),size,size)
: "<span class=\"alm-no-crest\">—</span>") + "</div>";
return key.is_string() && !key.get_ref<const std::string &>().empty() ? picture(renderer_.crest(key.get<std::string>(), theme_ == "silver"), size, size)
: "<span style=\"display:block;width:" + scalar(size) + "dp;height:" + scalar(size) + "dp;\"></span>";
};
const auto team_label = [&](const Json &team, bool home) {
const auto label = "<span class=\"alm-team-name\" title=\"" +
esc(almanac_name(team)) + "\">" + esc(almanac_name(team)) + "</span>";
return "<div class=\"alm-team " + std::string(home ? "alm-team-home" : "alm-team-away") +
"\">" + (home ? label + crest_image(team, 42)
: crest_image(team, 42) + label) + "</div>";
};
std::string output = "<div class=\"almanac\"><nav class=\"alm-toolbar\" aria-label=\"Archivnavigation\">" +
btn("alm-back", "<span>‹ " + std::string(detail ? "Tagespaarungen" : day_view ? "Jahreskalender" : "Desktop") +
"</span>", "alm-control alm-back", "id=\"alm-back\"") +
"<h2 id=\"alm-heading\" class=\"alm-heading\" tabindex=\"-1\" style=\"tab-index:auto;\">" + esc(title) + "</h2>";
if (!detail && !day_view)
output += report_picker("year", 2192, 420);
else
output += "<div class=\"alm-year-context\"><span>" +
std::to_string(almanac_year_) + "</span></div>";
output += "</nav><div id=\"almanac-underlay\" class=\"alm-underlay\">";
// the archive in three steps: the year as twelve months, the matches of a day, a match report
std::string output = "<div class=\"pg-page almanac\">", footer;
const auto back = [&](const std::string &label) { return pg_button("alm-back", "<span>‹ " + label + "</span>", "", "id=\"alm-back\""); };
const auto heading = [&](double size) { return "<h2 id=\"alm-heading\" class=\"pg-h pg-grow\" tabindex=\"-1\" style=\"tab-index:auto;font-size:" + pg(size) + ";line-height:" + pg(size + 6) + ";\">" + esc(title) + "</h2>"; };
Json day_response;
if (!detail && day_view) {
day_response = query({{"kind", "day"}, {"date", almanac_day_}});
output += "<div id=\"alm-day-list\" class=\"alm-day-list\">"
"<div class=\"alm-list-head\"><div class=\"alm-row-home\"><span>Heim</span></div>"
"<div class=\"alm-row-score\"><span>Ergebnis</span></div><div class=\"alm-row-away\"><span>Auswärts</span></div></div>";
output += "<div class=\"pg-row\">" + back("Jahreskalender") + heading(24) + "</div><div id=\"almanac-underlay\" class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:0px;padding:8px 14px;") + "\"><div class=\"pg-match-head\">" +
pg_kicker("Heim", "text-align:right;") + "<span class=\"pg-k pg-c\" style=\"flex:none;width:" + pg(160) + ";\">ERGEBNIS</span>" + pg_kicker("Auswärts") + "</div><div id=\"alm-day-list\" class=\"pg-tbody\">";
const auto &matches = almanac_field(day_response, "matches");
if (matches.is_array())
for (size_t i = 0; i < matches.size(); ++i) {
const auto &match = matches[i], &result = almanac_field(match, "result");
for (const auto &match : matches) {
const auto &result = almanac_field(match, "result");
const auto id = almanac_text(almanac_field(match, "id"), "");
const bool known=almanac_phases_known(result);
const bool penalties = known && almanac_flag(result, "penalties_played"), extra = known && almanac_flag(result, "extra_played");
const auto description = almanac_name(almanac_field(match, "home")) + " " +
almanac_score(almanac_field(result, "final")) + " " +
almanac_name(almanac_field(match, "away")) + " · Spielbericht öffnen";
const auto description = almanac_name(almanac_field(match, "home")) + " " + almanac_score(almanac_field(result, "final")) + " " + almanac_name(almanac_field(match, "away")) + " · Spielbericht öffnen";
output += btn("alm-match",
"<div class=\"alm-match-main\"><div class=\"alm-row-home\">" +
team_label(almanac_field(match, "home"), true) + "</div>"
"<div class=\"alm-row-score alm-list-score\"><span class=\"alm-list-score-value\">" +
esc(almanac_score(almanac_field(result, penalties ? "penalties" : "final"))) +
"</span><span class=\"alm-list-score-phase\">" +
(!known ? "unklar" : penalties ? "i. E." : extra ? "n. V." : "") + "</span></div>"
"<div class=\"alm-row-away\">" + team_label(almanac_field(match, "away"), false) +
"</div></div><div class=\"alm-match-meta\"><span>" +
esc(almanac_competition_label(match) + " · Saison " +
almanac_text(almanac_field(match, "season"))) + "</span></div>",
"alm-match-row " + std::string(i % 2 == 0 ? "striped" : ""),
"id=\"alm-match-" + esc(id) + "\" data-id=\"" + esc(id) +
"\" aria-label=\"" + esc(description) + "\"");
"<span class=\"pg-match-side home\"><strong>" + esc(almanac_name(almanac_field(match, "home"))) + "</strong>" + crest_image(almanac_field(match, "home"), 54) + "</span><span class=\"pg-match-mid\" style=\"width:" + pg(160) + ";\"><span class=\"pg-score\">" +
esc(almanac_score(almanac_field(result, penalties ? "penalties" : "final"))) + (!known ? " ?" : penalties ? " i. E." : extra ? " n. V." : "") + "</span><small>" + esc(almanac_competition_label(match)) + "</small></span><span class=\"pg-match-side\">" +
crest_image(almanac_field(match, "away"), 54) + "<strong>" + esc(almanac_name(almanac_field(match, "away"))) + "</strong></span>",
"alm-match-row pg-match alm-row", "id=\"alm-match-" + esc(id) + "\" data-id=\"" + esc(id) + "\" aria-label=\"" + esc(description) + "\"");
}
if (!matches.is_array() || matches.empty())
output += "<p class=\"alm-empty\">Keine gespielten Partien an diesem Tag.</p>";
output += "</div>";
if (!matches.is_array() || matches.empty()) output += "<div class=\"pg-empty\">Keine gespielten Partien an diesem Tag.</div>";
output += "</div></div>";
footer = std::to_string(matches.is_array() ? matches.size() : 0) + " gespielte Partien";
} else if (!detail) {
output += "<div class=\"alm-calendar\">";
output += "<div class=\"pg-row\">" + heading(24) + "<span class=\"pg-legend\"><span class=\"pg-legend-item\"><span class=\"pg-legend-mark pm-key own\"></span><span>Gespielte Partien</span></span></span></div><div id=\"almanac-underlay\" class=\"pm-grid alm-grid\">";
Json days = Json::array();
if (available && almanac_year_) {
const auto calendar = query({{"kind", "calendar"}, {"year", almanac_year_}});
if (almanac_flag(calendar, "ok") && almanac_field(calendar, "days").is_array())
days = calendar.at("days");
}
constexpr double month_width = 635, month_height = 1550.0 / 3;
if (almanac_year_ >= 1 && almanac_year_ <= 9999)
for (int month = 1; month <= 12; ++month) {
const int column = (month - 1) % 4, row = (month - 1) / 4;
const auto first = std::chrono::year{almanac_year_} / std::chrono::month{unsigned(month)} / 1;
const int offset = int(std::chrono::weekday{std::chrono::sys_days{first}}.iso_encoding()) - 1;
const int count = int(unsigned(std::chrono::year_month_day{
std::chrono::sys_days{std::chrono::year{almanac_year_} /
std::chrono::month{unsigned(month)} / std::chrono::last}}.day()));
constexpr double grid_width = 599;
const double grid_height = month_height - 86, cell_height = grid_height / 7;
constexpr double cell_width = (grid_width - 65) / 6;
output += "<section class=\"alm-month\" style=\"" +
rect(column * 659, row * (month_height + 24), month_width, month_height) +
"\"><h3>" + almanac_months[size_t(month - 1)] + "</h3>"
"<div class=\"alm-month-grid\" style=\"width:599dp;height:" + scalar(grid_height) + "dp;\">";
const std::array<const char *, 7> weekdays = {"MO", "DI", "MI", "DO", "FR", "SA", "SO"};
for (int weekday = 0; weekday < 7; ++weekday) {
output += "<div class=\"alm-weekday " + std::string(weekday == 6 ? "sunday" : "") +
"\" style=\"" + rect(0, weekday * cell_height, 65, cell_height) +
"\"><span>" + weekdays[size_t(weekday)] + "</span></div>";
for (int week = 0; week < 6; ++week) {
const int day = week * 7 + weekday - offset + 1;
if (day < 1 || day > count)
continue;
const auto iso = almanac_iso(almanac_year_, month, day);
const auto found = std::find_if(days.begin(), days.end(), [&](const auto &entry) {
return almanac_field(entry, "date") == iso;
});
const bool played = found != days.end() &&
almanac_field(*found, "count").is_number_integer() &&
found->at("count").get<int>() > 0;
const auto style = rect(65 + week * cell_width, weekday * cell_height, cell_width, cell_height);
const auto text = "<span class=\"alm-day-text\">" + std::to_string(day) + "</span>";
if (played)
output += btn("alm-day", text, "alm-day played",
"id=\"alm-day-" + iso + "\" data-id=\"" + iso + "\" style=\"" + style +
"\" aria-label=\"" + esc(almanac_date_label(iso) + ", " +
almanac_number(found->at("count")) + " gespielte Partien") + "\"");
else {
const bool future = reference.is_string() && iso > reference.get<std::string>();
output += "<div class=\"alm-day " + std::string(future ? "future" : "") +
"\" style=\"" + style + "\">" + text + "</div>";
}
}
const int count = int(unsigned(std::chrono::year_month_day{std::chrono::sys_days{std::chrono::year{almanac_year_} / std::chrono::month{unsigned(month)} / std::chrono::last}}.day()));
std::string cells;
for (const char *w : {"MO", "DI", "MI", "DO", "FR", "SA", "SO"}) cells += std::string("<span class=\"pm-cell head\">") + w + "</span>";
for (int blank = 0; blank < offset; ++blank) cells += "<span class=\"pm-cell\"></span>";
for (int day = 1; day <= count; ++day) {
const auto iso = almanac_iso(almanac_year_, month, day);
const auto found = std::find_if(days.begin(), days.end(), [&](const auto &entry) { return almanac_field(entry, "date") == iso; });
const bool played = found != days.end() && almanac_field(*found, "count").is_number_integer() && found->at("count").get<int>() > 0;
if (played)
cells += btn("alm-day", "<span>" + std::to_string(day) + "</span>", "pm-cell day own",
"id=\"alm-day-" + iso + "\" data-id=\"" + iso + "\" aria-label=\"" + esc(almanac_date_label(iso) + ", " + almanac_number(found->at("count")) + " gespielte Partien") + "\"");
else
cells += "<span class=\"pm-cell" + std::string(reference.is_string() && iso > reference.get<std::string>() ? " dim" : "") + "\">" + std::to_string(day) + "</span>";
}
output += "</div></section>";
output += "<section class=\"pg-panel pm-month alm-month\"><strong class=\"pm-name\">" + std::string(almanac_months[size_t(month - 1)]) + "</strong><div class=\"pm-cells\">" + cells + "</div></section>";
}
else
output += "<p class=\"alm-empty\">Keine gespielten Partien im Archiv.</p>";
else output += "<div class=\"pg-empty\">Keine gespielten Partien im Archiv.</div>";
output += "</div>";
footer = !available ? std::string("Almanach derzeit nicht verfügbar.") : years.empty() ? std::string("Keine gespielten Partien im Archiv")
: almanac_number(almanac_field(index, "match_count")) + " Partien · " + std::to_string(years.front()) + "–" + std::to_string(years.back());
} else {
const auto &result = almanac_field(record, "result"), &weather = almanac_field(record, "weather");
const bool extra = almanac_flag(result, "extra_played"), penalties = almanac_flag(result, "penalties_played");
const bool known=almanac_phases_known(result);
const auto phase = !known ? std::string("Endstand") : std::string(extra ? "Nach Verlängerung" : "Nach regulärer Spielzeit") +
(penalties ? " · Entscheidung i. E." : "");
const auto phase = !known ? std::string("Endstand") : std::string(extra ? "Nach Verlängerung" : "Nach regulärer Spielzeit") + (penalties ? " · Entscheidung i. E." : "");
std::string phases = "Reguläre Zeit: " + almanac_score(almanac_field(result, "regulation"));
if (extra) phases += " · Verlängerung: " + almanac_score(almanac_field(result, "extra"));
if (penalties) phases += " · i. E.: " + almanac_score(almanac_field(result, "penalties"));
if (!known) phases="Spielphasen nicht eindeutig überliefert.";
output += "<section class=\"alm-summary\"><div class=\"alm-summary-teams\">";
const auto summary_team = [&](const char *side, const std::string &css) {
const auto summary_team = [&](const char *side, bool home) {
const auto &team = almanac_field(record, side), &manager = almanac_field(team, "manager");
const auto manager_name = manager.is_null() ? std::string("Computer") : almanac_name(manager);
return "<div class=\"alm-summary-team " + css + "\">" + crest_image(team, 80) +
"<span class=\"alm-summary-team-name\" title=\"" + esc(almanac_name(team)) + "\">" +
esc(almanac_name(team)) + "</span><span class=\"alm-summary-manager\">Manager: " +
esc(manager_name) + "</span></div>";
const auto text = "<div class=\"pg-grow\" style=\"" + std::string(home ? "text-align:right;" : "") + "\"><strong class=\"pg-h pg-nowrap\" style=\"font-size:" + pg(21) + ";line-height:" + pg(26) + ";\" title=\"" + esc(almanac_name(team)) + "\">" + esc(almanac_name(team)) +
"</strong><span class=\"pg-mut\" style=\"display:block;\">Manager: " + esc(manager.is_null() ? std::string("Computer") : almanac_name(manager)) + "</span></div>";
return "<div class=\"pg-row pg-grow\" style=\"" + pg_css("gap:12px;") + "\">" + (home ? text + crest_image(team, 144) : crest_image(team, 144) + text) + "</div>";
};
output += summary_team("home", "home") +
"<div class=\"alm-summary-result\"><span class=\"alm-summary-score\">" +
esc(almanac_score(almanac_field(result, "final"))) +
"</span><span class=\"alm-summary-phase\">" + esc(phase) +
"</span><span class=\"alm-summary-phases\">" + esc(phases) + "</span></div>" +
summary_team("away", "away") + "</div><div class=\"alm-match-facts\">";
const std::vector<std::pair<std::string, std::string>> facts = {
{"Schiedsrichter", almanac_text(almanac_field(record, "referee"))},
{"Zuschauer", almanac_number(almanac_field(record, "attendance"))},
{"Temperatur", almanac_number(almanac_field(weather, "temperature")) +
(almanac_field(weather, "temperature").is_number_integer() ? " °C" : "")},
{"Regen", almanac_number(almanac_field(weather, "rain")) +
(almanac_field(weather, "rain").is_number_integer() ? " / 7" : "")}};
for (const auto &[label, value] : facts)
output += "<div class=\"alm-match-fact\"><span class=\"alm-fact-label\">" + esc(label) +
"</span><span class=\"alm-fact-value\">" + esc(value) + "</span></div>";
output += "</div></section><nav class=\"alm-tabs\" role=\"tablist\" aria-label=\"Spielbericht\">";
for (const auto &[key, label] :
std::array<std::pair<std::string, std::string>, 2>{{{"lineups", "Aufstellungen"}, {"events", "Ereignisse"}}})
output += btn("alm-tab", "<span>" + label + "</span>",
"alm-tab " + std::string(almanac_tab_ == key ? "selected" : ""),
"id=\"alm-tab-" + key + "\" data-id=\"" + key +
"\" role=\"tab\" aria-selected=\"" + (almanac_tab_ == key ? "true" : "false") +
"\" aria-controls=\"alm-detail-content\"");
output += "</nav><div id=\"alm-detail-content\" class=\"alm-detail-content\" role=\"tabpanel\" "
"aria-labelledby=\"alm-tab-" + almanac_tab_ + "\">";
output += "<div class=\"pg-row\">" + back("Tagespaarungen") + heading(22) + "<span class=\"pg-mut\">" + esc(almanac_date_label(almanac_field(record, "date"))) + "</span></div><div id=\"almanac-underlay\" class=\"pg-col pg-grow\"><section class=\"pg-panel pg-row\" style=\"" + pg_css("gap:20px;") + "\">" +
summary_team("home", true) + "<div class=\"pg-c\" style=\"flex:none;\"><strong class=\"pg-big\" style=\"font-size:" + pg(46) + ";line-height:" + pg(50) + ";\">" + esc(almanac_score(almanac_field(result, "final"))) + "</strong><span class=\"pg-mut\" style=\"display:block;\">" +
esc(phase) + "</span><span class=\"pg-mut\" style=\"display:block;font-size:" + pg(12) + ";\">" + esc(phases) + "</span></div>" + summary_team("away", false) + "</section><div class=\"pg-row\" style=\"" + pg_css("gap:8px;align-items:stretch;") + "\">" +
pg_stat("Schiedsrichter", "<span style=\"font-size:" + pg(17) + ";\">" + esc(almanac_text(almanac_field(record, "referee"))) + "</span>") + pg_stat("Zuschauer", esc(almanac_number(almanac_field(record, "attendance")))) +
pg_stat("Temperatur", esc(almanac_number(almanac_field(weather, "temperature")) + (almanac_field(weather, "temperature").is_number_integer() ? " °C" : ""))) +
pg_stat("Regen", esc(almanac_number(almanac_field(weather, "rain")) + (almanac_field(weather, "rain").is_number_integer() ? " / 7" : ""))) + "</div><nav class=\"pg-tabs\" role=\"tablist\" aria-label=\"Spielbericht\">";
for (const auto &[key, label] : std::array<std::pair<std::string, std::string>, 2>{{{"lineups", "Aufstellungen"}, {"events", "Ereignisse"}}})
output += btn("alm-tab", "<span>" + label + "</span>", almanac_tab_ == key ? "on" : "",
"id=\"alm-tab-" + key + "\" data-id=\"" + key + "\" role=\"tab\" aria-selected=\"" + (almanac_tab_ == key ? "true" : "false") + "\" aria-controls=\"alm-detail-content\"");
output += "</nav><div id=\"alm-detail-content\" class=\"pg-body\" role=\"tabpanel\" aria-labelledby=\"alm-tab-" + almanac_tab_ + "\" style=\"margin-top:-27dp;\">";
if (almanac_tab_ == "lineups") {
output += "<div class=\"alm-lineups\">";
for (const auto *side : {"home", "away"}) {
const auto &team = almanac_field(record, side), &lineup = almanac_field(almanac_field(record, "lineups"), side);
// Both roster headings read left-to-right. Pairing rows alone mirror the home label.
output += "<section class=\"alm-lineup\"><header>" + team_label(team, false) + "</header>";
if (!lineup.is_object())
output += "<p class=\"alm-empty\">Keine Aufstellung überliefert.</p>";
output += "<section class=\"pg-panel pg-col pg-grow\" style=\"" + pg_css("gap:3px;padding:10px 14px;") + "overflow-y:auto;\">" + pg_kicker(almanac_name(team) + " · Startelf");
if (!lineup.is_object()) output += "<div class=\"pg-empty\">Keine Aufstellung überliefert.</div>";
else
for (const auto *part : {"starters", "bench"}) {
output += "<h3>" + std::string(std::string_view(part) == "starters" ? "Startelf" : "Bank") + "</h3>";
const bool starters = std::string_view(part) == "starters";
if (!starters) output += pg_kicker("Bank", "margin-top:6px;");
const auto &players = almanac_field(lineup, part);
if (players.is_array())
for (size_t i = 0; i < players.size(); ++i) {
const auto &player = players[i];
output += "<div class=\"alm-player\"><span class=\"alm-player-number\">" +
std::to_string(i + (std::string_view(part) == "starters" ? 1 : 12)) +
"</span><span class=\"alm-position\">" + esc(almanac_position(player)) +
"</span><span class=\"alm-player-name\" title=\"" + esc(almanac_name(player)) +
"\">" + esc(almanac_name(player)) + "</span></div>";
}
for (size_t i = 0; i < players.size(); ++i)
output += "<div class=\"pg-row\" style=\"" + pg_css("gap:8px;") + "height:" + pg(starters ? 19 : 17) + ";\"><strong class=\"pg-rank\">" + std::to_string(i + (starters ? 1 : 12)) + "</strong>" + (almanac_position(players[i]) == "—" ? std::string() : pg_pos(almanac_position(players[i]))) +
"<span class=\"pg-nowrap\" style=\"display:block;font-weight:bold;\" title=\"" + esc(almanac_name(players[i])) + "\">" + esc(almanac_name(players[i])) + "</span></div>";
}
output += "</section>";
}
output += "</div>";
} else {
std::vector<Json> events;
const auto &source_events = almanac_field(record, "events");
@@ -340,14 +256,12 @@ std::string App::render_almanac() {
for (const auto &event : source_events) events.push_back(event);
std::stable_sort(events.begin(), events.end(), [](const Json &a, const Json &b) {
const auto &am = almanac_field(a, "minute"), &bm = almanac_field(b, "minute");
return (am.is_number_integer() ? am.get<int>() : 0) <
(bm.is_number_integer() ? bm.get<int>() : 0);
return (am.is_number_integer() ? am.get<int>() : 0) < (bm.is_number_integer() ? bm.get<int>() : 0);
});
output += "<div class=\"alm-events\" role=\"list\">";
output += "<div class=\"pg-panel pg-grow\" role=\"list\" style=\"" + pg_css("padding:6px 14px;") + "overflow-y:auto;\">";
int kick = 0;
const std::array<const char *, 4> goal_types = {"Spiel", "Elfmeter/Freistoß", "Nachschuss", "Ecke"};
for (size_t i = 0; i < events.size(); ++i) {
const auto &event = events[i];
for (const auto &event : events) {
const auto kind = almanac_text(almanac_field(event, "kind"), "");
const auto side = almanac_text(almanac_field(event, "side"), "");
const auto player = almanac_name(almanac_field(event, "player"));
@@ -360,46 +274,28 @@ std::string App::render_almanac() {
else if (kind == "substitution")
description = "Ein: " + player + " · Aus: " + other;
else if (kind == "goal" || kind == "miss")
description = player + " · " + (kind == "miss" ? "Zuspiel" : "Vorlage") + ": " + other +
" · " + (detail_value >= 0 && detail_value < 4 ? goal_types[size_t(detail_value)] : "—");
const auto minute = kind == "shootout" ? "i. E. · " + std::to_string(++kick)
: almanac_number(almanac_field(event, "minute")) + "′";
const auto team = side == "home" || side == "away"
? almanac_name(almanac_field(record, side.c_str())) : "—";
output += "<div class=\"alm-event " + esc(kind) + (i % 2 == 0 ? " striped" : "") +
"\" role=\"listitem\"><span class=\"alm-event-minute\">" + esc(minute) +
"</span><span class=\"alm-event-team\" title=\"" + esc(team) + "\">" + esc(team) +
"</span><div class=\"alm-event-description\"><span class=\"alm-event-kind\">" +
almanac_event_kind(kind) + "</span><span class=\"alm-event-text\">" + esc(description) + "</span></div></div>";
description = player + " · " + (kind == "miss" ? "Zuspiel" : "Vorlage") + ": " + other + " · " + (detail_value >= 0 && detail_value < 4 ? goal_types[size_t(detail_value)] : "—");
const auto minute = kind == "shootout" ? "i. E. " + std::to_string(++kick) : almanac_number(almanac_field(event, "minute")) + ".";
const std::string mark = kind == "yellow" ? "<span class=\"pg-card-mark yellow\"></span>" : kind == "red" ? "<span class=\"pg-card-mark red\"></span>" : kind == "second_yellow" ? "<span class=\"pg-card-mark yellow\"></span><span class=\"pg-card-mark red\"></span>"
: kind == "goal" ? "<span class=\"alm-ball\"></span>" : std::string();
output += "<div class=\"pg-tr alm-event " + esc(kind) + "\" role=\"listitem\" style=\"height:" + pg(30) + ";\">" + pg_td("<strong>" + esc(minute) + "</strong>", 70, "r") + pg_td(mark, 44, "c", true) +
pg_td((side == "home" || side == "away" ? crest_image(almanac_field(record, side.c_str()), 40) : std::string()), 34, "", true) +
pg_td("<strong>" + almanac_event_kind(kind) + "</strong><span>· " + esc(description) + "</span>", 0, "", true) + "</div>";
}
if (events.empty())
output += "<p class=\"alm-empty\">Keine Ereignisse überliefert.</p>";
if (events.empty()) output += "<div class=\"pg-empty\">Keine Ereignisse überliefert.</div>";
output += "</div>";
}
output += "</div>";
output += "</div></div>";
footer = almanac_competition_label(record) + " · Saison " + almanac_text(almanac_field(record, "season"));
}
std::string footer;
if (detail)
footer = almanac_date_label(almanac_field(record, "date")) + " · Saison " +
almanac_text(almanac_field(record, "season"));
else if (day_view) {
const auto &matches = almanac_field(day_response, "matches");
footer = std::to_string(matches.is_array() ? matches.size() : 0) + " gespielte Partien";
} else if (!available)
footer = "Almanach derzeit nicht verfügbar.";
else if (years.empty())
footer = "Keine gespielten Partien im Archiv";
else
footer = almanac_number(almanac_field(index, "match_count")) + " Partien · " +
std::to_string(years.front()) + "–" + std::to_string(years.back());
output += "<footer class=\"alm-footer\"><div class=\"alm-key\"><span class=\"alm-key-marker\"></span>"
"<span>Gespielte Partien</span></div><span class=\"alm-footer-info\">" + esc(footer) + "</span></footer></div>";
output += "<nav class=\"pg-foot\">" + (!detail && !day_view ? report_picker("year", -1, 0) : std::string()) + "<span class=\"pg-sp\"></span>" + pg_status(footer) + "</nav>";
if (report_picker_ == "year")
output += btn("alm-year-cancel", "", "alm-picker-shield", "id=\"alm-year-shield\" aria-label=\"Jahresauswahl schließen\"");
return output + "</div>";
}
bool App::almanac_layout_update() {
if (page_native()) return false; // the page lays itself out
if (auto *history=element("alm-day-list")) if (auto *content=doc_->QuerySelector(".window .content")) {
const float width=content->GetBox().GetSize(Rml::BoxArea::Content).x;
if(std::abs(width-almanac_list_width_)>=.001f) {
+1 -1
View File
@@ -5,7 +5,7 @@
// 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{"tactics", "achievements", "highscore", "balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"};
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_;
// 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";