diff --git a/assets/modern/report_details.rcss b/assets/modern/report_details.rcss index 2f4289b..111b13b 100644 --- a/assets/modern/report_details.rcss +++ b/assets/modern/report_details.rcss @@ -81,3 +81,29 @@ body.matchday .report-detail-striped {background-color:#f8e7e00a;} .report-detail-player .player-card-facts .report-detail-field,.report-detail-player .player-card-facts dt,.report-detail-player .player-card-facts dd {height:54dp;line-height:54dp;font-size:32dp;} .report-detail-player .player-card-facts dt {width:240dp;} .report-detail-player .player-card-facts dd {width:380dp;} +/* the club's card */ +.report-detail-club.rich {height:1030dp;} +.report-detail-club.rich h2 {left:232dp;right:260dp;top:52dp;height:76dp;line-height:76dp;text-align:left;font-size:64dp;} +.club-card-crest {position:absolute;left:52dp;top:44dp;width:150dp;height:150dp;} +.club-card-sub {position:absolute;left:232dp;right:260dp;top:136dp;height:48dp;line-height:48dp;font-size:34dp;color:var(--muted);} +.club-card-shirt {position:absolute;right:52dp;top:44dp;width:150dp;height:150dp;} +.club-card-figures {left:52dp;right:52dp;top:236dp;height:200dp;} +.club-card-figures .player-card-figure {height:200dp;} +.club-card-column {position:absolute;top:484dp;width:770dp;height:440dp;} +.club-card-column.one {left:52dp;} +.club-card-column.two {left:857dp;} +.club-card-column.three {left:1662dp;} +.club-card-column h3 {display:block;height:56dp;line-height:56dp;margin:0;font-family:Display;font-size:38dp;font-weight:bold;border-bottom:2dp var(--rule);} +.club-card-row {display:flex;align-items:center;height:56dp;border-bottom:2dp var(--rule);font-size:32dp;} +.club-card-row.own {font-weight:bold;background-color:var(--selected);} +.club-card-row span {display:block;flex-shrink:0;} +.club-card-row .rank {width:84dp;padding-left:8dp;text-align:left;color:var(--muted);} +.club-card-row .name {flex:1;flex-shrink:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;font-size:32dp;} +.club-card-row .num {width:84dp;text-align:right;padding-right:8dp;} +.club-card-row .num.wide {width:120dp;} +.club-card-column.three .report-detail-values {left:0;right:0;top:56dp;height:280dp;} +.club-card-column.three .report-detail-field,.club-card-column.three dt,.club-card-column.three dd {height:54dp;line-height:54dp;font-size:32dp;} +.club-card-column.three dt {width:230dp;} +.club-card-column.three dd {width:520dp;color:var(--text);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;} +.club-card-form {position:absolute;left:0;right:0;top:350dp;height:56dp;display:flex;align-items:center;justify-content:space-between;font-size:32dp;} +.club-card-form {border-bottom:2dp var(--rule);} diff --git a/src/modern/ui/engine_reports.inc b/src/modern/ui/engine_reports.inc index c91be13..098ab56 100644 --- a/src/modern/ui/engine_reports.inc +++ b/src/modern/ui/engine_reports.inc @@ -131,7 +131,14 @@ bool App::engine_reports_action(const std::string &action,Rml::Element *target) if(action=="report-reset") {engine_reports_state_["sorts"]["tables"]={{"key","rank"},{"desc",false}};engine_reports_load(engine_reports_state_.at("league"),0);return true;} if(action=="club-detail") { if(engine_report_team(id).is_null())return true; - 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; + 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); + // the club's card names its best players: fetch the squad along with it + bool has_squad=true;if(menu_=="other")for(const auto &m:engine_other_value_.at("matches")){if(m.at("home")==id)has_squad=m.at("homeHasSquad");if(m.at("away")==id)has_squad=m.at("awayHasSquad");} + if(has_squad&&!(engine_reports_roster_value_.is_object()&&engine_reports_roster_value_.at("team").at("id")==id)) { + engine_reports_roster_value_=Json();auto link=engine_link_;const std::string team=id; + 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};}); + } else refresh(); + return true; } if(action=="report-club-roster") { engine_rankings_player_=Json(); @@ -185,7 +192,41 @@ std::string App::engine_reports_detail() { if(live_stadium.value("messageType","")=="snapshot"&&live_stadium.at("data").at("teamId")==report_detail_club_) {if(live_stadium.at("data").value("name",Json()).is_string())stadium_name=live_stadium.at("data").at("name").get();int64_t sum=0;for(const auto &block:live_stadium.at("data").at("blocks"))sum+=block.at("places").get();places=number(sum);} body="
"+crest(world_->find("clubs",report_detail_club_),192)+"

Vereinsprofil

"+report_detail_fields({{"Stadion",stadium_name},{"Plätze",places},{"Stärke",strength},{"Manager",manager}},72); 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; + actions=btn("report-club-roster","Kader","report-detail-action",std::string("id=\"report-detail-roster\" ")+(has_squad?"":"disabled"))+close; + // the club at a glance: its parts as numerals, its place in the table, its best players + const Json *own_table=nullptr,*own_strength=nullptr; + if(engine_reports_value_.is_object()){for(const auto &r:engine_reports_value_.at("table"))if(r.at("club")==report_detail_club_)own_table=&r;for(const auto &r:engine_reports_value_.at("strengths"))if(r.at("club")==report_detail_club_)own_strength=&r;} + std::string colour;if(club&&!club->value("crest","").empty())colour=renderer_.crest_colour(club->value("crest",""));if(colour.empty())colour="#3d5a73"; + std::string sub; + if(own_table){sub=engine_text(engine_reports_value_.at("league").at("name"))+" · Platz "+number(own_table->at("rank"))+" · "+number(own_table->at("points"))+" Punkte";} + std::string card="
"+crest(club,150)+"
"+esc(sub)+"
"+picture(renderer_.diagram("club-shirt-"+colour,lineup_shirt(colour,false,Json()),256),150,150)+"
"; + for(const auto &[key,label]:std::array,5>{{{"strength","Stärke"},{"keeper","Tor"},{"defence","Abwehr"},{"midfield","Mittelfeld"},{"attack","Sturm"}}}) + card+="
"+(own_strength?report_number(own_strength->at(key)):std::string("—"))+""+label+"
"; + card+="

