Bind cup reports and linked competition phases to live engine data (by Codex)

This commit is contained in:
Codex committed 2026-10-28 23:03:36 +01:00
1 parent 545e16f153
commit 6b4aa9772d
26 files changed
+402 -33

No files matched your search

+28 -5
View File
@@ -5,6 +5,7 @@ void App::engine_reports_sync() {
if(engine_reports_context_.is_null()||meta.at("careerId")!=engine_reports_context_.at("careerId")||meta.at("scope").at("managerId")!=engine_reports_context_.at("scope").at("managerId"))engine_reports_state_["league"]="";
engine_reports_context_=meta;engine_reports_index_=Json();engine_reports_read_=Json();engine_reports_roster_=Json();engine_reports_value_=Json();engine_reports_roster_value_=Json();
engine_fixtures_read_=Json();engine_fixtures_value_=Json();
engine_other_index_=Json();engine_other_read_=Json();engine_other_value_=Json();
report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear();
}
void App::engine_reports_load(const std::string &preferred,int filter) {
@@ -36,9 +37,26 @@ void App::engine_fixtures_load(const std::string &preferred,int round) {
return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","fixtures"},{"index",index},{"read",report},{"league",id},{"filter",filter},{"fixtures",fixtures},{"round",selected}},nullptr};
});
}
void App::engine_other_load(const std::string &preferred,int round) {
if(engine_busy_||!engine_fresh_)return;
if(engine_other_value_.is_object()&&engine_other_value_.at("viewId")==preferred&&engine_other_value_.at("round")==round){refresh();return;}
auto link=engine_link_;engine_start("Wettbewerb wird geladen …",[link,preferred,round] {
const auto bundle=link->snapshot(),index=link->read({{"kind","other-index"}});const auto data=engine_other_index(bundle,index);
const Json *view=nullptr;for(const auto &v:data.at("views"))if(v.at("id")==preferred)view=&v;
if(!view)for(const auto &v:data.at("views"))if(v.at("id")==data.at("defaultViewId"))view=&v;
Json response={{"messageType","reports_preview"},{"kind","other"},{"index",index},{"read",nullptr},{"view",nullptr},{"round",0}};
if(view){const auto id=view->at("id").get<std::string>();const int total=view->at("rounds"),selected=round>0?std::clamp(round,1,total):view->at("currentRound").get<int>();response["view"]=id;response["round"]=selected;response["read"]=link->read({{"kind","other-fixtures"},{"viewId",id},{"round",selected}});}
return EngineReply{link,bundle,response,nullptr};
});
}
void App::engine_reports_poll(const EngineReply &reply) {
if(reply.bundle.at("desktop").at("meta")!=engine_reports_context_)throw editor::Error("Der Berichtskontext hat sich geändert. Bitte neu öffnen.");
const auto &r=reply.response,&read=r.at("read");
if(r.at("kind")=="other") {
(void)engine_other_index(reply.bundle,r.at("index"));
auto value=read.is_null()?Json():engine_other_projection(reply.bundle,r.at("index"),read,r.at("view"),r.at("round"));
engine_other_index_=r.at("index");engine_other_read_=read;engine_other_value_=std::move(value);engine_notice_="Wettbewerb geladen.";return;
}
if(read.value("messageType","")=="error"){engine_notice_=engine_text(read.value("message",Json()));return;}
if(r.at("kind")=="league"||r.at("kind")=="fixtures") {
auto value=engine_report_projection(reply.bundle,r.at("index"),read,r.at("league"),r.at("filter"));
@@ -53,17 +71,20 @@ void App::engine_reports_poll(const EngineReply &reply) {
engine_notice_="Ligabericht geladen.";
}
Json App::engine_reports_rows(const std::string &mode) const {
if(mode=="other")return engine_other_value_.at("matches");
if(mode=="league")return engine_fixtures_value_.at("matches");
std::vector<Json> rows;
for(const auto &r:engine_reports_value_.at(mode=="tables"?"table":"strengths"))rows.push_back(r);
return sort_report_rows(std::move(rows),engine_reports_state_.at("sorts").at(mode));
}
Json App::engine_report_team(const std::string &id) const {
if(menu_=="other"&&engine_other_value_.is_object())for(const auto &m:engine_other_value_.at("matches"))for(const auto *side:{"home_team","away_team"})if(m.at(side).at("id")==id)return m.at(side);
if(engine_reports_value_.is_object())for(const auto &r:engine_reports_value_.at("table"))if(r.at("club")==id)return r.at("team");
return Json();
}
std::vector<std::pair<std::string,std::string>> App::engine_reports_picker_items(const std::string &kind) const {
std::vector<std::pair<std::string,std::string>> out;
if(menu_=="other"){if(kind=="competition"&&engine_other_index_.is_object())for(const auto &v:engine_other_index_.at("data").at("views"))out.emplace_back(v.at("id"),v.at("name"));return out;}
if(kind=="filter"){const char* values[]={"Alle Spiele","Hinrunde","Rückrunde","Heim","Auswärts"};for(int i=0;i<5;++i)out.emplace_back(std::to_string(i),values[i]);return out;}
const auto &leagues=engine_reports_index_.at("data").at("leagues");std::set<std::string> seen;std::string nation;
for(const auto &l:leagues)if(l.at("id")==engine_reports_state_.at("league"))nation=l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";
@@ -79,10 +100,11 @@ std::vector<std::pair<std::string,std::string>> App::engine_reports_picker_items
return out;
}
bool App::engine_reports_action(const std::string &action,Rml::Element *target) {
if(menu_!="tables"&&menu_!="strengths"&&menu_!="league")return false;
if(menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other")return false;
const auto id=target?target->GetAttribute<Rml::String>("data-id",""):std::string();
if(action=="report-detail-close") {focus_after_render_=report_detail_return_focus_;report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear();refresh();return true;}
if(engine_busy_||!engine_fresh_)return action.starts_with("report-")||action=="club-detail"||action=="player-detail";
if(action=="report-round"&&menu_=="other"){if(id!="1"&&id!="-1")return true;const int current=engine_other_value_.at("round"),total=engine_other_value_.at("rounds");focus_after_render_=target->GetId();engine_other_load(engine_other_value_.at("viewId"),std::clamp(current+std::stoi(id),1,total));return true;}
if(action=="report-round"&&menu_=="league") {if(id!="1"&&id!="-1")return true;const int current=engine_fixtures_value_.at("round"),total=engine_fixtures_value_.at("rounds");const int next=std::clamp(current+std::stoi(id),1,total);focus_after_render_=target->GetId();engine_fixtures_load(engine_reports_state_.at("league"),next);return true;}
if(action=="report-sort") {
const std::set<std::string> table{"rank","played","wins","draw","loss","form","points","gf","diff"},strength{"club","keeper","defence","midfield","attack","strength"};
@@ -107,7 +129,7 @@ bool App::engine_reports_action(const std::string &action,Rml::Element *target)
return false;
}
bool App::engine_reports_event(Rml::Event &event) {
if((menu_!="tables"&&menu_!="strengths"&&menu_!="league")||report_detail_kind_.empty())return false;
if((menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other")||report_detail_kind_.empty())return false;
const auto type=event.GetType();
if(type=="keydown"&&event.GetParameter<int>("key_identifier",0)==Rml::Input::KI_ESCAPE){engine_reports_action("report-detail-close",nullptr);event.StopImmediatePropagation();return true;}
if(type=="keydown"&&event.GetParameter<int>("key_identifier",0)==Rml::Input::KI_TAB){Rml::ElementList nodes;if(auto *root=element("report-detail-dialog"))root->QuerySelectorAll(nodes,"button");std::erase_if(nodes,[](auto *n){return n->HasAttribute("disabled");});if(!nodes.empty()){const auto it=std::find(nodes.begin(),nodes.end(),context_->GetFocusElement());int i=it==nodes.end()?-1:int(it-nodes.begin()),n=int(nodes.size());auto *next=nodes[size_t((i+n+(event.GetParameter<int>("shift_key",0)?-1:1))%n)];next->Focus(true);next->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));}event.StopImmediatePropagation();return true;}
@@ -121,7 +143,7 @@ std::string App::engine_reports_detail() {
std::string title=engine_text(team.at("name")),body,actions=close;
if(report_detail_kind_=="club") {
std::string strength="—",manager="Computer";
for(const auto &r:engine_reports_value_.at("strengths"))if(r.at("club")==report_detail_club_)strength=report_number(r.at("strength"));
if(engine_reports_value_.is_object())for(const auto &r:engine_reports_value_.at("strengths"))if(r.at("club")==report_detail_club_)strength=report_number(r.at("strength"));
for(const auto &m:engine_data_.at("session").at("data").at("managers"))if(m.at("teamId")==report_detail_club_&&m.at("status")=="active")manager=engine_text(m.at("name"));
std::string stadium_name="—",places="—";const auto *club=world_->find("clubs",report_detail_club_);const Json *stadium=nullptr;
if(club&&club->value("stadium",Json()).is_string())stadium=world_->find("stadiums",club->at("stadium"));
@@ -130,12 +152,13 @@ std::string App::engine_reports_detail() {
const auto &live_stadium=engine_data_.at("stadium");
if(live_stadium.value("messageType","")=="snapshot"&&live_stadium.at("data").at("teamId")==report_detail_club_) {int64_t sum=0;for(const auto &block:live_stadium.at("data").at("blocks"))sum+=block.at("places").get<int64_t>();places=number(sum);}
body="<div class=\"report-detail-badge\">"+crest(world_->find("clubs",report_detail_club_),192)+"</div><p class=\"report-detail-note\">Vereinsprofil</p>"+report_detail_fields({{"Stadion",stadium_name},{"Plätze",places},{"Stärke",strength},{"Manager",manager}},72);
actions=btn("report-club-roster","Spieler","report-detail-action","id=\"report-detail-roster\"")+close;
bool has_squad=true;if(menu_=="other")for(const auto &m:engine_other_value_.at("matches")){if(m.at("home")==report_detail_club_)has_squad=m.at("homeHasSquad");if(m.at("away")==report_detail_club_)has_squad=m.at("awayHasSquad");}
actions=btn("report-club-roster","Spieler","report-detail-action",std::string("id=\"report-detail-roster\" ")+(has_squad?"":"disabled"))+close;
} else if(report_detail_kind_=="roster") {
title+=" · Kader";body="<div class=\"report-detail-roster-scroll\" id=\"report-detail-roster-scroll\"><div class=\"report-detail-table\"><div class=\"report-detail-row report-detail-table-head\">";
for(const auto *h:{"Spieler","Pos.","Stärke","Alter"})body+="<div class=\"report-detail-cell\">"+std::string(h)+"</div>";
body+="</div>";
if(!engine_reports_roster_value_.is_object())body+="<p class=\"report-detail-empty\">"+esc(engine_busy_?"Kader wird geladen …":"Kader derzeit nicht verfügbar.")+"</p>";
if(!engine_reports_roster_value_.is_object())body+="<div class=\"report-detail-row\"><div class=\"report-detail-cell\">"+esc(engine_busy_?"Kader wird geladen …":"Kader derzeit nicht verfügbar.")+"</div><div class=\"report-detail-cell\"></div><div class=\"report-detail-cell\"></div><div class=\"report-detail-cell\"></div></div>";
else {size_t n=0;for(const auto &r:engine_reports_roster_value_.at("players")){const auto i=n++;body+="<div class=\"report-detail-row "+std::string(i%2==0?"report-detail-striped":"")+"\"><div class=\"report-detail-cell\">"+btn("player-detail",esc(engine_text(r.at("player").at("name"))),"report-detail-player-link","id=\"report-detail-player-"+std::to_string(i)+"\" data-id=\""+esc(r.at("player").at("id").get<std::string>())+"\"")+"</div><div class=\"report-detail-cell\">"+esc(report_detail_position(r.at("player")))+"</div><div class=\"report-detail-cell\">"+report_number(r.at("live_strength"))+"</div><div class=\"report-detail-cell\">"+report_number(r.at("age"))+"</div></div>";}}
body+="</div></div>";
} else {