Bind season calendar and confirmed fixture rescheduling to engine (by Codex)

This commit is contained in:
Codex committed 2026-10-28 14:42:25 +01:00
1 parent 7e170a00c7
commit 6119d7f21e
17 files changed
+388 -16

No files matched your search

+19 -10
View File
@@ -6,16 +6,18 @@ std::string calendar_date_label(const std::string &iso) {
}
Json App::planning_calendar() const {
if (engine_mode_) return engine_calendar_view();
auto calendar = snap().state.at("calendar");
calendar["league"] = calendar_own_league(*world_, manager(snap()).value("club", ""));
return calendar;
}
std::string App::calendar_day_info(const Json &calendar) const {
if (engine_mode_) return engine_calendar_info(calendar);
const auto days = calendar_days(calendar.at("start").get<std::string>());
const int selected = calendar.at("selected").get<int>();
const auto date = calendar_date_label(days.at(size_t(selected)).iso);
const auto own = manager(snap()).value("club", "");
const auto own = engine_mode_ ? engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>() : manager(snap()).value("club", "");
for (const auto &f : calendar_fixtures(calendar, *world_, own))
if (f.day == selected) {
const auto *home = world_->find("clubs", f.home), *away = world_->find("clubs", f.away);
@@ -35,9 +37,9 @@ std::string App::calendar_grid(const Json &calendar, double top, double height,
double gap_x, double gap_y, bool booking,
bool postpone) {
const auto days = calendar_days(calendar.at("start").get<std::string>());
const auto own = manager(snap()).value("club", "");
const auto fixtures = calendar_fixtures(calendar, *world_, own);
const bool own_league = calendar.at("league") == calendar_own_league(*world_, own);
const auto own = engine_mode_ ? engine_data_.at("desktop").at("meta").at("scope").at("teamId").get<std::string>() : manager(snap()).value("club", "");
const auto fixtures = engine_mode_ ? std::vector<CalendarFixture>() : calendar_fixtures(calendar, *world_, own);
const bool own_league = !engine_mode_ && calendar.at("league") == calendar_own_league(*world_, own);
const int selected = calendar.at("selected").get<int>();
const double width = (2612 - gap_x * 3) / 4, card_height = (height - gap_y * 2) / 3;
const double grid_top = postpone ? 58 : 66;
@@ -59,15 +61,21 @@ std::string App::calendar_grid(const Json &calendar, double top, double height,
const int day_number = col * 7 + row - offset + 1, index = first + day_number - 1;
if (day_number < 1 || index >= int(days.size()) || days[size_t(index)].month != month) continue;
const auto match = std::find_if(fixtures.begin(), fixtures.end(), [&](const auto &f) { return f.day == index; });
const bool friendly = own_league && std::any_of(calendar.at("friendlies").begin(), calendar.at("friendlies").end(), [&](const auto &f) { return f.at("day") == index; });
const bool occupied = match != fixtures.end() || friendly, chosen = selected == index;
const bool source = postpone && match != fixtures.end() && match->from == calendar.value("source_day", -1);
const auto events = engine_mode_ ? calendar.at("events").value(std::to_string(index), Json{{"kinds",Json::array()},{"ids",Json::array()}}) : Json();
const bool engine_friendly = engine_mode_ && std::find(events.at("kinds").begin(),events.at("kinds").end(),Json("friendly")) != events.at("kinds").end();
const bool friendly = engine_friendly || (own_league && std::any_of(calendar.at("friendlies").begin(), calendar.at("friendlies").end(), [&](const auto &f) { return f.at("day") == index; }));
const bool occupied = engine_mode_ ? !events.at("ids").empty() || friendly : match != fixtures.end() || friendly, chosen = selected == index;
const bool source = engine_mode_ ? postpone && calendar.value("source_day", -1) == index : postpone && match != fixtures.end() && match->from == calendar.value("source_day", -1);
const bool target = engine_mode_ && postpone && std::find(calendar.at("targets").begin(),calendar.at("targets").end(),Json(index)) != calendar.at("targets").end();
const bool moved = engine_mode_ && std::find(calendar.at("moved_days").begin(),calendar.at("moved_days").end(),Json(index)) != calendar.at("moved_days").end();
const bool general = engine_mode_ && !events.at("kinds").empty() && !occupied;
body += btn("calendar-select",
(chosen || source ? "<span class=\"calendar-outline " + std::string(source ? "source-outline" : "") + "\" style=\"" + rect(3, 3, cell_width - 6, cell_height - 6) + "\"></span>" : "") +
(general || target || moved ? "<span class=\"calendar-event-mark\"></span>" : "") +
"<span class=\"control-label\">" + std::to_string(day_number) + "</span>",
std::string("calendar-day ") + (occupied ? "has-match " : "") + (friendly ? "friendly-date " : "") + (source ? "source-day " : "") + (chosen ? "selected-day" : ""),
std::string("calendar-day ") + (occupied ? "has-match " : "") + (friendly ? "friendly-date " : "") + (source ? "source-day " : "") + (target ? "valid-target " : "") + (moved ? "rescheduled-date " : "") + (general ? "competition-date " : "") + (chosen ? "selected-day" : ""),
"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) +
(occupied ? ", belegt" : ", frei") + "\" style=\"" + rect(77 + col * cell_width, grid_top + row * cell_height, cell_width, cell_height) + "\" " + (booking && (index < 7 || occupied) ? "disabled" : ""));
(engine_mode_ ? (occupied ? ", eingetragenes Spiel" : general ? ", Wettbewerbstermin" : ", kein eingetragener Termin") : (occupied ? ", belegt" : ", frei")) + "\" style=\"" + rect(77 + col * cell_width, grid_top + row * cell_height, cell_width, cell_height) + "\" " + (booking && (index < 7 || occupied) ? "disabled" : ""));
}
}
body += "</section>";
@@ -77,7 +85,8 @@ std::string App::calendar_grid(const Json &calendar, double top, double height,
}
std::string App::render_calendar() {
const auto calendar = snap().state.at("calendar");
const auto calendar = engine_mode_ ? engine_calendar_view() : snap().state.at("calendar");
if (engine_mode_) return "<div id=\"report-underlay\" class=\"report-underlay\">" + calendar_grid(calendar,0,1640,28,28,false,false) + "<p id=\"calendar-info\" class=\"calendar-info\">" + esc(calendar_day_info(calendar)) + "</p>" + engine_calendar_footer(calendar) + "</div>";
return "<div id=\"report-underlay\" class=\"report-underlay\">" +
calendar_grid(calendar, 0, 1640, 28, 28, false, false) +
"<p id=\"calendar-info\" class=\"calendar-info\">" + esc(calendar_day_info(calendar)) +