Bind league fixtures and round navigation to live engine data (by Codex)
This commit is contained in:
1 parent
1c35698dbe
commit
545e16f153
21 files changed
+207
-31
No files matched your search
@@ -4,6 +4,7 @@ void App::engine_reports_sync() {
|
||||
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"]="";
|
||||
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();
|
||||
report_detail_kind_.clear();report_detail_club_.clear();report_detail_player_.clear();
|
||||
}
|
||||
void App::engine_reports_load(const std::string &preferred,int filter) {
|
||||
@@ -20,14 +21,31 @@ void App::engine_reports_load(const std::string &preferred,int filter) {
|
||||
return EngineReply{link,bundle,{{"messageType","reports_preview"},{"kind","league"},{"index",index},{"read",read},{"league",league},{"filter",filter}},nullptr};
|
||||
});
|
||||
}
|
||||
void App::engine_fixtures_load(const std::string &preferred,int round) {
|
||||
if(engine_busy_||!engine_fresh_)return;
|
||||
if(engine_fixtures_value_.is_object()&&engine_fixtures_value_.at("leagueId")==preferred&&engine_fixtures_value_.at("round")==round){refresh();return;}
|
||||
const int filter=engine_reports_state_.at("filter");auto link=engine_link_;
|
||||
engine_start("Ligaspiele werden geladen …",[link,preferred,round,filter] {
|
||||
const auto bundle=link->snapshot(),index=link->read({{"kind","report-index"}});const auto data=engine_report_index(bundle,index);
|
||||
const Json *league=nullptr;for(const auto &l:data.at("leagues"))if(l.at("id")==preferred)league=&l;
|
||||
if(!league)for(const auto &l:data.at("leagues"))if(l.at("own")==true){league=&l;break;}
|
||||
if(!league)league=&data.at("leagues")[0];
|
||||
const int total=league->at("matchdays");const int selected=round>0?std::clamp(round,1,total):std::min(league->at("played").get<int>()+1,total);
|
||||
const auto id=league->at("id").get<std::string>();
|
||||
const auto report=link->read({{"kind","league-report"},{"leagueId",id},{"filter",filter}}),fixtures=link->read({{"kind","league-fixtures"},{"leagueId",id},{"round",selected}});
|
||||
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_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(read.value("messageType","")=="error"){engine_notice_=engine_text(read.value("message",Json()));return;}
|
||||
if(r.at("kind")=="league") {
|
||||
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"));
|
||||
Json fixtures;if(r.at("kind")=="fixtures")fixtures=engine_fixtures_projection(reply.bundle,r.at("index"),r.at("fixtures"),r.at("league"),r.at("round"));
|
||||
engine_reports_value_=std::move(value);engine_reports_index_=r.at("index");engine_reports_read_=read;
|
||||
engine_reports_state_["league"]=r.at("league");engine_reports_state_["filter"]=r.at("filter");
|
||||
if(r.at("kind")=="fixtures"){engine_fixtures_read_=r.at("fixtures");engine_fixtures_value_=std::move(fixtures);engine_reports_state_["round"]=r.at("round").get<int>()-1;}
|
||||
} else {
|
||||
engine_reports_roster_value_=engine_report_squad(reply.bundle,read,r.at("team"));engine_reports_roster_=read;
|
||||
if(report_detail_kind_=="roster"&&report_detail_club_==r.at("team").get<std::string>())focus_after_render_=engine_reports_roster_value_.at("players").empty()?"report-detail-close":"report-detail-player-0";
|
||||
@@ -35,6 +53,7 @@ void App::engine_reports_poll(const EngineReply &reply) {
|
||||
engine_notice_="Ligabericht geladen.";
|
||||
}
|
||||
Json App::engine_reports_rows(const std::string &mode) const {
|
||||
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));
|
||||
@@ -60,10 +79,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")return false;
|
||||
if(menu_!="tables"&&menu_!="strengths"&&menu_!="league")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_=="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"};
|
||||
if(!(menu_=="tables"?table:strength).contains(id))return true;
|
||||
@@ -87,7 +107,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")||report_detail_kind_.empty())return false;
|
||||
if((menu_!="tables"&&menu_!="strengths"&&menu_!="league")||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;}
|
||||
|
||||
Reference in new issue
Block a user