Calendar, postponing and friendlies as pages of the notebook
The season calendar keeps its two steps (twelve months, then the days of one) in the page's size and inks. Postponing and friendlies show the season as twelve month sheets in two rows with the days coloured by what they are to the task; their dialogs are notes on the dimmed book. A national coach's friendlies and the demo keep the older sheets. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
1 parent
c83b020952
commit
76333e8d75
8 files changed
+229
-126
No files matched your search
+45
-56
@@ -50,65 +50,54 @@ body.silver .calendar-day .calendar-outline.source-outline {border-color:#256a4f
|
||||
body.silver .postpone-layout .postpone-summary small.valid {color:#256a4f;}
|
||||
|
||||
/* --- The season calendar: twelve months, and a month opened as a sheet. --- */
|
||||
/* the season calendar as a page of the notebook: twelve months, a click opens one with a zoom */
|
||||
@keyframes cal-zoom-in {from {transform:scale(0.25);opacity:0;} to {transform:scale(1);opacity:1;}}
|
||||
@keyframes cal-zoom-out {from {transform:scale(3.2);opacity:0;} to {transform:scale(1);opacity:1;}}
|
||||
.cal-months.zoom-out {animation:0.3s cubic-out cal-zoom-out;}
|
||||
.cal-sheet.zoom-in {animation:0.3s cubic-out cal-zoom-in;}
|
||||
.cal-head {position:absolute;left:0;top:0;width:2612dp;height:120dp;display:flex;align-items:center;gap:24dp;border-bottom:4dp #9a7a3a;}
|
||||
.cal-head h2 {display:block;margin:0;font-family:Display;font-size:64dp;line-height:76dp;font-weight:normal;}
|
||||
.cal-head p {display:block;margin:0 0 0 auto;font-size:30dp;color:var(--muted);}
|
||||
.cal-back,.cal-step {height:72dp;padding:0 30dp;border:2dp var(--rule);border-radius:36dp;background-color:transparent;decorator:none;font-size:32dp;display:flex;align-items:center;justify-content:center;}
|
||||
.cal-step {width:72dp;padding:0;font-size:44dp;}
|
||||
.cal-months {position:absolute;left:0;top:150dp;width:2612dp;height:1584dp;}
|
||||
.cal-month {position:absolute;display:block;padding:22dp 28dp;border:2dp var(--rule);border-radius:10dp;background-color:var(--panel);decorator:none;text-align:left;transition:transform 0.12s cubic-out;}
|
||||
.cal-month:hover {transform:scale(1.03);border-color:#25617a;background-color:#fffdf6;}
|
||||
.cal-month.current {border:4dp #9a7a3a;}
|
||||
.cal-month-name {display:block;position:absolute;left:28dp;top:18dp;font-family:Display;font-size:52dp;line-height:64dp;}
|
||||
.cal-month-year {display:block;position:absolute;right:28dp;top:34dp;font-size:30dp;line-height:40dp;color:var(--muted);}
|
||||
.cal-mini-grid {display:flex;flex-wrap:wrap;position:absolute;left:28dp;top:104dp;width:581dp;height:340dp;}
|
||||
.cal-mini {display:flex;align-items:center;justify-content:center;width:83dp;height:48dp;font-size:28dp;color:var(--text);}
|
||||
.cal-mini span {display:block;width:44dp;height:44dp;line-height:44dp;text-align:center;border-radius:22dp;}
|
||||
.cal-mini.head {color:var(--muted);font-size:24dp;}
|
||||
.cal-mini.match span {background-color:#25617a;color:#ffffff;font-weight:bold;}
|
||||
.cal-mini.event span {border:2dp #9a7a3a;line-height:40dp;}
|
||||
.cal-mini.today span {border:4dp #b24a4f;line-height:36dp;}
|
||||
.cal-month-foot {display:block;position:absolute;left:28dp;right:28dp;bottom:16dp;height:40dp;line-height:40dp;font-size:28dp;color:var(--muted);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
|
||||
.cal-legend {position:absolute;left:0;bottom:0;height:50dp;display:flex;align-items:center;font-size:28dp;color:var(--muted);}
|
||||
.cal-head {position:absolute;left:0;top:0;width:2799dp;height:78dp;display:flex;align-items:center;gap:18dp;}
|
||||
.cal-head h2 {display:block;margin:0;font-family:Display;font-size:58dp;line-height:66dp;font-weight:normal;}
|
||||
.cal-head p {display:block;margin:0 0 0 auto;height:60dp;line-height:60dp;padding:0 27dp;border-radius:30dp;background-color:var(--p-n1);font-size:28dp;color:var(--p-n8);}
|
||||
.pg-root .cal-back,.pg-root .cal-step {height:68dp;padding:0 32dp;border:2dp var(--p-div);border-radius:36dp;background-color:var(--p-n1);decorator:none;font-family:Display;font-size:31dp;display:flex;align-items:center;justify-content:center;}
|
||||
.pg-root .cal-step {width:68dp;padding:0;font-size:44dp;}
|
||||
.cal-back:hover,.cal-step:hover {background-color:var(--p-n2);}
|
||||
.cal-months {position:absolute;left:0;top:105dp;width:2799dp;height:1434dp;}
|
||||
.cal-month,.cal-month:disabled {position:absolute;display:block;padding:0;border:2dp var(--p-div);border-radius:45dp;background-color:var(--p-n1);decorator:none;text-align:left;transition:transform 0.12s cubic-out;color:var(--p-text);}
|
||||
.cal-month:hover {transform:scale(1.03);border-color:var(--p-a6);background-color:var(--p-n1);}
|
||||
.cal-month.current,.cal-month.current:hover {border-color:var(--p-a6);background-color:var(--p-a1);}
|
||||
.cal-month-name {display:block;position:absolute;left:30dp;top:16dp;font-family:Display;font-size:40dp;line-height:56dp;}
|
||||
.cal-month-year {display:block;position:absolute;right:30dp;top:26dp;font-size:26dp;line-height:36dp;color:var(--p-n7);}
|
||||
.cal-mini-grid {display:flex;flex-wrap:wrap;position:absolute;left:30dp;top:84dp;width:619dp;height:300dp;}
|
||||
.cal-mini {display:flex;flex-shrink:0;align-items:center;justify-content:center;width:88dp;height:41dp;font-family:Modern;font-size:27dp;color:var(--p-text);}
|
||||
.cal-mini span {display:block;width:66dp;height:37dp;line-height:37dp;text-align:center;border-radius:12dp;}
|
||||
.cal-mini.head span {font-size:22dp;font-weight:bold;color:var(--p-n7);}
|
||||
.cal-mini.match span {background-color:var(--p-a6);color:var(--p-n1);font-weight:bold;}
|
||||
.cal-mini.event span {background-color:var(--p-s3);font-weight:bold;}
|
||||
.cal-mini.today span {border:4dp var(--p-n9);line-height:29dp;}
|
||||
.cal-month-foot {display:block;position:absolute;left:30dp;right:30dp;bottom:14dp;height:38dp;line-height:38dp;font-family:Modern;font-size:26dp;color:var(--p-n7);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
|
||||
.cal-legend {position:absolute;left:0;bottom:10dp;height:60dp;display:flex;align-items:center;font-size:27dp;color:var(--p-n8);}
|
||||
.cal-legend span {display:block;flex-shrink:0;}
|
||||
.cal-legend .key {width:34dp;height:34dp;border-radius:17dp;margin:0 12dp 0 36dp;}
|
||||
.cal-legend .key.match {background-color:#25617a;margin-left:0;}
|
||||
.cal-legend .key.event {border:2dp #9a7a3a;}
|
||||
.cal-legend .key.today {border:4dp #b24a4f;}
|
||||
.cal-sheet {position:absolute;left:0;top:140dp;width:2612dp;height:1590dp;}
|
||||
.cal-weekdays {position:absolute;left:0;top:0;width:2612dp;height:70dp;display:flex;border-radius:8dp;background-color:#9a7a3a;}
|
||||
.cal-weekdays span {display:block;flex:1;line-height:70dp;text-align:center;font-size:32dp;color:#ffffff;}
|
||||
.cal-day {position:absolute;display:block;padding:0;border:2dp var(--rule);border-radius:8dp;background-color:var(--panel);decorator:none;overflow:hidden;}
|
||||
.cal-day:hover {border-color:#25617a;}
|
||||
.cal-day.weekend {background-color:#f3ead2b0;}
|
||||
.cal-day.today {border:5dp #b24a4f;}
|
||||
.cal-day.chosen {border:5dp #25617a;background-color:#fffdf6;}
|
||||
.cal-day-number {display:block;position:absolute;right:16dp;top:6dp;font-family:Display;font-size:50dp;line-height:60dp;font-weight:bold;color:var(--muted);}
|
||||
.cal-day.match .cal-day-number {color:var(--text);}
|
||||
.cal-day-crest {display:block;position:absolute;left:16dp;top:14dp;width:104dp;height:104dp;}
|
||||
.cal-day-name {display:block;position:absolute;left:16dp;right:12dp;bottom:50dp;height:38dp;line-height:38dp;font-size:28dp;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
|
||||
.cal-day-note {display:block;position:absolute;left:16dp;right:12dp;bottom:10dp;height:38dp;line-height:38dp;font-size:28dp;text-align:left;color:var(--muted);white-space:nowrap;}
|
||||
.cal-day-note.won {color:var(--win);font-weight:bold;}
|
||||
.cal-day-note.lost {color:var(--loss);font-weight:bold;}
|
||||
.cal-day-note.drawn {color:var(--text);font-weight:bold;}
|
||||
.cal-day-event {display:block;position:absolute;left:16dp;right:12dp;bottom:12dp;line-height:36dp;font-size:27dp;text-align:left;color:#7d5f22;}
|
||||
.cal-info {bottom:0;height:60dp;line-height:60dp;font-size:34dp;}
|
||||
.cal-legend .key {width:27dp;height:27dp;border-radius:9dp;margin:0 14dp 0 32dp;}
|
||||
.cal-legend .key.match {background-color:var(--p-a6);margin-left:0;}
|
||||
.cal-legend .key.event {background-color:var(--p-s3);}
|
||||
.cal-legend .key.today {border:4dp var(--p-n9);width:19dp;height:19dp;}
|
||||
.cal-sheet {position:absolute;left:0;top:100dp;width:2799dp;height:1440dp;}
|
||||
.cal-weekdays {position:absolute;left:0;top:0;width:2799dp;height:60dp;display:flex;border-bottom:3dp var(--p-n4);}
|
||||
.cal-weekdays span {display:block;flex:1;line-height:56dp;text-align:center;font-size:24dp;letter-spacing:1.7dp;font-weight:bold;color:var(--p-n7);}
|
||||
.cal-day,.cal-day:disabled {position:absolute;display:block;padding:0;border:2dp var(--p-div);border-radius:32dp;background-color:var(--p-n1);decorator:none;overflow:hidden;color:var(--p-text);}
|
||||
.cal-day:hover {border-color:var(--p-a6);background-color:var(--p-n1);}
|
||||
.cal-day.weekend {background-color:var(--p-n2);}
|
||||
.cal-day.match {background-color:var(--p-a1);}
|
||||
.cal-day.today,.cal-day.today:hover {border:5dp var(--p-n9);}
|
||||
.cal-day.chosen,.cal-day.chosen:hover {border:5dp var(--p-a6);}
|
||||
.cal-day-number {display:block;position:absolute;right:22dp;top:8dp;font-family:Display;font-size:48dp;line-height:58dp;font-weight:normal;color:var(--p-n6);}
|
||||
.cal-day.match .cal-day-number {color:var(--p-text);}
|
||||
.cal-day-crest {display:block;position:absolute;left:20dp;top:16dp;width:120dp;height:120dp;}
|
||||
.cal-day-name {display:block;position:absolute;left:20dp;right:14dp;bottom:50dp;height:38dp;line-height:38dp;font-family:Modern;font-size:29dp;font-weight:bold;text-align:left;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
|
||||
.cal-day-note {display:block;position:absolute;left:20dp;right:14dp;bottom:12dp;height:38dp;line-height:38dp;font-family:Modern;font-size:28dp;text-align:left;color:var(--p-n7);white-space:nowrap;}
|
||||
.cal-day-note.won {color:var(--p-s7);font-weight:bold;}
|
||||
.cal-day-note.lost {color:var(--p-a7);font-weight:bold;}
|
||||
.cal-day-note.drawn {color:var(--p-text);font-weight:bold;}
|
||||
.cal-day-event {display:block;position:absolute;left:18dp;bottom:14dp;height:44dp;line-height:44dp;padding:0 20dp;border-radius:22dp;background-color:var(--p-s2);font-family:Modern;font-size:25dp;text-align:left;color:var(--p-s8);white-space:nowrap;}
|
||||
.cal-info {position:absolute;right:0;bottom:10dp;max-width:1900dp;height:60dp;line-height:60dp;padding:0 27dp;border-radius:30dp;background-color:var(--p-n1);font-size:28dp;color:var(--p-n8);text-align:right;white-space:nowrap;overflow:hidden;}
|
||||
body.calm .cal-month:hover {transform:none;}
|
||||
/* text never stands on the bare picture: lines of text get a framed field */
|
||||
.cal-head p,.cal-legend,.cal-info {padding:0 28dp;border:2dp var(--rule);border-radius:30dp;background-color:#fffbf2e6;color:var(--text);}
|
||||
.cal-head p {height:60dp;line-height:60dp;font-size:32dp;}
|
||||
.cal-legend {height:60dp;font-size:32dp;}
|
||||
.cal-info {left:auto;right:0;width:auto;max-width:1900dp;text-align:right;}
|
||||
.cal-month-foot {font-size:30dp;color:var(--text);}
|
||||
.cal-mini {font-size:30dp;}
|
||||
.cal-day-name,.cal-day-note {font-size:30dp;}
|
||||
.cal-day-event {font-size:30dp;}
|
||||
.cal-mini-grid {top:92dp;height:330dp;}
|
||||
.cal-mini {height:46dp;flex-shrink:0;}
|
||||
.cal-mini.head span {font-size:26dp;color:var(--muted);}
|
||||
.cal-day-event {padding:0 14dp;right:auto;border:2dp #9a7a3a66;border-radius:18dp;background-color:#fffbf2;}
|
||||
.cal-day-crest {width:120dp;height:120dp;}
|
||||
@@ -276,3 +276,37 @@ body .popup-box footer button:hover {background-color:var(--p-n2);}
|
||||
body .popup-box footer button.primary {background-color:var(--p-accent);border-color:var(--p-accent);color:var(--p-on-accent);}
|
||||
body .popup-box footer button.primary:hover {background-color:var(--p-a6);}
|
||||
body .popup-box input {height:84dp;padding:0 26dp;border:2dp var(--p-div);border-radius:36dp;background-color:var(--p-n1);color:var(--p-text);}
|
||||
|
||||
/* --- postponing and friendlies: the season as twelve month sheets in two rows --- */
|
||||
.pm-grid {display:flex;flex:1;flex-wrap:wrap;gap:18dp;align-content:space-between;min-height:0;}
|
||||
.pm-month {width:451.5dp;height:560dp;padding:16dp 20dp;}
|
||||
.pm-month.current {border-color:var(--p-a6);background-color:var(--p-a1);}
|
||||
.pm-name {display:block;font-family:Display;font-weight:normal;font-size:32dp;line-height:44dp;}
|
||||
.pm-cells {display:flex;flex-wrap:wrap;gap:5dp 0dp;margin-top:8dp;width:413dp;}
|
||||
.pm-cell,.pm-cell:hover,.pm-cell:disabled {display:block;flex:none;width:59dp;height:44dp;line-height:44dp;padding:0;border:0dp;border-radius:12dp;background-color:transparent;decorator:none;font-family:Modern;font-size:25dp;text-align:center;color:var(--p-text);}
|
||||
.pg-root .pm-cell {font-family:Modern;font-size:25dp;}
|
||||
.pm-cell span {display:block;margin:0 3dp;border-radius:12dp;}
|
||||
.pm-cell.head {font-size:21dp;font-weight:bold;color:var(--p-n7);}
|
||||
.pm-cell.day:disabled {opacity:1;color:var(--p-n5);}
|
||||
.pm-cell.day:hover span {border:3dp var(--p-a6);line-height:38dp;}
|
||||
.pm-cell.own span {background-color:var(--p-a6);color:var(--p-n1);font-weight:bold;}
|
||||
.pm-cell.oth span {background-color:var(--p-s3);font-weight:bold;color:var(--p-text);}
|
||||
.pm-cell.free span {background-color:var(--p-s2);font-weight:bold;color:var(--p-s9);}
|
||||
.pm-cell.src span {background-color:var(--p-n9);color:var(--p-n1);font-weight:bold;}
|
||||
.pm-cell.mov span {background-color:var(--p-a3);font-weight:bold;color:var(--p-text);}
|
||||
.pm-cell.busy span {background-color:var(--p-n3);color:var(--p-text);}
|
||||
.pm-cell.own:disabled span,.pm-cell.oth:disabled span,.pm-cell.busy:disabled span {opacity:1;}
|
||||
.pm-cell.tod span {border:4dp var(--p-n9);line-height:36dp;}
|
||||
.pm-cell.sel span,.pm-cell.sel:hover span {border:5dp var(--p-a8);line-height:34dp;}
|
||||
.pm-key.own {background-color:var(--p-a6);} .pm-key.busy {background-color:var(--p-n3);} .pm-key.oth {background-color:var(--p-s3);} .pm-key.src {background-color:var(--p-n9);} .pm-key.free {background-color:var(--p-s2);} .pm-key.mov {background-color:var(--p-a3);}
|
||||
.pm-box {position:relative;padding:16dp 30dp;min-width:0;}
|
||||
.pm-good {color:var(--p-s7);font-weight:bold;}
|
||||
.pm-clear,.pm-clear:hover {position:absolute;right:16dp;top:16dp;width:60dp;height:60dp;padding:0;border:2dp var(--p-div);border-radius:30dp;background-color:var(--p-n1);decorator:none;font-size:36dp;}
|
||||
.pm-month {height:612dp;}
|
||||
.pm-cells {gap:14dp 0dp;margin-top:12dp;}
|
||||
.pm-cell,.pm-cell:hover,.pm-cell:disabled {height:50dp;line-height:50dp;font-size:27dp;}
|
||||
.pg-root .pm-cell {font-size:27dp;}
|
||||
.pm-cell.day:hover span {line-height:44dp;}
|
||||
.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;}
|
||||
@@ -30,7 +30,7 @@ std::string App::render_calendar_year() {
|
||||
calendar_anim_.clear();
|
||||
const auto origin = [&](int panel) { return " style=\"transform-origin:" + scalar(12.5 + (panel % 4) * 25) + "% " + scalar(20 + (panel / 4) * 30) + "%;\""; };
|
||||
const auto season = engine_data_.at("desktop").at("meta").at("season").at("label").get<std::string>();
|
||||
std::string out = "<div id=\"report-underlay\" class=\"report-underlay calendar-year\">";
|
||||
std::string out = "<div id=\"report-underlay\" class=\"pg-page calendar-year\">";
|
||||
if (calendar_month_ < 0) {
|
||||
out += "<header class=\"cal-head\"><h2>Saison " + esc(season) + "</h2><p>Einen Monat anklicken, um seine Tage zu sehen.</p></header><div class=\"cal-months" + (anim.empty() ? std::string() : " " + anim) + "\"" +
|
||||
(anim.empty() ? std::string() : origin(calendar_from_)) + ">";
|
||||
@@ -52,7 +52,7 @@ std::string App::render_calendar_year() {
|
||||
(matches ? std::to_string(matches) + (matches == 1 ? " eigenes Spiel" : " eigene Spiele") : std::string("kein eigenes Spiel")) + (others ? " · " + std::to_string(others) + " weitere Termine" : std::string()) + "</span>",
|
||||
std::string("cal-month") + (current ? " current" : ""),
|
||||
"id=\"calendar-month-" + std::to_string(panel) + "\" data-id=\"" + std::to_string(panel) + "\" aria-label=\"" + calendar_month_names[size_t(month - 1)] + " öffnen\" style=\"" +
|
||||
rect((panel % 4) * 659, (panel / 4) * 536, 635, 512) + "\"");
|
||||
rect((panel % 4) * 706.5, (panel / 4) * 487, 679.5, 460) + "\"");
|
||||
}
|
||||
out += "</div><div class=\"cal-legend\"><span class=\"key match\"></span><span>eigenes Spiel</span><span class=\"key event\"></span><span>weiterer Termin</span><span class=\"key today\"></span><span>heute</span></div>";
|
||||
return out + "</div>";
|
||||
@@ -67,7 +67,7 @@ std::string App::render_calendar_year() {
|
||||
for (const char *w : {"Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"}) out += std::string("<span>") + w + "</span>";
|
||||
out += "</div>";
|
||||
const int rows = (offset + (end - begin) + 6) / 7;
|
||||
const double cell_w = 2612.0 / 7, cell_h = 1500.0 / rows;
|
||||
const double cell_w = 2799.0 / 7, cell_h = 1340.0 / rows;
|
||||
for (int index = begin; index < end; ++index) {
|
||||
const int slot = offset + index - begin;
|
||||
const auto *fixture = fixture_of(index);
|
||||
@@ -95,7 +95,7 @@ std::string App::render_calendar_year() {
|
||||
}
|
||||
out += btn("calendar-select", body, std::string("cal-day") + (fixture ? " match" : !events.at("kinds").empty() ? " event" : "") + (index == today ? " today" : "") + (index == selected ? " chosen" : "") + (slot % 7 >= 5 ? " weekend" : ""),
|
||||
"id=\"calendar-day-" + std::to_string(index) + "\" data-id=\"" + std::to_string(index) + "\" aria-pressed=\"" + (index == selected ? "true" : "false") + "\" aria-label=\"" + calendar_date_label(days[size_t(index)].iso) +
|
||||
"\" style=\"" + rect((slot % 7) * cell_w + 6, 76 + (slot / 7) * cell_h + 6, cell_w - 12, cell_h - 12) + "\"");
|
||||
"\" style=\"" + rect((slot % 7) * cell_w + 7, 70 + (slot / 7) * cell_h + 7, cell_w - 14, cell_h - 14) + "\"");
|
||||
}
|
||||
out += "</div><p id=\"calendar-info\" class=\"calendar-info cal-info\">" + esc(calendar_day_info(view)) + "</p>";
|
||||
return out + "</div>";
|
||||
|
||||
@@ -58,24 +58,6 @@ std::string App::engine_calendar_footer(const Json &view) {
|
||||
return "<nav class=\"report-footer\">" + btn("engine-calendar-filter", esc(nation ? world_->name(*nation) : "Land nicht verfügbar"), "report-reset engine-calendar-label", "id=\"calendar-country\" disabled style=\"" + rect(0,0,1294,94) + "\"") +
|
||||
btn("engine-calendar-filter", esc(league ? world_->name(*league) : "Vereinskalender"), "report-reset engine-calendar-label", "id=\"calendar-league\" disabled style=\"" + rect(1318,0,1294,94) + "\"") + "</nav>";
|
||||
}
|
||||
std::string App::engine_postpone_view() {
|
||||
const auto view = engine_calendar_view(), schedule = engine_scheduling_projection(engine_data_);
|
||||
const Json *source = nullptr, *selected = nullptr; bool undo = false;
|
||||
for (const auto &row : schedule.at("movable")) {
|
||||
if (row.at("id") == engine_move_id_) source = &row;
|
||||
if (row.at("day") == view.at("selected")) selected = &row;
|
||||
}
|
||||
for (const auto &row : schedule.at("moved")) undo |= row.at("day") == view.at("selected");
|
||||
const bool target = source && std::find(source->at("targets").begin(),source->at("targets").end(),view.at("selected")) != source->at("targets").end();
|
||||
std::string title = "Saison " + engine_data_.at("desktop").at("meta").at("season").at("label").get<std::string>();
|
||||
auto source_view = view; if (source) source_view["selected"] = source->at("day");
|
||||
const auto hint = !source ? (schedule.at("movable").empty() ? "Zurzeit ist keine Partie zur Verlegung freigegeben." : "Ein verlegbares Ligaspiel auswählen.") : target ? "Für diese Partie verfügbar." : "Dieser Termin ist für die gewählte Partie nicht verfügbar.";
|
||||
std::string out = "<div id=\"report-underlay\" class=\"report-underlay postpone-layout\"><header class=\"planning-heading\"><h2>Spielverlegung</h2><p>" + esc(title) + "</p>" + planning_progress(source != nullptr,true) + "</header>" + calendar_grid(view,132,1362,28,22,false,true);
|
||||
out += "<section class=\"postpone-summary source " + std::string(source ? "selected-source" : "") + "\"><h3>Ausgangsspiel</h3><p>" + esc(source ? engine_calendar_info(source_view) : selected ? engine_calendar_info(view) : "Zuerst eine verlegbare Partie wählen.") + "</p><small>" + std::string(source ? "Grün markierte Ziele sind für diese Partie verfügbar." : "Mit „Ausgangsspiel wählen“ bestätigen.") + "</small>" + (source ? btn("postpone-cancel","×","postpone-cancel","id=\"postpone-cancel\" aria-label=\"Ausgangsspielauswahl aufheben\"") : "") + "</section>";
|
||||
out += "<section class=\"postpone-summary target\"><h3>Gewählter Termin</h3><p>" + esc(engine_calendar_info(view)) + "</p><small class=\"" + std::string(target ? "valid" : "") + "\">" + hint + "</small></section><nav class=\"planning-footer\">";
|
||||
out += btn("postpone-source","Ausgangsspiel wählen",{},"id=\"postpone-source\" " + std::string(selected ? "" : "disabled")) + btn("postpone-move","Hierhin verlegen",{},"id=\"postpone-move\" " + std::string(target && schedule.at("allowed") == true ? "" : "disabled")) + btn("postpone-undo","Verlegung zurücknehmen",{},"id=\"postpone-undo\" " + std::string(undo && schedule.at("allowed") == true ? "" : "disabled"));
|
||||
return out + "</nav></div>";
|
||||
}
|
||||
bool App::engine_calendar_action(const std::string &action,Rml::Element *target) {
|
||||
if (menu_ != "calendar" && menu_ != "postpone") return false;
|
||||
if (calendar_month_action(action, target)) return true;
|
||||
|
||||
@@ -40,30 +40,6 @@ std::string App::engine_friendly_payer(const Json "e) const {
|
||||
if(quote.at("payer")==engine_data_.at("desktop").at("meta").at("scope").at("managerId"))return "Kosten für "+engine_text(quote.at("home_team").at("name"));
|
||||
return "Kosten für "+engine_text(quote.at("home_team").at("name"))+" ("+quote.at("other_name").get<std::string>()+")";
|
||||
}
|
||||
std::string App::engine_friendlies_view() {
|
||||
const auto plan=engine_friendly_plan(engine_data_);const bool booking=engine_friendly_stage_==1&&engine_friendly_read_.is_object();
|
||||
const auto quote=booking?engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_):Json();
|
||||
if (plan.at("national")==true) return engine_national_friendly_view(plan,quote)+engine_friendly_dialog();
|
||||
const auto *league=world_->find("competitions",engine_friendly_league_);
|
||||
const Json *opponent=nullptr;for(const auto &r:plan.at("opponents"))if(r.at("team").at("id")==engine_friendly_opponent_)opponent=&r.at("team");
|
||||
std::string out="<div id=\"report-underlay\" class=\"report-underlay friendlies-layout\"><header class=\"planning-heading "+std::string(booking?"booking":"")+"\"><h2>"+(booking&&opponent?engine_friendly_team(*opponent,58):esc(league?world_->name(*league):"Weitere Vereine"))+"</h2><p>";
|
||||
out+=booking?std::string(engine_friendly_home_?"Heimspiel":"Auswärtsspiel")+" · "+engine_friendly_payer(quote)+": "+money(quote.at("cost"),{{"code","EUR"},{"minor_units",2}}):"Freundschaftsspiel vereinbaren · Saison "+engine_data_.at("desktop").at("meta").at("season").at("label").get<std::string>();
|
||||
out+="</p>"+planning_progress(booking,false)+"</header>";const auto count="Vorgemerkte Spiele · "+std::to_string(plan.at("bookings").size());
|
||||
if(!booking) {
|
||||
out+="<div id=\"friendly-opponents\" class=\"friendly-opponents\"><div class=\"friendly-table\"><div class=\"friendly-row head\">";
|
||||
for(const auto *h:{"Gegner","Stärke","Platz","Spiele"})out+="<div class=\"friendly-cell\"><span>"+std::string(h)+"</span></div>";
|
||||
out+="</div>";size_t n=0;
|
||||
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=\"friendly-row "+std::string(n++%2==0?"striped ":"")+(id==engine_friendly_opponent_?"selected":"")+"\"><div class=\"friendly-cell\">"+btn("friendly-opponent",engine_friendly_team(team,42),"friendly-opponent","id=\"friendly-opponent-"+esc(id)+"\" data-id=\""+esc(id)+"\" aria-pressed=\""+(id==engine_friendly_opponent_?"true":"false")+"\"")+"</div><div class=\"friendly-cell\"><span>"+(r.at("strength").is_number_integer()?number(r.at("strength")):"—")+"</span></div><div class=\"friendly-cell\"><span>—</span></div><div class=\"friendly-cell\"><span>—</span></div></div>";
|
||||
}
|
||||
out+="</div></div><nav class=\"report-footer\">"+report_picker("country",0,547.526882)+report_picker("league",569.526882,766.537634)+btn("friendly-calendar","Termin auswählen","report-reset","id=\"friendly-calendar\" style=\""+rect(1358.064516,0,547.526882,94)+"\" "+std::string(opponent?"":"disabled"))+btn("friendly-list",count,"report-reset","id=\"friendly-list\" style=\""+rect(1927.591398,0,684.408602,94)+"\"")+"</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();
|
||||
out+=calendar_grid(calendar,148,1424,22,22,true,false)+"<section class=\"friendly-date-summary\"><div class=\"date-side\"><span>Gewählter Termin</span><p>"+esc(engine_calendar_info(calendar))+"</p></div><div class=\"status-side\"><div class=\"friendly-key\"><span class=\"league-dot\"></span><span>Ligaspiel</span><span class=\"friendly-dot\"></span><span>Freundschaftsspiel</span></div><p class=\""+std::string(available?"valid":"")+"\">"+(available?"Dieser Termin ist für die Paarung verfügbar.":"Bitte einen angebotenen Termin wählen.")+"</p></div></section><nav class=\"planning-footer\">"+btn("friendly-back","Gegner ändern",{},"id=\"friendly-back\"")+btn("friendly-list",count,{},"id=\"friendly-list\"")+btn("friendly-book","Spiel vereinbaren",{},"id=\"friendly-book\" "+std::string(available&"e.at("allowed")==true?"":"disabled"))+"</nav>";
|
||||
}
|
||||
return out+"</div>"+engine_friendly_dialog();
|
||||
}
|
||||
std::string App::engine_national_friendly_view(const Json &plan,const Json "e) {
|
||||
const bool booking=engine_friendly_stage_==1 && !quote.is_null();
|
||||
const auto &own=engine_data_.at("desktop").at("data").at("team");
|
||||
@@ -107,30 +83,6 @@ std::string App::engine_national_friendly_view(const Json &plan,const Json "
|
||||
const bool available=std::find(quote.at("dates").begin(),quote.at("dates").end(),Json(engine_friendly_date_))!=quote.at("dates").end();
|
||||
return out+"</aside><footer class=\"national-actions\">"+btn("friendly-back","Gegner ändern",{},"id=\"friendly-back\"")+list+btn("friendly-book","Spiel vereinbaren",{},"id=\"friendly-book\" "+std::string(available&"e.at("allowed")==true?"":"disabled"))+"</footer></div>";
|
||||
}
|
||||
std::string App::engine_friendly_dialog() {
|
||||
if(planning_dialog_.empty())return {};
|
||||
const auto plan=engine_friendly_plan(engine_data_);const Json *opponent=nullptr;for(const auto &r:plan.at("opponents"))if(r.at("team").at("id")==engine_friendly_opponent_)opponent=&r.at("team");
|
||||
const auto close=[&](const char *s){return btn("planning-close",s,{},"id=\"planning-close\"");};
|
||||
std::string title,body,actions;double height=341;
|
||||
if(planning_dialog_=="venue"||planning_dialog_=="quote") {
|
||||
const bool quoted=planning_dialog_=="quote";title=quoted?"Freundschaftsspiel · Kosten":"Austragungsort";height=quoted?(plan.at("national")==true?820.5:720.5):496;
|
||||
body="<div class=\"friendly-dialog-club\">"+(opponent?engine_friendly_team(*opponent,72):"")+"<span>"+std::string(quoted?(engine_friendly_home_?"Heimspiel":"Auswärtsspiel"):"Heimspiel oder Auswärtsspiel?")+"</span></div>";
|
||||
if(!quoted)actions=btn("friendly-venue","Heim",{},"id=\"friendly-home\" data-id=\"home\"")+btn("friendly-venue","Auswärts",{},"id=\"friendly-away\" data-id=\"away\"")+close("Abbrechen");
|
||||
else if(engine_friendly_read_.is_object()) {
|
||||
const auto q=engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_);
|
||||
body+="<div class=\"friendly-quote-amount\"><span>"+esc(engine_friendly_payer(q))+"</span><strong class=\"money-amount\">"+esc(money(q.at("cost"),{{"code","EUR"},{"minor_units",2}}))+"</strong></div><p class=\"friendly-quote-note\">"+std::string(q.at("days").empty()?"Für diese Paarung ist derzeit kein Termin verfügbar.":"Anschließend einen angebotenen Termin wählen. Erst die bestätigte Buchung übernimmt das Spiel.")+"</p>";
|
||||
if(q.at("national")==true) body+="<p class=\"friendly-national-ratings\">Angebotsstärke · "+esc(engine_text(engine_data_.at("desktop").at("data").at("team").at("name")))+": "+number(q.at("ratings")[0])+" · "+esc(engine_text(opponent->at("name")))+": "+number(q.at("ratings")[1])+"</p>";
|
||||
actions=close("Abbrechen")+btn("friendly-quote-accept","Termin wählen",{},"id=\"friendly-quote-accept\" "+std::string(q.at("days").empty()?"disabled":""));
|
||||
} else {body+="<p class=\"friendly-quote-note\">"+esc(engine_busy_?"Angebot wird geladen …":"Angebot derzeit nicht verfügbar.")+"</p>";actions=close("Abbrechen");}
|
||||
} else if(planning_dialog_=="list") {
|
||||
title="Vorgemerkte Freundschaftsspiele";auto bookings=plan.at("bookings");std::sort(bookings.begin(),bookings.end(),[](const auto &a,const auto &b){return a.at("date")<b.at("date");});height=bookings.empty()?330.5:287+std::min(1020.,80.*(bookings.size()+1));
|
||||
body="<div class=\"friendly-bookings\">";
|
||||
if(bookings.empty())body+="<p>Noch keine Freundschaftsspiele vorgemerkt.</p>";
|
||||
else {body+="<div class=\"friendly-booking-row head\"><span><span>Datum</span></span><span><span>Gegner</span></span><span><span>Ort</span></span></div>";const auto own=engine_data_.at("desktop").at("meta").at("scope").at("teamId");for(const auto &r:bookings){const bool home=r.at("home").at("id")==own;body+="<div class=\"friendly-booking-row\"><span><span>"+calendar_date_label(r.at("date"))+"</span></span><span>"+engine_friendly_team(r.at(home?"away":"home"),42)+"</span><span><span>"+(home?"Heim":"Auswärts")+"</span></span></div>";}}
|
||||
body+="</div>";actions=close("Zurück");
|
||||
} else {title=planning_dialog_=="booked"?"Freundschaftsspiel vereinbart":"Nicht übernommen";body="<p class=\"planning-notice\">"+esc(planning_notice_)+"</p>";actions=close("Verstanden");}
|
||||
return "<div id=\"planning-layer\" class=\"planning-layer\"><section id=\"planning-dialog\" class=\"planning-dialog "+esc(planning_dialog_)+"\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"planning-dialog-title\" style=\"height:"+scalar(height)+"dp;\"><h2 id=\"planning-dialog-title\">"+title+"</h2>"+body+"<nav class=\"planning-dialog-actions\">"+actions+"</nav></section></div>";
|
||||
}
|
||||
bool App::engine_friendly_event(Rml::Event &event) {
|
||||
if(menu_!="friendlies"||planning_dialog_.empty())return false;
|
||||
const auto type=event.GetType();const bool key=type=="keydown";
|
||||
|
||||
@@ -6,6 +6,10 @@
|
||||
// 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"};
|
||||
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";
|
||||
if (menu_ == "calendar") return notebook_page() && engine_mode_; // the demo keeps its older calendar
|
||||
return notebook_page() && native.contains(menu_);
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,138 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
// Postponing a match and arranging a friendly as pages of the notebook. Both show the season
|
||||
// as twelve small month sheets in two rows; a day is coloured by what it is to the task at
|
||||
// hand (a match that can be moved, a free target, a date that is taken) and is clicked.
|
||||
|
||||
// The twelve months of the engine's calendar. `booking`: only offered friendly dates can be
|
||||
// chosen. `movable`: the days of the matches that may be postponed.
|
||||
std::string App::page_months(const Json &calendar, bool booking, bool postpone, const std::set<int> &movable) {
|
||||
const auto days = calendar_days(calendar.at("start").get<std::string>());
|
||||
const int selected = calendar.at("selected").get<int>(), today = calendar.at("today").is_number_integer() ? calendar.at("today").get<int>() : -1;
|
||||
static constexpr std::array<const char *, 12> months = {"Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"};
|
||||
const auto has = [&](const char *key, int index) { const auto &list = calendar.at(key); return std::find(list.begin(), list.end(), Json(index)) != list.end(); };
|
||||
std::string out = "<div class=\"pm-grid\">";
|
||||
int first = 0;
|
||||
for (int panel = 0; panel < 12 && first < int(days.size()); ++panel) {
|
||||
const int month = days[size_t(first)].month, offset = days[size_t(first)].weekday;
|
||||
bool current = false;
|
||||
std::string cells;
|
||||
for (const char *w : {"M", "D", "M", "D", "F", "S", "S"}) cells += std::string("<span class=\"pm-cell head\">") + w + "</span>";
|
||||
for (int blank = 0; blank < offset; ++blank) cells += "<span class=\"pm-cell\"></span>";
|
||||
int index = first;
|
||||
for (; index < int(days.size()) && days[size_t(index)].month == month; ++index) {
|
||||
const auto events = calendar.at("events").value(std::to_string(index), Json{{"kinds", Json::array()}, {"ids", Json::array()}});
|
||||
const bool friendly = std::find(events.at("kinds").begin(), events.at("kinds").end(), Json("friendly")) != events.at("kinds").end();
|
||||
const bool occupied = !events.at("ids").empty() || friendly, general = !events.at("kinds").empty() && !occupied;
|
||||
const bool source = postpone && calendar.value("source_day", -1) == index;
|
||||
const bool target = (booking && has("friendly_targets", index)) || (postpone && has("targets", index));
|
||||
const bool moved = has("moved_days", index), chosen = selected == index;
|
||||
current |= index == today;
|
||||
const std::string kind = source ? "src" : target ? "free" : moved ? "mov" : occupied ? (postpone && !movable.contains(index) ? "busy" : "own") : general ? "oth" : "";
|
||||
const std::string say = source ? ", Ausgangsspiel" : target ? ", verfügbar" : moved ? ", verlegt" : occupied ? ", eingetragenes Spiel" : general ? ", Wettbewerbstermin" : ", kein eingetragener Termin";
|
||||
cells += btn("calendar-select", "<span>" + std::to_string(days[size_t(index)].day) + "</span>", "pm-cell day " + kind + (chosen ? " sel" : "") + (index == today ? " tod" : ""),
|
||||
"id=\"calendar-day-" + std::to_string(index) + "\" data-id=\"" + std::to_string(index) + "\" aria-pressed=\"" + (chosen ? "true" : "false") + "\" aria-label=\"" + calendar_date_label(days[size_t(index)].iso) + say + "\" " +
|
||||
(booking && !target ? "disabled" : ""));
|
||||
}
|
||||
out += "<section class=\"pg-panel pm-month" + std::string(current ? " current" : "") + "\"><div class=\"pg-row\" style=\"justify-content:space-between;\"><strong class=\"pm-name\">" + months[size_t(month - 1)] + "</strong><span class=\"pg-mut\" style=\"font-size:" + pg(11) +
|
||||
";\">" + std::to_string(days[size_t(first)].year) + "</span></div><div class=\"pm-cells\">" + cells + "</div></section>";
|
||||
first = index;
|
||||
}
|
||||
return out + "</div>";
|
||||
}
|
||||
// The two steps of a task as a pill; the one that is due is marked.
|
||||
std::string App::page_steps(const std::string &first, const std::string &second, bool at_second) {
|
||||
return "<div class=\"pg-seg\" aria-label=\"Schritt\"><button class=\"first " + std::string(at_second ? "" : "on") + "\" style=\"pointer-events:none;\"><span>1 " + first + "</span></button><button class=\"" + std::string(at_second ? "on" : "") +
|
||||
"\" style=\"pointer-events:none;\"><span>2 " + second + "</span></button></div>";
|
||||
}
|
||||
|
||||
std::string App::engine_postpone_view() {
|
||||
const auto view = engine_calendar_view(), schedule = engine_scheduling_projection(engine_data_);
|
||||
const Json *source = nullptr, *selected = nullptr; bool undo = false;
|
||||
std::set<int> movable;
|
||||
for (const auto &row : schedule.at("movable")) {
|
||||
movable.insert(row.at("day").get<int>());
|
||||
if (row.at("id") == engine_move_id_) source = &row;
|
||||
if (row.at("day") == view.at("selected")) selected = &row;
|
||||
}
|
||||
for (const auto &row : schedule.at("moved")) undo |= row.at("day") == view.at("selected");
|
||||
const bool target = source && std::find(source->at("targets").begin(),source->at("targets").end(),view.at("selected")) != source->at("targets").end();
|
||||
auto source_view = view; if (source) source_view["selected"] = source->at("day");
|
||||
const std::string hint = !source ? (schedule.at("movable").empty() ? "Zurzeit ist keine Partie zur Verlegung freigegeben." : "Ein markiertes Spiel im Kalender anklicken.") : target ? "frei · gültiges Ziel" : "Einen grün markierten Tag wählen.";
|
||||
const auto box = [&](const std::string &title, const std::string &main, const std::string &sub, const std::string &extra, bool good) {
|
||||
return "<div class=\"pg-panel pg-grow pm-box\"><span class=\"pg-k\">" + esc(pg_upper(title)) + "</span><strong class=\"pg-h pg-nowrap\" style=\"font-size:" + pg(15) + ";line-height:" + pg(21) + ";\">" + esc(main) + "</strong><span class=\"pg-mut pg-nowrap" +
|
||||
std::string(good ? " pm-good" : "") + "\" style=\"display:block;\">" + esc(sub) + "</span>" + extra + "</div>";
|
||||
};
|
||||
std::string out = "<div id=\"report-underlay\" class=\"pg-page\"><header class=\"pg-row\" style=\"align-items:flex-end;\"><div style=\"flex:none;\"><h2 class=\"pg-h\" style=\"font-size:" + pg(22) + ";line-height:" + pg(26) + ";\">Spielverlegung</h2><span class=\"pg-mut\" style=\"display:block;\">Saison " +
|
||||
esc(engine_data_.at("desktop").at("meta").at("season").at("label").get<std::string>()) + "</span></div>" + page_steps("Spiel wählen", "Termin wählen", source != nullptr) +
|
||||
box("Ausgangsspiel", source ? engine_calendar_info(source_view) : selected ? engine_calendar_info(view) : std::string("—"), source ? "Grün markierte Ziele sind für diese Partie verfügbar." : selected ? "Mit „Ausgangsspiel wählen“ bestätigen." : hint,
|
||||
source ? btn("postpone-cancel", "×", "pm-clear", "id=\"postpone-cancel\" aria-label=\"Ausgangsspielauswahl aufheben\"") : std::string(), false) +
|
||||
box("Gewählter Termin", source ? engine_calendar_info(view) : std::string("—"), source ? hint : "—", {}, target) + "</header>" + page_months(view, false, true, movable) + "<nav class=\"pg-foot\">" +
|
||||
pg_button("postpone-source", "Ausgangsspiel wählen", "", "id=\"postpone-source\" " + std::string(selected && !source ? "" : "disabled")) +
|
||||
pg_button("postpone-move", "Hierhin verlegen", "primary", "id=\"postpone-move\" " + std::string(target && schedule.at("allowed") == true ? "" : "disabled")) +
|
||||
pg_button("postpone-undo", "Verlegung zurücknehmen", "", "id=\"postpone-undo\" " + std::string(undo && schedule.at("allowed") == true ? "" : "disabled")) + "<span class=\"pg-sp\"></span><span class=\"pg-legend\">";
|
||||
for (const auto &[kind, label] : std::array<std::pair<const char *, const char *>, 6>{{{"own", "verlegbar"}, {"busy", "belegt"}, {"oth", "Wettbewerb"}, {"src", "Ausgangsspiel"}, {"free", "Ziel"}, {"mov", "verlegt"}}})
|
||||
out += "<span class=\"pg-legend-item\"><span class=\"pg-legend-mark pm-key " + std::string(kind) + "\"></span><span>" + label + "</span></span>";
|
||||
return out + "</span></nav></div>";
|
||||
}
|
||||
|
||||
std::string App::engine_friendlies_view() {
|
||||
const auto plan=engine_friendly_plan(engine_data_);const bool booking=engine_friendly_stage_==1&&engine_friendly_read_.is_object();
|
||||
const auto quote=booking?engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_):Json();
|
||||
if (plan.at("national")==true) return engine_national_friendly_view(plan,quote)+engine_friendly_dialog();
|
||||
const auto *league=world_->find("competitions",engine_friendly_league_);
|
||||
const Json *opponent=nullptr;for(const auto &r:plan.at("opponents"))if(r.at("team").at("id")==engine_friendly_opponent_)opponent=&r.at("team");
|
||||
const auto count="Vorgemerkte Spiele · "+std::to_string(plan.at("bookings").size());
|
||||
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\">";
|
||||
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+="</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"))+
|
||||
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();
|
||||
out+="<div class=\"pg-row\" style=\""+pg_css("gap:12px;")+"\">"+(opponent?crest(world_->find("clubs",opponent->at("id")),100):std::string())+"<div class=\"pg-grow\"><strong class=\"pg-h\" style=\"font-size:"+pg(19)+";\">"+esc(opponent?engine_text(opponent->at("name")):std::string("—"))+
|
||||
"</strong><span class=\"pg-mut\" style=\"display:block;\">"+std::string(engine_friendly_home_?"Heimspiel":"Auswärtsspiel")+" · "+esc(engine_friendly_payer(quote))+": "+esc(money(quote.at("cost"),{{"code","EUR"},{"minor_units",2}}))+
|
||||
"</span></div><div class=\"pg-panel pm-box\" style=\"flex:none;width:"+pg(520)+";\">"+pg_kicker("Gewählter Termin")+"<strong class=\"pg-h pg-nowrap\" style=\"font-size:"+pg(15)+";line-height:"+pg(21)+";\">"+esc(engine_calendar_info(calendar))+"</strong><span class=\"pg-mut"+
|
||||
std::string(available?" pm-good":"")+"\" style=\"display:block;\">"+(available?"frei · Angebot gültig":"Einen markierten Tag wählen.")+"</span></div></div>"+page_months(calendar,true,false,{})+"<nav class=\"pg-foot\">"+pg_button("friendly-back","Gegner ändern","","id=\"friendly-back\"")+
|
||||
pg_button("friendly-list",count,"","id=\"friendly-list\"")+pg_button("friendly-book","Spiel vereinbaren","primary","id=\"friendly-book\" "+std::string(available&"e.at("allowed")==true?"":"disabled"))+
|
||||
"<span class=\"pg-sp\"></span><span class=\"pg-legend\"><span class=\"pg-legend-item\"><span class=\"pg-legend-mark pm-key own\"></span><span>eigenes Spiel</span></span><span class=\"pg-legend-item\"><span class=\"pg-legend-mark pm-key free\"></span><span>Freundschaftsspiel möglich</span></span></span></nav>";
|
||||
}
|
||||
return out+"</div>"+engine_friendly_dialog();
|
||||
}
|
||||
|
||||
std::string App::engine_friendly_dialog() {
|
||||
if(planning_dialog_.empty())return {};
|
||||
const auto plan=engine_friendly_plan(engine_data_);const Json *opponent=nullptr;for(const auto &r:plan.at("opponents"))if(r.at("team").at("id")==engine_friendly_opponent_)opponent=&r.at("team");
|
||||
const auto close=[&](const char *s,bool primary=false){return pg_button("planning-close",s,primary?"primary":"","id=\"planning-close\"");};
|
||||
const auto team=[&](const Json &t){return "<span class=\"pg-row\" style=\""+pg_css("gap:8px;")+"\">"+crest(world_->find("clubs",t.at("id")),56)+"<strong>"+esc(engine_text(t.at("name")))+"</strong></span>";};
|
||||
std::string title,body,actions;double width=440;
|
||||
if(planning_dialog_=="venue"||planning_dialog_=="quote") {
|
||||
const bool quoted=planning_dialog_=="quote";title=quoted?"Freundschaftsspiel · Kosten":"Austragungsort";
|
||||
body="<div class=\"pg-row\" style=\"justify-content:space-between;\">"+(opponent?team(*opponent):std::string())+"<span class=\"pg-mut\">"+std::string(quoted?(engine_friendly_home_?"Heimspiel":"Auswärtsspiel"):"Heimspiel oder Auswärtsspiel?")+"</span></div>";
|
||||
if(!quoted)actions=close("Abbrechen")+pg_button("friendly-venue","Auswärts","","id=\"friendly-away\" data-id=\"away\"")+pg_button("friendly-venue","Heim","primary","id=\"friendly-home\" data-id=\"home\"");
|
||||
else if(engine_friendly_read_.is_object()) {
|
||||
const auto q=engine_friendly_projection(engine_data_,engine_friendly_read_,engine_friendly_opponent_,engine_friendly_home_);
|
||||
body+="<div class=\"pg-panel\"><div class=\"pg-kv\" style=\"font-size:"+pg(15)+";\"><span>"+esc(engine_friendly_payer(q))+"</span><strong class=\"money-amount\">"+esc(money(q.at("cost"),{{"code","EUR"},{"minor_units",2}}))+"</strong></div></div><span class=\"pg-mut\" style=\"display:block;\">"+
|
||||
std::string(q.at("days").empty()?"Für diese Paarung ist derzeit kein Termin verfügbar.":"Anschließend einen angebotenen Termin wählen. Erst die bestätigte Buchung übernimmt das Spiel.")+"</span>";
|
||||
if(q.at("national")==true) body+="<span class=\"pg-mut\" style=\"display:block;\">Angebotsstärke · "+esc(engine_text(engine_data_.at("desktop").at("data").at("team").at("name")))+": "+number(q.at("ratings")[0])+" · "+esc(engine_text(opponent->at("name")))+": "+number(q.at("ratings")[1])+"</span>";
|
||||
actions=close("Abbrechen")+pg_button("friendly-quote-accept","Termin wählen","primary","id=\"friendly-quote-accept\" "+std::string(q.at("days").empty()?"disabled":""));
|
||||
} else {body+="<span class=\"pg-mut\" style=\"display:block;\">"+esc(engine_busy_?"Angebot wird geladen …":"Angebot derzeit nicht verfügbar.")+"</span>";actions=close("Abbrechen");}
|
||||
} else if(planning_dialog_=="list") {
|
||||
title="Vorgemerkte Freundschaftsspiele";width=560;auto bookings=plan.at("bookings");std::sort(bookings.begin(),bookings.end(),[](const auto &a,const auto &b){return a.at("date")<b.at("date");});
|
||||
if(bookings.empty())body="<div class=\"pg-panel pg-empty\">Noch keine Freundschaftsspiele vorgemerkt.</div>";
|
||||
else {
|
||||
body="<div class=\"pg-panel pg-col\" style=\""+pg_css("gap:0px;padding:6px 12px;")+"\"><div class=\"pg-t\"><div class=\"pg-thead\">"+pg_th("Datum",170)+pg_th("Gegner",0)+pg_th("Ort",110)+"</div><div class=\"pg-tbody\">";
|
||||
const auto own=engine_data_.at("desktop").at("meta").at("scope").at("teamId");
|
||||
for(const auto &r:bookings){const bool home=r.at("home").at("id")==own;body+="<div class=\"pg-tr\">"+pg_td(esc(calendar_date_label(r.at("date"))),170)+pg_td(team(r.at(home?"away":"home")),0,"",true)+pg_td(home?"Heim":"Auswärts",110)+"</div>";}
|
||||
body+="</div></div></div>";
|
||||
}
|
||||
actions=close("Zurück",true);
|
||||
} else {title=planning_dialog_=="booked"?"Freundschaftsspiel vereinbart":"Nicht übernommen";body="<p>"+esc(planning_notice_)+"</p>";actions=close("Verstanden",true);}
|
||||
return "<div id=\"planning-layer\" class=\"pg-ov\"><section id=\"planning-dialog\" class=\"pg-dlg "+esc(planning_dialog_)+"\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"planning-dialog-title\" style=\"width:"+pg(width)+";\"><div><h2 id=\"planning-dialog-title\">"+title+
|
||||
"</h2></div>"+body+"<nav class=\"pg-dlg-act\">"+actions+"</nav></section></div>";
|
||||
}
|
||||
@@ -892,6 +892,9 @@ 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);
|
||||
// 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);
|
||||
// the tactics sketch (tactics_page.inc): what is being dragged on it
|
||||
bool tactics_page_event(Rml::Event &event);
|
||||
Json tactic_drag_;
|
||||
@@ -1787,6 +1790,7 @@ public:
|
||||
#include "modern/ui/notebook_home.inc"
|
||||
#include "modern/ui/pages.inc"
|
||||
#include "modern/ui/tactics_page.inc"
|
||||
#include "modern/ui/planning_page.inc"
|
||||
#include "modern/ui/finance_simulation.inc"
|
||||
#include "modern/ui/statistics_analysis.inc"
|
||||
#include "modern/ui/engine_rankings.inc"
|
||||
|
||||
Reference in new issue
Block a user