Connect native indoor standings to real season points and extend CI coverage (by Codex)

This commit is contained in:
Codex committed 2026-10-29 16:27:59 +01:00
1 parent d30e83c0a5
commit 0842cb3458
19 files changed
+296 -20

No files matched your search

+15 -3
View File
@@ -87,6 +87,7 @@ 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_=="indoor"&&engine_indoor_value_.is_object())for(const auto &row:engine_indoor_value_.at("rows"))if(row.at("club")==id)return row.at("team");
if(menu_=="statistics"&&engine_statistics_value_.is_object())for(const auto &row:engine_statistics_value_.at("rows"))for(const auto &cell:row.at("cells"))if(cell.value("club","")==id)return {{"id",id},{"name",cell.at("text")}};
if(menu_=="scorers"&&engine_rankings_value_.is_object()) {
@@ -116,7 +117,7 @@ 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"&&menu_!="scorers"&&menu_!="fairplay"&&menu_!="statistics")return false;
if(menu_!="indoor"&&menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other"&&menu_!="scorers"&&menu_!="fairplay"&&menu_!="statistics")return false;
const auto id=target?target->GetAttribute<Rml::String>("data-id",""):std::string();
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";
@@ -124,7 +125,7 @@ bool App::engine_reports_action(const std::string &action,Rml::Element *target)
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;
if(menu_=="indoor" ? (id!="rank"&&id!="points") : !(menu_=="tables"?table:strength).contains(id))return true;
auto &sort=engine_reports_state_["sorts"][menu_];const bool desc=sort.at("key")==id?!sort.at("desc").get<bool>():id!="rank"&&id!="club";sort={{"key",id},{"desc",desc}};focus_after_render_=target->GetId();refresh();return true;
}
if(action=="report-reset") {engine_reports_state_["sorts"]["tables"]={{"key","rank"},{"desc",false}};engine_reports_load(engine_reports_state_.at("league"),0);return true;}
@@ -148,7 +149,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"&&menu_!="scorers"&&menu_!="fairplay"&&menu_!="statistics")||report_detail_kind_.empty())return false;
if((menu_!="indoor"&&menu_!="tables"&&menu_!="strengths"&&menu_!="league"&&menu_!="other"&&menu_!="scorers"&&menu_!="fairplay"&&menu_!="statistics")||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;}
@@ -157,6 +158,17 @@ bool App::engine_reports_event(Rml::Event &event) {
}
std::string App::engine_reports_detail() {
if(report_detail_kind_.empty())return {};
if(report_detail_kind_=="indoor-info"&&engine_indoor_value_.is_object()) {
const auto &scoring=engine_indoor_value_.at("scoring");
const auto footer=engine_indoor_value_.at("footer").get<std::string>();
std::string body="<div class=\"indoor-value-info\"><p>"+esc(footer.empty()?"Noch kein Hallenturnier gewertet.":footer)+"</p>";
if(scoring.is_object()) {
body+="<p>Wertung des aktuellen Turniers: "+number(scoring.at("value"))+" Punkte</p>";
for(const auto &place:scoring.at("places"))body+="<div><span>"+number(place.at("rank"))+". Platz</span><strong>"+number(place.at("points"))+" Punkte</strong></div>";
}
body+="</div>";
return "<div class=\"report-detail-layer\"><section id=\"report-detail-dialog\" class=\"report-detail-card report-detail-indoor-info\" style=\"height:"+std::string(scoring.is_object()?"780":"332")+"dp;\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"report-detail-title\"><h2 id=\"report-detail-title\">Hallenwertung</h2>"+body+"<nav class=\"report-detail-actions\">"+btn("report-detail-close","Zurück","report-detail-action","id=\"report-detail-close\"")+"</nav></section></div>";
}
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\"");