Tabelle

"; + if(own_table) { + std::vector rows;for(const auto &r:engine_reports_value_.at("table"))rows.push_back(&r); + std::sort(rows.begin(),rows.end(),[](const Json *a,const Json *b){return a->at("rank").get()at("rank").get();}); + const int total=int(rows.size()),at=own_table->at("rank").get()-1,first=std::clamp(at-2,0,std::max(0,total-5)); + for(int i=first;i"+number(r.at("rank"))+"."+esc(engine_text(r.at("team").at("name")))+""+number(r.at("played"))+""+number(r.at("gf"))+":"+number(r.at("ga"))+""+number(r.at("points"))+"
";} + } else card+="

Für diese Ansicht liegt keine Ligatabelle vor.

"; + card+="

Beste Spieler

"; + const bool squad_loaded=engine_reports_roster_value_.is_object()&&engine_reports_roster_value_.at("team").at("id")==report_detail_club_; + int members=0;double ages=0;int aged=0; + if(squad_loaded) { + std::vector best;for(const auto &r:engine_reports_roster_value_.at("players")){best.push_back(&r);++members;if(r.at("age").is_number_integer()){ages+=r.at("age").get();++aged;}} + const auto strength_of=[](const Json *r){return r->at("live_strength").is_number_integer()?r->at("live_strength").get():-1;}; + std::stable_sort(best.begin(),best.end(),[&](const Json *a,const Json *b){return strength_of(a)>strength_of(b);}); + for(size_t i=0;i(5,best.size());++i){const auto &r=*best[i];card+="
"+esc(report_detail_position(r.at("player")))+""+btn("player-detail",esc(engine_text(r.at("player").at("name"))),"report-detail-player-link name","id=\"report-club-player-"+std::to_string(i)+"\" data-id=\""+esc(r.at("player").at("id").get())+"\"")+""+report_number(r.at("live_strength"))+"
";} + if(best.empty())card+="

Kein Kader vorhanden.

"; + } else card+="

"+std::string(!has_squad?"Für diesen Verein liegt kein Kader vor.":engine_busy_?"Kader wird geladen …":"Kader derzeit nicht verfügbar.")+"

"; + std::string average="—";if(aged){std::ostringstream text;text<> known; + for(const auto &field:std::vector>{{"Manager",manager},{"Stadion",stadium_name},{"Plätze",places},{"Kader",squad_loaded?std::to_string(members)+" Spieler":std::string("—")},{"Altersschnitt",average}})if(field.second!="—")known.push_back(field); + card+="

Verein

"+report_detail_fields(known,56); + if(own_table){card+="
Letzte Spiele";for(const char c:own_table->at("form_text").get())card+=std::string("";card+="
";} + card+="
"; + return "

"+esc(title)+"

"+card+"
"; } else if(report_detail_kind_=="roster") { title+=" · Kader";body="
"; for(const auto *h:{"Spieler","Pos.","Stärke","Alter"})body+="
"+std::string(h)+"
"; diff --git a/src/modern/ui/report_details.inc b/src/modern/ui/report_details.inc index 9fa3016..bacf6ee 100644 --- a/src/modern/ui/report_details.inc +++ b/src/modern/ui/report_details.inc @@ -131,7 +131,11 @@ std::string report_player_card(const std::string &portrait, const std::string &c out += "
"; } if (!any) out += "

Für diesen Spieler liegen keine Einzelwerte vor.

"; - out += "

Vertrag und Status

" + report_detail_fields(facts, 64) + "
"; + out += "

Vertrag und Status

"; + // a fact nobody knows (another club's contract) is left out + std::vector> known; + for (const auto &fact : facts) if (fact.second != "—") known.push_back(fact); + out += report_detail_fields(known, 64) + "
"; return out; } } // namespace