Bind player rankings and fair play to recorded season events (by Codex)

This commit is contained in:
Codex committed 2026-10-28 23:46:35 +01:00
1 parent 6b4aa9772d
commit 738ecc7a09
27 files changed
+436 -36

No files matched your search

+20 -5
View File
@@ -3,8 +3,10 @@ void App::engine_reports_sync() {
const auto &meta=engine_data_.at("desktop").at("meta");
if(meta==engine_reports_context_)return;
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"]="";
if(engine_reports_context_.is_null()||meta.at("careerId")!=engine_reports_context_.at("careerId")||meta.at("scope")!=engine_reports_context_.at("scope"))engine_rankings_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_rankings_read_=Json();engine_rankings_value_=Json();engine_fairplay_read_=Json();engine_fairplay_value_=Json();engine_rankings_player_=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();
}
@@ -52,6 +54,11 @@ void App::engine_other_load(const std::string &preferred,int round) {
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")=="rankings"||r.at("kind")=="fairplay") {
if(r.at("kind")=="rankings"){auto value=engine_rankings_projection(reply.bundle,r.at("index"),read,r.at("league"),r.at("scope"));engine_rankings_value_=std::move(value);engine_rankings_read_=read;engine_rankings_state_["league"]=r.at("league");engine_rankings_state_["scope"]=r.at("scope");}
else {auto value=engine_fairplay_projection(reply.bundle,r.at("index"),read);engine_fairplay_value_=std::move(value);engine_fairplay_read_=read;}
engine_reports_index_=r.at("index");engine_notice_="Statistik geladen.";return;
}
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"));
@@ -78,16 +85,21 @@ Json App::engine_reports_rows(const std::string &mode) const {
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_=="scorers"&&engine_rankings_value_.is_object()) {
if(engine_rankings_player_.is_object()&&engine_rankings_player_.at("currentTeam").is_object()&&engine_rankings_player_.at("currentTeam").at("id")==id)return engine_rankings_player_.at("currentTeam");
for(const auto &rows:engine_rankings_value_.at("categories"))for(const auto &r:rows)if(r.at("club")==id)return r.at("team_ref");
}
if(menu_=="fairplay"&&engine_fairplay_value_.is_object())for(const auto &r:engine_fairplay_value_.at("rows"))if(r.at("club")==id)return r.at("team");
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>> App::engine_reports_picker_items(const std::string &kind,const std::string &preferred) 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__";
for(const auto &l:leagues)if(l.at("id")== (preferred.empty()?engine_reports_state_.at("league"):Json(preferred)))nation=l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";
for(const auto &l:leagues) {
const auto n=l.at("nationId").is_string()?l.at("nationId").get<std::string>():"__other__";
if(kind=="country"&&seen.insert(n).second)out.emplace_back(n,n=="__other__"?"Weitere Ligen":world_->nation_name(n));
@@ -100,9 +112,9 @@ 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"&&menu_!="other")return false;
if(menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other"&&menu_!="scorers"&&menu_!="fairplay")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(action=="report-detail-close") {engine_rankings_player_=Json();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;}
@@ -117,11 +129,13 @@ bool App::engine_reports_action(const std::string &action,Rml::Element *target)
report_detail_club_=id;report_detail_player_.clear();report_detail_kind_="club";report_detail_return_focus_=target->GetId();focus_after_render_="report-detail-roster";close_report_picker(false);refresh();return true;
}
if(action=="report-club-roster") {
engine_rankings_player_=Json();
report_detail_kind_="roster";
if(engine_reports_roster_value_.is_object()&&engine_reports_roster_value_.at("team").at("id")==report_detail_club_){focus_after_render_="report-detail-player-0";refresh();return true;}
engine_reports_roster_value_=Json();auto link=engine_link_;const auto team=report_detail_club_;
engine_start("Kader wird geladen …",[link,team]{auto bundle=link->snapshot();return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","squad"},{"team",team},{"read",link->read({{"kind","squad"},{"teamId",team}})}},nullptr};});return true;
}
if(engine_rankings_action(action,target))return true;
if(action=="player-detail") {
if(engine_reports_roster_value_.is_object())for(const auto &r:engine_reports_roster_value_.at("players"))if(r.at("player").at("id")==id){report_detail_player_=id;report_detail_kind_="player";focus_after_render_="report-detail-close";refresh();break;}
return true;
@@ -129,7 +143,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"&&menu_!="other")||report_detail_kind_.empty())return false;
if((menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other"&&menu_!="scorers"&&menu_!="fairplay")||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;}
@@ -138,6 +152,7 @@ bool App::engine_reports_event(Rml::Event &event) {
}
std::string App::engine_reports_detail() {
if(report_detail_kind_.empty())return {};
if(report_detail_kind_=="player"&&engine_rankings_player_.is_object())return engine_rankings_player_detail();
const auto team=engine_report_team(report_detail_club_);if(team.is_null())return {};
const auto close=btn("report-detail-close","Zurück","report-detail-action","id=\"report-detail-close\"");
std::string title=engine_text(team.at("name")),body,actions=close;