A club's card with its parts, its place in the table and its best players
The card fetches the squad when it opens and lists the five strongest players, each leading to the player's card. Facts nobody knows about another club are left out. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
1 parent
eec7f40a52
commit
7e161ca505
3 files changed
+74
-3
No files matched your search
@@ -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);}
|
||||
@@ -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<std::string>();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);
|
||||
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="<div class=\"club-card-crest\">"+crest(club,150)+"</div><div class=\"club-card-sub\">"+esc(sub)+"</div><div class=\"club-card-shirt\">"+picture(renderer_.diagram("club-shirt-"+colour,lineup_shirt(colour,false,Json()),256),150,150)+"</div><div class=\"player-card-figures club-card-figures\">";
|
||||
for(const auto &[key,label]:std::array<std::pair<const char*,const char*>,5>{{{"strength","Stärke"},{"keeper","Tor"},{"defence","Abwehr"},{"midfield","Mittelfeld"},{"attack","Sturm"}}})
|
||||
card+="<div class=\"player-card-figure\"><strong>"+(own_strength?report_number(own_strength->at(key)):std::string("—"))+"</strong><span>"+label+"</span></div>";
|
||||
card+="</div><div class=\"club-card-column one\"><h3>Tabelle</h3>";
|
||||
if(own_table) {
|
||||
std::vector<const Json*> 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<int>()<b->at("rank").get<int>();});
|
||||
const int total=int(rows.size()),at=own_table->at("rank").get<int>()-1,first=std::clamp(at-2,0,std::max(0,total-5));
|
||||
for(int i=first;i<std::min(total,first+5);++i){const auto &r=*rows[size_t(i)];card+="<div class=\"club-card-row"+std::string(i==at?" own":"")+"\"><span class=\"rank\">"+number(r.at("rank"))+".</span><span class=\"name\">"+esc(engine_text(r.at("team").at("name")))+"</span><span class=\"num\">"+number(r.at("played"))+"</span><span class=\"num wide\">"+number(r.at("gf"))+":"+number(r.at("ga"))+"</span><span class=\"num\">"+number(r.at("points"))+"</span></div>";}
|
||||
} else card+="<p class=\"player-card-none\">Für diese Ansicht liegt keine Ligatabelle vor.</p>";
|
||||
card+="</div><div class=\"club-card-column two\"><h3>Beste Spieler</h3>";
|
||||
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<const Json*> 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<int>();++aged;}}
|
||||
const auto strength_of=[](const Json *r){return r->at("live_strength").is_number_integer()?r->at("live_strength").get<int>():-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<std::min<size_t>(5,best.size());++i){const auto &r=*best[i];card+="<div class=\"club-card-row\"><span class=\"rank\">"+esc(report_detail_position(r.at("player")))+"</span>"+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<std::string>())+"\"")+"<span class=\"num\">"+report_number(r.at("live_strength"))+"</span></div>";}
|
||||
if(best.empty())card+="<p class=\"player-card-none\">Kein Kader vorhanden.</p>";
|
||||
} else card+="<p class=\"player-card-none\">"+std::string(!has_squad?"Für diesen Verein liegt kein Kader vor.":engine_busy_?"Kader wird geladen …":"Kader derzeit nicht verfügbar.")+"</p>";
|
||||
std::string average="—";if(aged){std::ostringstream text;text<<std::fixed<<std::setprecision(1)<<ages/aged;average=text.str();std::replace(average.begin(),average.end(),'.',',');average+=" Jahre";}
|
||||
// only what is known about this club
|
||||
std::vector<std::pair<std::string,std::string>> known;
|
||||
for(const auto &field:std::vector<std::pair<std::string,std::string>>{{"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+="</div><div class=\"club-card-column three\"><h3>Verein</h3>"+report_detail_fields(known,56);
|
||||
if(own_table){card+="<div class=\"club-card-form\" style=\"top:"+std::to_string(56+int(known.size())*56)+"dp;\"><span>Letzte Spiele</span><span class=\"report-form\">";for(const char c:own_table->at("form_text").get<std::string>())card+=std::string("<span class=\"form-mark ")+(c=='S'?"won":c=='U'?"drawn":c=='N'?"lost":"none")+"\"></span>";card+="</span></div>";}
|
||||
card+="</div>";
|
||||
return "<div id=\"report-detail-layer\" class=\"report-detail-layer\"><section id=\"report-detail-dialog\" class=\"report-detail-card report-detail-club rich\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"report-detail-title\"><h2 id=\"report-detail-title\">"+esc(title)+"</h2>"+card+"<nav class=\"report-detail-actions\">"+actions+"</nav></section></div>";
|
||||
} 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>";
|
||||
|
||||
@@ -131,7 +131,11 @@ std::string report_player_card(const std::string &portrait, const std::string &c
|
||||
out += "</div></div>";
|
||||
}
|
||||
if (!any) out += "<p class=\"player-card-none\">Für diesen Spieler liegen keine Einzelwerte vor.</p>";
|
||||
out += "</div><div class=\"player-card-facts\"><h3>Vertrag und Status</h3>" + report_detail_fields(facts, 64) + "</div>";
|
||||
out += "</div><div class=\"player-card-facts\"><h3>Vertrag und Status</h3>";
|
||||
// a fact nobody knows (another club's contract) is left out
|
||||
std::vector<std::pair<std::string, std::string>> known;
|
||||
for (const auto &fact : facts) if (fact.second != "—") known.push_back(fact);
|
||||
out += report_detail_fields(known, 64) + "</div>";
|
||||
return out;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
Reference in new issue
Block a user