Achievements and high score as pages: the seasons as bars side by side, the career as a table on a note
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
1 parent
0089c2378c
commit
98fb61dddf
4 files changed
+83
-142
No files matched your search
@@ -1,84 +1,2 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-only */
|
||||
.career-achievements,.career-highscore {position:absolute;left:0;top:0;width:2612dp;height:1864dp;color:var(--text);}
|
||||
.career-achievements-heading {position:absolute;left:0;top:0;width:2612dp;height:118dp;display:flex;align-items:center;justify-content:space-between;}
|
||||
.career-heading-copy {height:86dp;}
|
||||
.career-heading-copy h2 {height:44dp;line-height:44dp;margin:0;font-size:38dp;font-weight:normal;}
|
||||
.career-heading-copy p {height:30dp;line-height:30dp;margin:12dp 0 0;font-size:28dp;color:var(--muted);}
|
||||
.career-range {display:block;height:39dp;line-height:39dp;white-space:nowrap;font-size:34dp;color:#abc5d6;}
|
||||
.career-chart {position:absolute;border:2dp #c5d9e726;border-radius:18dp;background-color:#12243140;}
|
||||
.career-chart>header {position:absolute;left:30dp;top:24dp;width:2548dp;height:54dp;display:flex;align-items:center;justify-content:space-between;}
|
||||
.career-chart h2 {margin:0;font-size:33dp;font-weight:normal;white-space:nowrap;color:#dbe7ef;}
|
||||
.career-chart-summary {display:flex;align-items:baseline;justify-content:flex-end;}
|
||||
.career-chart-summary>span {display:block;white-space:nowrap;}
|
||||
.career-chart-year {font-size:28dp;color:#92adc0;}
|
||||
.career-chart-result {font-size:30dp;margin-left:20dp;color:#c4dce9;}
|
||||
.career-chart-art {position:absolute;left:30dp;top:78dp;width:2548dp;height:403.333333dp;pointer-events:none;}
|
||||
.career-report-actions {position:absolute;left:0;top:1770dp;width:2612dp;height:94dp;display:flex;}
|
||||
.career-report-actions .career-action {width:854.666667dp;height:94dp;margin-right:24dp;padding:12dp 24dp;font-size:30dp;flex-shrink:0;}
|
||||
.career-report-actions .career-action:last-child {margin-right:0;}
|
||||
.career-action {border:2dp #d4e0ec29;border-radius:12dp;background-color:transparent;decorator:linear-gradient(180deg,#c1d1e31c,#869eb312);color:#e0e6ec;font-weight:normal;}
|
||||
.career-action .control-label {display:block;width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
|
||||
.career-action:hover {decorator:none;background-color:var(--hover);}
|
||||
.career-action:focus-visible {border-color:var(--accent);}
|
||||
.career-report-empty {margin:0;padding:40dp;font-size:30dp;color:var(--muted);}
|
||||
.career-achievements>.career-report-empty {position:absolute;left:0;top:150dp;}
|
||||
.career-history-layer {position:absolute;left:0;top:0;width:2612dp;height:1864dp;z-index:20;background-color:#08101980;}
|
||||
.career-history-dialog {position:absolute;left:64dp;top:314dp;width:2484dp;height:1236dp;border:2dp #e1ecf429;border-radius:22dp;background-color:#283542f5;color:#d7e5cf;}
|
||||
.career-history-dialog h2 {position:absolute;left:52dp;top:40dp;width:2376dp;height:48dp;line-height:48dp;margin:0;font-size:42dp;font-weight:bold;letter-spacing:-0.4dp;text-align:center;color:#e3ecf3;}
|
||||
.career-history-club {position:absolute;left:52dp;top:123dp;width:2376dp;height:45dp;display:flex;align-items:center;justify-content:space-between;font-size:30dp;}
|
||||
.career-history-club>.report-club-button {max-width:1120dp;padding:0;font-size:30dp;}
|
||||
.career-history-club>.report-club-button .report-club-name {width:1058dp;}
|
||||
.career-history-club>span {display:block;white-space:nowrap;font-size:28dp;color:#98b2c5;}
|
||||
.career-history-table {position:absolute;left:52dp;top:198dp;width:2376dp;height:884dp;overflow-x:hidden;overflow-y:auto;}
|
||||
.career-history-row {display:flex;width:2376dp;height:68dp;align-items:center;font-size:30dp;}
|
||||
.career-history-row.striped {background-color:#38706b19;}
|
||||
.career-history-head {font-size:28dp;color:#9fb8ca;border-bottom:4dp #4e8b7b;}
|
||||
.career-cell {display:flex;align-items:center;justify-content:center;min-width:0;flex-shrink:0;overflow:hidden;}
|
||||
.career-cell>span {display:block;width:100%;max-width:100%;min-width:0;text-align:center;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
|
||||
.history-season {width:380.16dp;height:68dp;padding:6dp 16dp;}
|
||||
.history-result {width:665.28dp;height:68dp;padding:6dp 16dp;}
|
||||
.history-heading-season>span {text-align:left;}
|
||||
.career-title {color:#a9dccb;}
|
||||
.career-history-actions {position:absolute;left:52dp;top:1127dp;width:2376dp;height:65dp;display:flex;}
|
||||
.career-history-actions .career-action {width:2376dp;height:65dp;padding:12dp 24dp;font-size:32dp;}
|
||||
.career-highscore-art {position:absolute;left:636dp;top:10dp;width:1180dp;height:393.333333dp;pointer-events:none;}
|
||||
.career-highscore-table {position:absolute;left:0;top:440dp;width:2612dp;height:1424dp;border:2dp #c5d9e720;border-radius:18dp;background-color:#13263526;overflow-x:hidden;overflow-y:auto;}
|
||||
.career-highscore-row {display:flex;width:2608dp;height:118dp;align-items:center;font-size:32dp;color:#d4e0e9;}
|
||||
.career-highscore-head {font-size:28dp;color:#a8bdcc;border-bottom:2dp #c5d9e72b;}
|
||||
.career-highscore-row.striped {background-color:#e3edf605;}
|
||||
.career-highscore-row>.career-cell {height:118dp;padding:14dp 24dp;}
|
||||
.highscore-col-0 {width:560dp;justify-content:flex-start;}
|
||||
.highscore-col-0>span {text-align:left;}
|
||||
.highscore-col-1 {width:680dp;justify-content:flex-start;}
|
||||
.highscore-col-2 {width:350dp;color:#c7ded7;}
|
||||
.highscore-col-3,.highscore-col-4,.highscore-col-5 {width:339.333333dp;}
|
||||
.career-highscore .report-club-button {width:100%;max-width:100%;padding:0;font-size:32dp;color:#d4e0e9;}
|
||||
.career-highscore .report-club-name {width:570dp;max-width:100%;}
|
||||
body.silver .career-range,body.matchday .career-range,body.silver .career-chart h2,body.matchday .career-chart h2,body.silver .career-chart-result,body.matchday .career-chart-result {color:var(--text);}
|
||||
body.silver .career-chart-year,body.matchday .career-chart-year,body.silver .career-history-club>span,body.matchday .career-history-club>span {color:var(--muted);}
|
||||
body.silver .career-chart,body.matchday .career-chart {border-color:var(--border);background-color:var(--panel);}
|
||||
body.silver .career-action,body.matchday .career-action {border-color:var(--border);color:var(--text);}
|
||||
body.silver .career-action {decorator:linear-gradient(180deg,#ffffffd8,#e9e1cf99);}
|
||||
body.matchday .career-action {decorator:linear-gradient(180deg,#e8d6dc12,#a1a0aa0d);}
|
||||
body.silver .career-history-dialog {border-color:var(--border);background-color:#f7f3e9fc;color:var(--text);}
|
||||
body.matchday .career-history-dialog {border-color:var(--border);background-color:#2c2c32fc;color:var(--text);}
|
||||
body.silver .career-history-dialog h2,body.matchday .career-history-dialog h2 {color:var(--text);}
|
||||
body.silver .career-history-head,body.matchday .career-history-head {color:var(--muted);border-color:var(--border);}
|
||||
body.silver .career-history-row.striped {background-color:#6b552a0c;}
|
||||
body.matchday .career-history-row.striped {background-color:#f8e7e00a;}
|
||||
body.silver .career-title,body.matchday .career-title {color:var(--accent);}
|
||||
body.silver .career-highscore-table,body.matchday .career-highscore-table {border-color:var(--border);background-color:var(--soft);}
|
||||
body.silver .career-highscore-row,body.matchday .career-highscore-row,body.silver .career-highscore .report-club-button,body.matchday .career-highscore .report-club-button {color:var(--text);}
|
||||
body.silver .career-highscore-head,body.matchday .career-highscore-head {color:var(--muted);border-color:var(--border);}
|
||||
body.silver .highscore-col-2,body.matchday .highscore-col-2 {color:var(--accent);}
|
||||
body.silver .career-highscore-row.striped {background-color:#6b552a0c;}
|
||||
body.matchday .career-highscore-row.striped {background-color:#f8e7e00a;}
|
||||
/* Gold uses plain club labels: retain profile behaviour without centring or accenting names. */
|
||||
.highscore-col-1>span {text-align:left;}
|
||||
.career-highscore .report-club-name,.career-history-club .report-club-name {text-align:left;}
|
||||
.career-highscore .report-club-button.current,.career-highscore .report-club-name {color:#d4e0e9;}
|
||||
.career-history-club .report-club-button.current,.career-history-club .report-club-name {color:#bed3e1;}
|
||||
body.silver .career-highscore .report-club-button.current,body.matchday .career-highscore .report-club-button.current,
|
||||
body.silver .career-highscore .report-club-name,body.matchday .career-highscore .report-club-name,
|
||||
body.silver .career-history-club .report-club-button.current,body.matchday .career-history-club .report-club-button.current,
|
||||
body.silver .career-history-club .report-club-name,body.matchday .career-history-club .report-club-name {color:var(--text);}
|
||||
/* Achievements and high score are pages of the notebook; their styles are in pages.rcss. */
|
||||
@@ -222,3 +222,21 @@ body .pg-btn.pg-go:hover {decorator:none;background-color:var(--p-a6);border-col
|
||||
.balance-loss {color:var(--p-a7);}
|
||||
.balance-sim-control input {display:block;width:100%;height:54dp;margin-top:9dp;}
|
||||
.balance-sim-graph {display:flex;flex:1;align-items:center;justify-content:center;min-height:0;}
|
||||
|
||||
/* --- achievements: the seasons as bars --- */
|
||||
.career-plot {display:block;position:relative;flex:none;margin-top:36dp;}
|
||||
.career-band {position:absolute;left:0;right:0;border-top:2dp var(--p-n5);padding:8dp 0 0 9dp;}
|
||||
.career-band.tint {background-color:var(--p-s1);}
|
||||
.career-band.line {border-top:2dp var(--p-n4);}
|
||||
.career-bars {position:absolute;left:0;right:0;top:0;display:flex;align-items:flex-end;gap:18dp;padding:0 9dp 0 280dp;}
|
||||
.career-bar {display:flex;flex:1;flex-direction:column;align-items:center;justify-content:flex-end;position:relative;}
|
||||
.career-bar strong {display:block;margin-bottom:5dp;font-size:25dp;line-height:32dp;white-space:nowrap;}
|
||||
.career-bar div {width:70%;border-radius:18dp 18dp 0 0;background-color:var(--p-a6);}
|
||||
.career-bar div.running {background-color:var(--p-a3);border:5dp var(--p-a5);border-bottom-width:0dp;}
|
||||
.career-bar small {display:block;position:absolute;left:-20dp;right:-20dp;bottom:-48dp;text-align:center;font-size:22dp;line-height:30dp;color:var(--p-n7);white-space:nowrap;}
|
||||
.career-bar {max-width:220dp;}
|
||||
.pg-dlg .pg-t {flex:none;}
|
||||
.pg-dlg .pg-tbody {flex:none;max-height:1170dp;}
|
||||
.pg-root .pg-btn,.pg-ov .pg-btn {font-family:Display;font-size:31dp;}
|
||||
.pg-root .pg-tabs button,.pg-ov .pg-tabs button {font-family:Display;font-size:34dp;}
|
||||
.pg-root .pg-btn.round {font-size:44dp;}
|
||||
@@ -7,40 +7,10 @@ int career_page(Json &view,int maximum=4) {
|
||||
if(view.at("dialog")!=""&&view.at("dialog")!="history")view["dialog"]="";
|
||||
return view.at("page").get<int>();
|
||||
}
|
||||
std::string career_svg(const Json &chart,const std::string &theme) {
|
||||
const int kind=chart.at("kind").get<int>();
|
||||
constexpr std::array<const char *,4> bar_tiers{"#8ac9b0","#8bb6dd","#d8b879","#b19ad1"};
|
||||
const std::array<const char *,4> text_tiers=theme=="silver"
|
||||
?std::array<const char *,4>{"#34715a","#356c9e","#846416","#775b91"}
|
||||
:std::array<const char *,4>{"#8ac9b0","#8bb6dd","#d8b879","#b19ad1"};
|
||||
const std::string text=theme=="silver"?"#233443":theme=="matchday"?"#efeded":"#c8dce9";
|
||||
const std::string muted=theme=="silver"?"#526779":theme=="matchday"?"#b7b4b9":"#91aabd";
|
||||
const std::string grid=theme=="silver"?"#6c879c28":theme=="matchday"?"#ead9da16":"#a4bdcf29";
|
||||
// Gold permits SVG text above its viewBox. Symmetric padding preserves the
|
||||
// original meet-transform while retaining those captions in the raster.
|
||||
std::string svg="<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 -32 2240 346\">";
|
||||
if(!kind) {
|
||||
constexpr std::array<const char*,4> names{"Bundesliga","2. Bundesliga","3. Bundesliga","Regionalliga"};
|
||||
for(int i=0;i<4;++i)svg+="<rect x=\"70\" y=\""+std::to_string(i*49+12)+"\" width=\"2110\" height=\"49\" fill=\""+bar_tiers[size_t(i)]+"\" opacity=\".12\"/><text x=\"2135\" y=\""+std::to_string(i*49+43)+"\" text-anchor=\"end\" font-family=\"Arial,sans-serif\" font-size=\"25\" fill=\""+text_tiers[size_t(i)]+"\">"+(chart.contains("bands")?chart.at("bands")[size_t(i)].get<std::string>():std::string(names[size_t(i)]))+"</text>";
|
||||
} else svg+="<path d=\"M70 126H2180M70 218H2180\" fill=\"none\" stroke=\""+grid+"\" stroke-width=\"2\"/>";
|
||||
size_t i=0;
|
||||
for(const auto &row:chart.at("seasons")) {
|
||||
if(!row.at("value").is_number_integer()||(!kind&&!row.at("tier").is_number_integer())) {const int x=171+int(i++)*232;svg+="<text x=\""+std::to_string(x)+"\" y=\"207\" text-anchor=\"middle\" font-family=\"Arial,sans-serif\" font-size=\"26\" fill=\""+text+"\">—</text><text x=\""+std::to_string(x)+"\" y=\"267\" text-anchor=\"middle\" font-family=\"Arial,sans-serif\" font-size=\"28\" fill=\""+muted+"\">"+esc(row.at("season").get<std::string>())+"</text>";continue;}
|
||||
const int value=row.at("value").get<int>(),tier=!kind?row.at("tier").get<int>():1;
|
||||
const double height=!kind?std::max(8.0,218-((tier-1)*49+18+(value-1)/(row.contains("max_position")?std::max(1.,row.at("max_position").get<double>()-1):19.0)*29))
|
||||
:value?22+(6-std::log2(double(value)))*27:3;
|
||||
const int x=124+int(i)*232;
|
||||
const std::string fill=!kind?bar_tiers[size_t(tier-1)]:kind==1?"#8cacc9":"#c5b384";
|
||||
svg+="<g><title>"+esc(row.at("season").get<std::string>()+": "+(!kind?row.at("tier_name").get<std::string>()+" · ":"")+row.at("label").get<std::string>())+"</title><rect x=\""+std::to_string(x)+"\" y=\""+scalar(218-height)+"\" width=\"94\" height=\""+scalar(height)+"\" rx=\"8\" fill=\""+fill+"\"/><text x=\""+std::to_string(x+47)+"\" y=\""+scalar(207-height)+"\" text-anchor=\"middle\" font-family=\"Arial,sans-serif\" font-size=\"26\" fill=\""+text+"\">"+esc(row.at("caption").get<std::string>())+"</text><text x=\""+std::to_string(x+47)+"\" y=\"267\" text-anchor=\"middle\" font-family=\"Arial,sans-serif\" font-size=\"28\" fill=\""+muted+"\">"+esc(row.at("season").get<std::string>())+"</text></g>";
|
||||
++i;
|
||||
}
|
||||
return svg+"</svg>";
|
||||
}
|
||||
std::string career_cell(const std::string &text,const std::string &css) {
|
||||
return "<div class=\"career-cell "+css+"\"><span>"+esc(text)+"</span></div>";
|
||||
}
|
||||
} // namespace
|
||||
|
||||
// The seasons of a career as three bar charts side by side: league, cup, Europe. A bar's
|
||||
// height is the season's result; the running season is drawn lighter.
|
||||
std::string App::render_achievements() {
|
||||
const int page=career_page(career_view_,career_max_page());
|
||||
const auto data=achievements_data(page);
|
||||
@@ -49,28 +19,64 @@ std::string App::render_achievements() {
|
||||
if(career_view_.at("dialog")=="history"&&career_view_.at("bound_club")!=club) {
|
||||
career_view_["dialog"]="";career_view_["return_focus"]="";career_view_["bound_club"]="";
|
||||
}
|
||||
std::string out="<div class=\"career-achievements\" id=\"career-report-underlay\"><header class=\"career-achievements-heading\"><div class=\"career-heading-copy\"><h2>Saisonbilanz</h2><p>Meisterschaft, DFB-Pokal und Europapokal im Saisonvergleich</p></div><span class=\"career-range\">"+(ready?esc(data.at("range").get<std::string>()):"—")+"</span></header>";
|
||||
std::string out="<div class=\"pg-page\" id=\"career-report-underlay\"><header class=\"pg-heading\"><h2 class=\"pg-h large\">Saisonbilanz</h2><span class=\"pg-mut career-range\">"+(ready?esc(data.at("range").get<std::string>()):"—")+"</span></header>";
|
||||
if(ready) {
|
||||
const double plot=1090, strip=54; // the height bars may take, and the line of season names under them
|
||||
// over a bar only the result, without the name of its competition
|
||||
const auto short_label=[](const std::string &text) { const auto at=text.find(": "); return at==std::string::npos?text:text.substr(at+2); };
|
||||
out+="<div class=\"pg-body\">";
|
||||
for(const auto &chart:data.at("charts")) {
|
||||
const int kind=chart.at("kind").get<int>();const auto &last=chart.at("latest");
|
||||
const auto summary=(kind==0?last.at("tier_name").get<std::string>()+" · ":std::string())+last.at("label").get<std::string>()+(engine_mode_&&last.at("completed")==false?" · Zwischenstand":"");
|
||||
const auto svg=career_svg(chart,theme_);
|
||||
out+="<section class=\"career-chart\" style=\""+rect(0,150+kind*(531.333333333),2612,509.333333333)+"\"><header><h2>"+esc(chart.at("title").get<std::string>())+"</h2><div class=\"career-chart-summary\"><span class=\"career-chart-year\">"+esc(last.at("season").get<std::string>())+"</span><span class=\"career-chart-result\">"+esc(summary)+"</span></div></header><div class=\"career-chart-art\" aria-label=\""+esc(std::string(engine_mode_?"Erfasste ":"Fiktive ")+chart.at("title").get<std::string>()+"-Ergebnisse")+"\">"+picture(renderer_.diagram("career-chart-"+std::to_string(kind),svg,4480),2548,403.333333333)+"</div></section>";
|
||||
const auto summary=(kind==0?last.at("tier_name").get<std::string>()+" · ":std::string())+last.at("label").get<std::string>();
|
||||
out+="<section class=\"pg-panel pg-col pg-grow career-chart\" style=\""+pg_css("gap:6px;")+"\"><div><h2 class=\"pg-h\" style=\"font-size:"+pg(20)+";\">"+esc(chart.at("title").get<std::string>())+"</h2><span class=\"pg-mut\" style=\"display:block;\">"+
|
||||
esc(last.at("season").get<std::string>())+": <strong>"+esc(summary)+"</strong>"+(engine_mode_&&last.at("completed")==false?" · Zwischenstand":"")+"</span></div><div class=\"career-plot\" style=\"height:"+scalar(plot+strip)+"dp;\" aria-label=\""+
|
||||
esc(std::string(engine_mode_?"Erfasste ":"Fiktive ")+chart.at("title").get<std::string>()+"-Ergebnisse")+"\">";
|
||||
// what a height means: the four divisions, or the rounds of a cup
|
||||
if(!kind) {
|
||||
constexpr std::array<const char*,4> names{"Bundesliga","2. Bundesliga","3. Bundesliga","Regionalliga"};
|
||||
for(int i=0;i<4;++i)
|
||||
out+="<div class=\"career-band "+std::string(i%2?"tint":"")+"\" style=\"top:"+scalar(i*plot/4)+"dp;height:"+scalar(plot/4)+"dp;\">"+pg_kicker(chart.contains("bands")?chart.at("bands")[size_t(i)].get<std::string>():std::string(names[size_t(i)]))+"</div>";
|
||||
} else
|
||||
for(const auto &[teams,label]:std::array<std::pair<int,const char*>,4>{{{1,"Sieger"},{4,"Halbfinale"},{16,"Achtelfinale"},{64,"1. Runde"}}})
|
||||
out+="<div class=\"career-band line\" style=\"top:"+scalar(plot-(22+(6-std::log2(double(teams)))*27)/184.0*(plot-60))+"dp;height:40dp;\">"+pg_kicker(label)+"</div>";
|
||||
out+="<div class=\"career-bars\" style=\"height:"+scalar(plot)+"dp;\">";
|
||||
for(const auto &row:chart.at("seasons")) {
|
||||
const bool played=row.at("value").is_number_integer()&&(kind||row.at("tier").is_number_integer());
|
||||
double share=0;
|
||||
if(played) {
|
||||
const int value=row.at("value").get<int>();
|
||||
if(!kind) {
|
||||
const double most=row.contains("max_position")?std::max(2.0,row.at("max_position").get<double>()):20.0;
|
||||
share=((4-row.at("tier").get<int>())+(1-(value-1)/(most-1))*.86+.07)/4;
|
||||
} else share=value?(22+(6-std::log2(double(value)))*27)/184.0:.01;
|
||||
}
|
||||
out+="<div class=\"career-bar\" title=\""+esc(row.at("season").get<std::string>()+": "+(played?(!kind?row.at("tier_name").get<std::string>()+" · ":std::string())+row.at("label").get<std::string>():std::string("—")))+"\"><strong>"+
|
||||
esc(played?short_label(row.at("label").get<std::string>()):std::string("—"))+"</strong><div class=\""+std::string(row.value("completed",true)?"":"running")+"\" style=\"height:"+scalar(std::max(6.0,share*(plot-60)))+"dp;\"></div><small>"+
|
||||
esc(row.at("season").get<std::string>())+"</small></div>";
|
||||
}
|
||||
out+="</div></div></section>";
|
||||
}
|
||||
} else out+="<p class=\"career-report-empty\">"+std::string(engine_mode_?"Noch keine Saisonergebnisse erfasst.":"Für den aktuellen Verein ist keine Saisonvorschau verfügbar.")+"</p>";
|
||||
out+="<nav class=\"career-report-actions\">"+btn("career-report-page","‹ Ältere Saisons","career-action","id=\"career-page-older\" data-id=\"older\" "+std::string(!ready||page==career_max_page()?"disabled=\"disabled\"":""))+btn("career-history",engine_mode_?"Karriereverlauf":"Vereinsgeschichte","career-action","id=\"career-history\" "+std::string(!ready?"disabled=\"disabled\"":""))+btn("career-report-page","Neuere Saisons ›","career-action","id=\"career-page-newer\" data-id=\"newer\" "+std::string(!ready||page==0?"disabled=\"disabled\"":""))+"</nav></div>";
|
||||
if(ready&&career_view_.at("dialog")=="history") {
|
||||
out+="<div class=\"career-history-layer\" id=\"career-history-layer\"><section class=\"career-history-dialog\" id=\"career-history-dialog\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"career-history-title\"><h2 id=\"career-history-title\">"+std::string(engine_mode_?"Karriereverlauf":"Vereinsgeschichte")+"</h2><div class=\"career-history-club\">"+(engine_mode_?std::string():report_club_button(club))+"<span>"+(engine_mode_?esc(data.at("history_caption").get<std::string>()):"Zwölf abgeschlossene Saisons · fiktive Ergebnisse")+"</span></div><div class=\"career-history-table\" id=\"career-history-scroll\" role=\"table\"><div class=\"career-history-row career-history-head\">";
|
||||
const std::array<const char*,4> heads{"Saison","Meisterschaft","DFB-Pokal","Europapokal"};
|
||||
for(int i=0;i<4;++i)out+=career_cell(heads[size_t(i)],i?"history-result":"history-season history-heading-season");
|
||||
out+="</div>";
|
||||
size_t i=0;
|
||||
} else out+="<div class=\"pg-empty\">"+std::string(engine_mode_?"Noch keine Saisonergebnisse erfasst.":"Für den aktuellen Verein ist keine Saisonvorschau verfügbar.")+"</div>";
|
||||
out+="<nav class=\"pg-foot\">"+pg_button("career-report-page","‹ Ältere Saisons","","id=\"career-page-older\" data-id=\"older\" "+std::string(!ready||page==career_max_page()?"disabled=\"disabled\"":""))+
|
||||
pg_button("career-history",engine_mode_?"Karriereverlauf":"Vereinsgeschichte","","id=\"career-history\" "+std::string(!ready?"disabled=\"disabled\"":""))+
|
||||
pg_button("career-report-page","Neuere Saisons ›","","id=\"career-page-newer\" data-id=\"newer\" "+std::string(!ready||page==0?"disabled=\"disabled\"":""))+"</nav></div>";
|
||||
if(ready&&career_view_.at("dialog")=="history") {
|
||||
std::string body="<div class=\"pg-row pg-mut\">"+(engine_mode_?std::string():pg_club(club))+"<span>"+(engine_mode_?esc(data.at("history_caption").get<std::string>()):"Zwölf abgeschlossene Saisons · fiktive Ergebnisse")+
|
||||
"</span></div><div class=\"pg-panel pg-col\" style=\""+pg_css("gap:0px;padding:6px 12px;max-height:520px;")+"\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\">"+pg_th("Saison",120)+pg_th("Meisterschaft",0)+pg_th("DFB-Pokal",150)+pg_th("Europapokal",150)+
|
||||
"</div><div class=\"pg-tbody\" id=\"career-history-scroll\">";
|
||||
for(const auto &row:data.at("history")) {
|
||||
out+="<div class=\"career-history-row "+std::string(i%2==0?"striped":"")+"\">"+career_cell(row.at("season").get<std::string>(),"history-season");
|
||||
for(const auto &result:row.at("results"))out+=career_cell(result.at("label").get<std::string>(),std::string("history-result ")+(result.at("winner").get<bool>()?"career-title":""));
|
||||
out+="</div>";++i;
|
||||
body+="<div class=\"pg-tr\">"+pg_td(esc(row.at("season").get<std::string>()),120);
|
||||
size_t column=0;
|
||||
for(const auto &result:row.at("results")) {
|
||||
const auto text=esc(result.at("label").get<std::string>());
|
||||
body+=pg_td(result.at("winner").get<bool>()?"<span class=\"pg-tag sage\" style=\"display:inline-block;\">"+text+"</span>":text,column?150:0);++column;
|
||||
}
|
||||
body+="</div>";
|
||||
}
|
||||
out+="</div><nav class=\"career-history-actions\">"+btn("career-history-close","Schließen","career-action","id=\"career-history-close\"")+"</nav></section></div>";
|
||||
body+="</div></div></div>";
|
||||
out+="<div class=\"pg-ov\" id=\"career-history-layer\"><section class=\"pg-dlg\" id=\"career-history-dialog\" role=\"dialog\" aria-modal=\"true\" aria-labelledby=\"career-history-title\" style=\"width:"+pg(660)+";\"><div><h2 id=\"career-history-title\">"+
|
||||
std::string(engine_mode_?"Karriereverlauf":"Vereinsgeschichte")+"</h2></div>"+body+"<nav class=\"pg-dlg-act\">"+pg_button("career-history-close","Schließen","primary","id=\"career-history-close\"")+"</nav></section></div>";
|
||||
}
|
||||
return out+render_report_detail();
|
||||
}
|
||||
@@ -78,17 +84,16 @@ std::string App::render_highscore() {
|
||||
const auto snapshot=snap();career_page(career_view_);
|
||||
const auto data=snapshot.world?demo_highscores(*snapshot.world,snapshot.state):Json{{"ok",false},{"available",false}};
|
||||
const bool ready=data.value("ok",false)&&data.value("available",false);
|
||||
const auto key=theme_=="silver"?"art.highscore-mark-silver.svg":"art.highscore-mark-v1.svg";
|
||||
std::string out="<div class=\"career-highscore\" id=\"career-report-underlay\"><div class=\"career-highscore-art\" aria-label=\"High Score · Manager-Rangliste\">"+img(key,1180,1180.0/3.0,false,false,2048)+"</div><div class=\"career-highscore-table\" id=\"career-highscore-scroll\" role=\"table\"><div class=\"career-highscore-row career-highscore-head\">";
|
||||
const std::array<const char*,6> heads{"Manager","Verein","Punkte","Meister","Pokal","Europa"};
|
||||
for(int i=0;i<6;++i)out+=career_cell(heads[size_t(i)],"highscore-col-"+std::to_string(i));
|
||||
out+="</div>";
|
||||
std::string out="<div class=\"pg-page\" id=\"career-report-underlay\"><header class=\"pg-heading\"><h2 class=\"pg-h large\" style=\"color:var(--p-a7);\" aria-label=\"High Score · Manager-Rangliste\">High Score</h2><span class=\"pg-mut\">Manager-Rangliste</span></header>"
|
||||
"<div class=\"pg-panel pg-col pg-grow\" style=\""+pg_css("gap:0px;padding:4px 12px;")+"\"><div class=\"pg-t\" role=\"table\"><div class=\"pg-thead\">"+pg_th("Manager",420)+pg_th("Verein",0)+pg_th("Punkte",120,"r")+pg_th("Meister",110,"r")+pg_th("Pokal",110,"r")+pg_th("Europa",110,"r")+
|
||||
"</div><div class=\"pg-tbody\" id=\"career-highscore-scroll\">";
|
||||
if(ready) {
|
||||
size_t i=0;for(const auto &row:data.at("rows")) {
|
||||
out+="<div class=\"career-highscore-row "+std::string(i%2==0?"striped":"")+"\">"+career_cell(std::to_string(row.at("rank").get<int>())+". "+row.at("manager").get<std::string>(),"highscore-col-0")+"<div class=\"career-cell highscore-col-1\">"+report_club_button(row.at("club").get<std::string>())+"</div>";
|
||||
int col=2;for(const auto *field:{"points","championships","cups","europe"})out+=career_cell(std::to_string(row.at(field).get<int64_t>()),"highscore-col-"+std::to_string(col++));
|
||||
out+="</div>";++i;
|
||||
for(const auto &row:data.at("rows")) {
|
||||
out+="<div class=\"pg-tr\" style=\"height:"+pg(40)+";\">"+pg_td("<span class=\"pg-num\" style=\"width:"+pg(34)+";color:var(--p-a7);\">"+std::to_string(row.at("rank").get<int>())+".</span><strong>"+esc(row.at("manager").get<std::string>())+"</strong>",420,"",true)+
|
||||
pg_td(pg_club(row.at("club").get<std::string>()),0,"",true)+pg_td("<span class=\"pg-num\">"+esc(number(row.at("points").get<int64_t>()))+"</span>",120,"r");
|
||||
for(const auto *field:{"championships","cups","europe"}) { const auto value=row.at(field).get<int64_t>(); out+=pg_td(value?std::to_string(value):std::string("<span class=\"pg-mut\">—</span>"),110,"r"); }
|
||||
out+="</div>";
|
||||
}
|
||||
} else out+="<p class=\"career-report-empty\">Für den aktuellen Verein ist keine Ranglistenvorschau verfügbar.</p>";
|
||||
return out+"</div></div>"+render_report_detail();
|
||||
} else out+="<div class=\"pg-empty\">Für den aktuellen Verein ist keine Ranglistenvorschau verfügbar.</div>";
|
||||
return out+"</div></div></div></div>"+render_report_detail();
|
||||
}
|
||||
@@ -5,7 +5,7 @@
|
||||
// The menus that are laid out as a page of the notebook. Every other career menu is still a
|
||||
// sheet of the old format, shown scaled inside the book.
|
||||
bool App::page_native() const {
|
||||
static const std::set<std::string> native{"balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"};
|
||||
static const std::set<std::string> native{"achievements", "highscore", "balance", "contracts", "environment", "tables", "league", "other", "strengths", "fairplay", "indoor", "scorers"};
|
||||
return notebook_page() && native.contains(menu_);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user