Port achievements and player rankings to the Modern UI (by Codex)
This commit is contained in:
1 parent
d419943e86
commit
96e88c9579
29 files changed
+1362
-17
No files matched your search
@@ -1,5 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-3.0-only
|
||||
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp)
|
||||
add_library(bmh_modern_ui_core STATIC catalog.cpp model.cpp gui_assets.cpp desktop.cpp demo_sports.cpp demo_calendar.cpp demo_reports.cpp demo_almanac.cpp demo_finance.cpp demo_environment.cpp demo_advertising.cpp demo_toto.cpp demo_lineup.cpp demo_transfer.cpp demo_career_reports.cpp demo_rankings.cpp)
|
||||
target_include_directories(bmh_modern_ui_core PUBLIC ../..)
|
||||
target_link_libraries(bmh_modern_ui_core PUBLIC bmh_asset_io)
|
||||
add_library(bmh_modern_ui STATIC view.cpp ticket_popover.cpp)
|
||||
@@ -14,9 +14,20 @@ endif()
|
||||
set(modern_assets "${CMAKE_BINARY_DIR}/assets/modern")
|
||||
FetchContent_GetProperties(rmlui)
|
||||
file(MAKE_DIRECTORY "${modern_assets}")
|
||||
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss)
|
||||
foreach(asset modern.rml theme.rcss ticket.rcss sports.rcss calendar.rcss reports.rcss report_details.rcss report_pickers.rcss indoor.rcss planning.rcss almanac.rcss finance.rcss bank.rcss contracts.rcss amount.rcss environment.rcss advertising.rcss toto.rcss lineup.rcss transfer.rcss career_reports.rcss rankings.rcss)
|
||||
configure_file("${CMAKE_SOURCE_DIR}/assets/modern/${asset}" "${modern_assets}/${asset}" COPYONLY)
|
||||
endforeach()
|
||||
|
||||
foreach(component career_reports rankings)
|
||||
add_executable(modern_${component}_tests ../../../tests/modern_${component}_tests.cpp)
|
||||
target_link_libraries(modern_${component}_tests PRIVATE bmh_modern_ui_core)
|
||||
if(MSVC)
|
||||
target_compile_options(modern_${component}_tests PRIVATE /W4 /utf-8)
|
||||
else()
|
||||
target_compile_options(modern_${component}_tests PRIVATE -Wall -Wextra -Wpedantic)
|
||||
endif()
|
||||
add_test(NAME modern_${component}_tests COMMAND modern_${component}_tests)
|
||||
endforeach()
|
||||
file(GLOB modern_icons CONFIGURE_DEPENDS "${CMAKE_SOURCE_DIR}/assets/modern/icons/*.svg")
|
||||
file(MAKE_DIRECTORY "${modern_assets}/icons")
|
||||
foreach(icon ${modern_icons})
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
bool App::career_report_action(const std::string &action,Rml::Element *target) {
|
||||
if(action!="career-report-page"&&action!="career-history"&&action!="career-history-close")return false;
|
||||
if(menu_!="achievements"||!popup_.empty()||amount_||!report_detail_kind_.empty())return true;
|
||||
const int page=career_page(career_view_);
|
||||
if(action=="career-history-close") {
|
||||
if(career_view_.at("dialog")!="history")return true;
|
||||
focus_after_render_=career_view_.at("return_focus").get<std::string>();
|
||||
if(focus_after_render_.empty())focus_after_render_="career-history";
|
||||
career_view_["dialog"]="";career_view_["return_focus"]="";career_view_["bound_club"]="";
|
||||
refresh();return true;
|
||||
}
|
||||
if(career_view_.at("dialog")!=""||!target)return true;
|
||||
const auto snapshot=snap();
|
||||
if(!snapshot.world)return true;
|
||||
const auto data=demo_achievements(*snapshot.world,snapshot.state,page);
|
||||
if(!data.value("ok",false)||!data.value("available",false))return true;
|
||||
if(action=="career-history") {
|
||||
career_view_["dialog"]="history";career_view_["return_focus"]=target->GetId();
|
||||
career_view_["bound_club"]=data.at("club");focus_after_render_="career-history-close";
|
||||
refresh();return true;
|
||||
}
|
||||
const auto id=target->GetAttribute<Rml::String>("data-id","");
|
||||
if(id!="older"&&id!="newer")return true;
|
||||
const int next=std::clamp(page+(id=="older"?1:-1),0,4);
|
||||
if(next==page)return true;
|
||||
career_view_["page"]=next;
|
||||
focus_after_render_=(id=="older"&&next==4)?"career-page-newer":(id=="newer"&&next==0)?"career-page-older":target->GetId();
|
||||
refresh();return true;
|
||||
}
|
||||
bool App::career_report_event(Rml::Event &event) {
|
||||
if(menu_!="achievements"||!popup_.empty()||amount_||!report_detail_kind_.empty())return false;
|
||||
career_page(career_view_);
|
||||
if(career_view_.at("dialog")!="history")return false;
|
||||
const auto type=event.GetType();const bool keyboard=type=="keydown";
|
||||
const auto key=keyboard?Rml::Input::KeyIdentifier(event.GetParameter<int>("key_identifier",0)):Rml::Input::KI_UNKNOWN;
|
||||
if((keyboard&&key==Rml::Input::KI_ESCAPE)||(type=="mouseup"&&event.GetParameter<int>("button",0)==1)) {
|
||||
career_report_action("career-history-close",nullptr);event.StopImmediatePropagation();return true;
|
||||
}
|
||||
if(keyboard&&key==Rml::Input::KI_TAB) {
|
||||
Rml::ElementList controls;
|
||||
if(auto *dialog=element("career-history-layer"))dialog->QuerySelectorAll(controls,"button:not([disabled])");
|
||||
controls.erase(std::remove_if(controls.begin(),controls.end(),[](auto *control){return !control->IsVisible(true);}),controls.end());
|
||||
if(!controls.empty()) {
|
||||
const auto current=context_->GetFocusElement();const auto it=std::find(controls.begin(),controls.end(),current);
|
||||
const int old=it==controls.end()?-1:int(it-controls.begin());const bool back=event.GetParameter<int>("shift_key",0)!=0;
|
||||
const int next=(old+(back?-1:1)+int(controls.size()))%int(controls.size());controls[size_t(next)]->Focus(true);
|
||||
}
|
||||
event.StopImmediatePropagation();return true;
|
||||
}
|
||||
bool inside=false;
|
||||
for(auto *node=event.GetTargetElement();node&&node!=doc_;node=node->GetParentNode())if(node->GetId()=="career-history-layer")inside=true;
|
||||
if(!inside&&(type=="click"||type=="dblclick"||type=="mousedown"||type=="mouseup"||keyboard)) {
|
||||
event.StopImmediatePropagation();return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {
|
||||
int career_page(Json &view) {
|
||||
if(!view.is_object())view=Json::object();
|
||||
if(!view.contains("page")||!view.at("page").is_number_integer()||view.at("page")<0||view.at("page")>4)view["page"]=0;
|
||||
for(const auto *key:{"dialog","return_focus","bound_club"})if(!view.contains(key)||!view.at(key).is_string())view[key]="";
|
||||
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)]+"\">"+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")) {
|
||||
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)/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
|
||||
|
||||
std::string App::render_achievements() {
|
||||
const auto snapshot=snap();const int page=career_page(career_view_);
|
||||
const auto data=snapshot.world?demo_achievements(*snapshot.world,snapshot.state,page):Json{{"ok",false},{"available",false}};
|
||||
const bool ready=data.value("ok",false)&&data.value("available",false);
|
||||
const auto club=ready?data.at("club").get<std::string>():std::string();
|
||||
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>";
|
||||
if(ready) {
|
||||
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>();
|
||||
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("Fiktive "+chart.at("title").get<std::string>()+"-Ergebnisse")+"\">"+picture(renderer_.diagram("career-chart-"+std::to_string(kind),svg,4480),2548,403.333333333)+"</div></section>";
|
||||
}
|
||||
} else out+="<p class=\"career-report-empty\">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==4?"disabled=\"disabled\"":""))+btn("career-history","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\">Vereinsgeschichte</h2><div class=\"career-history-club\">"+report_club_button(club)+"<span>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;
|
||||
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;
|
||||
}
|
||||
out+="</div><nav class=\"career-history-actions\">"+btn("career-history-close","Schließen","career-action","id=\"career-history-close\"")+"</nav></section></div>";
|
||||
}
|
||||
return out+render_report_detail();
|
||||
}
|
||||
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>";
|
||||
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;
|
||||
}
|
||||
} 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();
|
||||
}
|
||||
@@ -164,6 +164,7 @@ void App::ProcessEvent(Rml::Event &event) try {
|
||||
}
|
||||
if (popup_.empty() && amount_trigger_event(event)) return;
|
||||
if (popup_.empty() && report_detail_kind_.empty() && (lineup_event(event) || transfer_event(event))) return;
|
||||
if (popup_.empty() && report_detail_kind_.empty() && (career_report_event(event) || rankings_event(event))) return;
|
||||
if (popup_.empty() && contracts_event(event)) return;
|
||||
if (popup_.empty() && (advertising_event(event) || toto_event(event))) return;
|
||||
if (popup_.empty() && (bank_event(event) || finance_event(event))) return;
|
||||
@@ -386,15 +387,19 @@ void App::ProcessEvent(Rml::Event &event) try {
|
||||
auto *root = !popup_.empty() ? element("popup")
|
||||
: !planning_dialog_.empty() ? element("planning-layer")
|
||||
: !report_detail_kind_.empty() ? element("report-detail-layer")
|
||||
: !career_view_.value("dialog", "").empty() ? element("career-history-layer")
|
||||
: element("canvas");
|
||||
root->QuerySelectorAll(
|
||||
controls, !popup_.empty() || !report_detail_kind_.empty() || !planning_dialog_.empty()
|
||||
controls, !popup_.empty() || !report_detail_kind_.empty() || !planning_dialog_.empty() || !career_view_.value("dialog", "").empty()
|
||||
? "button,input,select"
|
||||
: ".window button,.window input,.window select");
|
||||
controls.erase(std::remove_if(controls.begin(), controls.end(),
|
||||
[](auto *n) {
|
||||
[this](auto *n) {
|
||||
return !n->IsVisible(true) ||
|
||||
n->HasAttribute("disabled");
|
||||
n->HasAttribute("disabled") ||
|
||||
(menu_ == "scorers" &&
|
||||
n->GetId().starts_with("player-stat-tab-") &&
|
||||
n->template GetAttribute<Rml::String>("aria-selected", "false") != "true");
|
||||
}),
|
||||
controls.end());
|
||||
const auto current = context_->GetFocusElement();
|
||||
@@ -452,6 +457,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
|
||||
const auto id =
|
||||
target ? target->GetAttribute<Rml::String>("data-id", "") : std::string();
|
||||
if (lineup_action(action, target) || transfer_action(action, target)) return;
|
||||
if (career_report_action(action, target) || rankings_action(action, target)) return;
|
||||
if (environment_action(action, target) || advertising_action(action, target) || toto_action(action, target)) return;
|
||||
if (amount_action(action, target) || bank_action(action, target) || finance_action(action, target) || contracts_action(action, target)) return;
|
||||
if (almanac_action(action, target) || planning_action(action, target) || indoor_action(action, target)) return;
|
||||
@@ -1065,7 +1071,7 @@ void App::dispatch(const std::string &action, Rml::Element *target) {
|
||||
}
|
||||
static const std::set<std::string> available = {
|
||||
"tables", "strengths", "camp", "settings",
|
||||
"save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer"};
|
||||
"save", "load", "training", "tactics", "calendar", "league", "other", "postpone", "friendlies", "indoor", "almanac", "bank", "balance", "contracts", "environment", "advertising", "toto", "lineup", "transfer", "achievements", "scorers", "fairplay", "highscore"};
|
||||
if (!available.contains(route)) {
|
||||
message("Diese native Ansicht wird im nächsten Menüpaket übertragen.");
|
||||
return;
|
||||
@@ -1456,6 +1462,7 @@ void App::script() {
|
||||
{"toto_view", {{"column", toto_column_}, {"dialog", toto_dialog_}}},
|
||||
{"lineup_view", {{"pitch", lineup_pitch_}, {"data", lineup_data_}, {"page", lineup_page_}, {"side", lineup_side_}, {"selected", lineup_selected_}, {"drag", lineup_drag_}}},
|
||||
{"transfer_view", transfer_view_}, {"transfer_dialog", transfer_dialog_}, {"transfer_draft", transfer_draft_},
|
||||
{"career_view", career_view_}, {"rankings_view", rankings_view_},
|
||||
{"contracts_view", {{"dialog", contracts_dialog_}, {"player", contracts_player_}, {"tab", contracts_tab_}, {"draft", contract_draft_}}},
|
||||
{"amount_editor", amount_ ? Json{{"title", amount_->request.title}, {"raw", amount_->raw}, {"review", amount_->review}, {"error", amount_error()}} : Json()},
|
||||
{"source_revision", source_ ? Json(snap().revision) : Json()},
|
||||
|
||||
@@ -0,0 +1,105 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/demo_career_reports.hpp"
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <chrono>
|
||||
#include <set>
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
namespace {
|
||||
constexpr std::array<const char *,3> titles{"Meisterschaft","DFB-Pokal","Europapokal"};
|
||||
constexpr std::array<const char *,4> league_names{"Bundesliga","2. Bundesliga","3. Bundesliga","Regionalliga"};
|
||||
constexpr std::array<std::array<int,12>,3> samples{{
|
||||
{{8,7,5,6,4,3,1,5,4,2,3,1}},{{32,1,8,16,4,8,4,8,16,8,2,1}},{{0,0,16,8,0,4,16,8,32,4,8,8}}
|
||||
}};
|
||||
constexpr std::array<int,12> tiers{4,4,3,3,2,2,1,1,1,1,1,1};
|
||||
const Json &field(const Json &j,const char *key) {
|
||||
static const Json missing;
|
||||
if(j.is_object())if(const auto i=j.find(key);i!=j.end())return *i;
|
||||
return missing;
|
||||
}
|
||||
std::string text(const Json &j,const std::string &fallback="—") {
|
||||
return j.is_string()&&!j.get_ref<const std::string&>().empty()?j.get<std::string>():fallback;
|
||||
}
|
||||
bool date(const Json &value) {
|
||||
if(!value.is_string())return false;
|
||||
const auto &s=value.get_ref<const std::string&>();
|
||||
if(s.size()!=10||s[4]!='-'||s[7]!='-')return false;
|
||||
for(size_t i=0;i<s.size();++i)if(i!=4&&i!=7&&(s[i]<'0'||s[i]>'9'))return false;
|
||||
const int year=std::stoi(s.substr(0,4));
|
||||
return year>=1900&&std::chrono::year_month_day{std::chrono::year{year},
|
||||
std::chrono::month{unsigned(std::stoi(s.substr(5,2)))},std::chrono::day{unsigned(std::stoi(s.substr(8,2)))}}.ok();
|
||||
}
|
||||
struct Context {std::string club,manager="—";int last_year=2025;};
|
||||
Context context(const Catalog &world,const Json &state) {
|
||||
Context c;
|
||||
const auto &managers=field(state,"managers");
|
||||
if(managers.is_array()&&!managers.empty()&&managers[0].is_object()) {
|
||||
c.manager=text(field(managers[0],"name"));
|
||||
const auto id=text(field(managers[0],"club"),"");
|
||||
if(!id.empty())if(const auto *club=world.find("clubs",id);club&&club->value("type",std::string("club"))=="club")c.club=id;
|
||||
}
|
||||
auto reference=field(state,"date");
|
||||
if(!date(reference))reference=world.manifest().value("start_date",Json());
|
||||
if(date(reference)) {
|
||||
const auto s=reference.get<std::string>();
|
||||
c.last_year=std::stoi(s.substr(0,4))-(std::stoi(s.substr(5,2))<7?2:1);
|
||||
}
|
||||
return c;
|
||||
}
|
||||
int index(int year) {return ((year-2015)%12+12)%12;}
|
||||
std::string season(int year) {
|
||||
const int next=(year+1)%100;
|
||||
return std::to_string(year)+"/"+(next<10?"0":"")+std::to_string(next);
|
||||
}
|
||||
std::string label(int value,int competition) {
|
||||
if(!competition)return std::to_string(value)+". Platz";
|
||||
switch(value){case 0:return "Nicht teilgenommen";case 1:return "Sieger";case 2:return "Finale";
|
||||
case 4:return "Halbfinale";case 8:return "Viertelfinale";case 16:return "Achtelfinale";default:return "1. Runde";}
|
||||
}
|
||||
Json result(int year,int competition) {
|
||||
const int i=index(year),value=samples[size_t(competition)][size_t(i)],tier=tiers[size_t(i)];
|
||||
return {{"year",year},{"season",season(year)},{"value",value},{"label",label(value,competition)},
|
||||
{"caption",competition==0?std::to_string(value)+".":value==0?"–":label(value,competition)},
|
||||
{"tier",competition==0?Json(tier):Json()},{"tier_name",competition==0?Json(league_names[size_t(tier-1)]):Json()},
|
||||
{"winner",value==1},{"fictional",true}};
|
||||
}
|
||||
Json envelope(const Context &c) {
|
||||
return {{"ok",true},{"available",!c.club.empty()},{"fictional",true},
|
||||
{"club",c.club.empty()?Json():Json(c.club)},{"manager",c.manager}};
|
||||
}
|
||||
} // namespace
|
||||
Json demo_achievements(const Catalog &world,const Json &state,int page) {
|
||||
if(page<0||page>4)return {{"ok",false},{"error","invalid_career_page"}};
|
||||
const auto c=context(world,state);auto response=envelope(c);
|
||||
const int end=c.last_year-page;
|
||||
response["page"]=page;response["first_year"]=end-7;response["last_year"]=end;
|
||||
response["range"]=season(end-7)+" – "+season(end);
|
||||
response["charts"]=Json::array();response["history"]=Json::array();
|
||||
if(c.club.empty())return response;
|
||||
for(int k=0;k<3;++k) {
|
||||
Json rows=Json::array();for(int year=end-7;year<=end;++year)rows.push_back(result(year,k));
|
||||
response["charts"].push_back({{"kind",k},{"title",titles[size_t(k)]},{"latest",result(end,k)},{"seasons",rows}});
|
||||
}
|
||||
for(int i=0;i<12;++i) {
|
||||
const int year=c.last_year-i;Json values=Json::array();
|
||||
for(int k=0;k<3;++k)values.push_back(result(year,k));
|
||||
response["history"].push_back({{"year",year},{"season",season(year)},{"results",values}});
|
||||
}
|
||||
return response;
|
||||
}
|
||||
Json demo_highscores(const Catalog &world,const Json &state) {
|
||||
const auto c=context(world,state);auto response=envelope(c);response["rows"]=Json::array();
|
||||
if(c.club.empty())return response;
|
||||
std::vector<std::string> clubs{c.club};
|
||||
for(const auto *club:world.clubs()) {
|
||||
const auto id=club->value("id","");
|
||||
if(id!=c.club&&clubs.size()<8&&club->value("type",std::string("club"))=="club")clubs.push_back(id);
|
||||
}
|
||||
constexpr std::array<const char *,8> managers{"","Chris Winter","Sam Keller","Robin Faber","Kim Seidel","Dani Koch","Mika Sommer","Jules Walter"};
|
||||
for(size_t i=0;i<clubs.size();++i)response["rows"].push_back({{"rank",i+1},
|
||||
{"manager",i?std::string(managers[i]):c.manager},{"club",clubs[i]},{"points",18200-int(i)*1575},
|
||||
{"championships",8-int(i%5)},{"cups",6-int(i%4)},{"europe",3-int(i%3)},{"fictional",true}});
|
||||
return response;
|
||||
}
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -0,0 +1,16 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#pragma once
|
||||
#include "modern/ui/catalog.hpp"
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
// Read-only, deterministic presentation fixtures. FULL demo state supplies only
|
||||
// the first manager/club and date. No engine, RNG, wallet or catalogue mutation.
|
||||
// page0..4 moves the eight-season window backwards by one season per page.
|
||||
// {ok,available,fictional,page,club,manager,first_year,last_year,range,charts,
|
||||
// history:[12 newest completed seasons]}; clubs are existing IDs or null.
|
||||
Json demo_achievements(const Catalog &, const Json &full_state, int page = 0);
|
||||
// At most8 distinct existing clubs, managed club first. Fictional manager names
|
||||
// and totals match the Gold; the first manager name is taken from the snapshot.
|
||||
// {ok,available,fictional,club,manager,rows:[{rank,manager,club,points,...}]}.
|
||||
Json demo_highscores(const Catalog &, const Json &full_state);
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -0,0 +1,106 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#include "modern/ui/demo_rankings.hpp"
|
||||
#include <algorithm>
|
||||
#include <array>
|
||||
#include <set>
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
namespace {
|
||||
bool position(const Json &player, const std::string &role) {
|
||||
const auto it = player.find("positions");
|
||||
return it != player.end() && it->is_array() &&
|
||||
std::find(it->begin(), it->end(), role) != it->end();
|
||||
}
|
||||
bool outfield(const Json &player) {
|
||||
return position(player, "def") || position(player, "mid") ||
|
||||
position(player, "fwd");
|
||||
}
|
||||
std::string photo(const Json &player) {
|
||||
const auto explicit_photo = player.value("photo", std::string());
|
||||
if (!explicit_photo.empty()) return explicit_photo;
|
||||
const auto id = player.value("id", std::string());
|
||||
// Catalog::asset resolves a world's declared silhouette fallback, if any.
|
||||
return "asset:player/" + (id.starts_with("player:") ? id.substr(7) : id) +
|
||||
"/photo";
|
||||
}
|
||||
} // namespace
|
||||
|
||||
Json demo_scorer_rows(const Catalog &world, const std::string &league,
|
||||
const std::string &managed_club, int scope, int kind) {
|
||||
Json rows = Json::array();
|
||||
if (scope < 0 || scope > 1 || kind < 0 || kind > 3) return rows;
|
||||
std::vector<const Json *> clubs;
|
||||
if (scope == 1) {
|
||||
if (const auto *club = world.find("clubs", managed_club);
|
||||
club && club->value("type", "club") == "club") clubs.push_back(club);
|
||||
} else {
|
||||
const auto *competition = world.find("competitions", league);
|
||||
if (!competition || competition->value("type", "") != "league") return rows;
|
||||
clubs = world.clubs(league);
|
||||
}
|
||||
if (clubs.empty()) return rows;
|
||||
const std::array<const char *, 10> preferred{
|
||||
"fwd", "fwd", "fwd", "fwd", "mid", "mid", "mid", "mid", "def", "def"};
|
||||
const std::array<int, 10> assists{9, 12, 7, 11, 6, 8, 4, 5, 3, 10},
|
||||
yellow{2, 5, 3, 8, 7, 1, 9, 6, 4, 10},
|
||||
red{0, 1, 1, 2, 0, 1, 3, 0, 2, 1};
|
||||
std::set<std::string> used;
|
||||
for (size_t i = 0; i < preferred.size(); ++i) {
|
||||
const Json *selected = nullptr, *selected_club = nullptr;
|
||||
// Round-robin clubs preserve Gold's ten-club preview; short worlds may
|
||||
// supply additional distinct outfield players from their actual squads.
|
||||
for (size_t offset = 0; offset < clubs.size() && !selected; ++offset) {
|
||||
const auto *club = clubs[(i + offset) % clubs.size()];
|
||||
const auto squad = world.squad(club->at("id").get<std::string>());
|
||||
for (bool exact : {true, false}) {
|
||||
for (const auto *player : squad)
|
||||
if (outfield(*player) && !used.contains(player->at("id").get<std::string>()) &&
|
||||
(!exact || position(*player, preferred[i]))) {
|
||||
selected = player; selected_club = club; break;
|
||||
}
|
||||
if (selected) break;
|
||||
}
|
||||
}
|
||||
if (!selected) break;
|
||||
used.insert(selected->at("id").get<std::string>());
|
||||
const std::array<int, 4> values{19 - int(i), assists[i], yellow[i], red[i]};
|
||||
if (!values[size_t(kind)]) continue;
|
||||
rows.push_back({{"player", selected->at("id")},
|
||||
{"club", selected_club->at("id")},
|
||||
{"name", world.name(*selected)},
|
||||
{"club_name", world.name(*selected_club)},
|
||||
{"photo", photo(*selected)},
|
||||
{"crest", selected_club->value("crest", "")},
|
||||
{"goals", values[0]}, {"assists", values[1]},
|
||||
{"yellow", values[2]}, {"red", values[3]},
|
||||
{"value", values[size_t(kind)]}, {"original", i}});
|
||||
}
|
||||
std::stable_sort(rows.begin(), rows.end(), [](const Json &a, const Json &b) {
|
||||
return a.at("value").get<int>() > b.at("value").get<int>();
|
||||
});
|
||||
for (size_t i = 0; i < rows.size(); ++i)
|
||||
rows[i]["rank"] = i && rows[i].at("value") == rows[i - 1].at("value")
|
||||
? rows[i - 1].at("rank") : Json(i + 1);
|
||||
return rows;
|
||||
}
|
||||
|
||||
Json demo_fairplay_rows(const Catalog &world) {
|
||||
Json rows = Json::array();
|
||||
const auto leagues = world.leagues("nation:de");
|
||||
if (leagues.empty()) return rows;
|
||||
const auto clubs = world.clubs(leagues.front()->at("id").get<std::string>());
|
||||
for (size_t i = 0; i < clubs.size(); ++i) {
|
||||
const int yellow = 18 + int(i), red = int(i % 5);
|
||||
rows.push_back({{"club", clubs[i]->at("id")},
|
||||
{"name", world.name(*clubs[i])},
|
||||
{"crest", clubs[i]->value("crest", "")},
|
||||
{"yellow", yellow}, {"red", red},
|
||||
{"points", yellow + 4 * red}, {"original", i}});
|
||||
}
|
||||
std::stable_sort(rows.begin(), rows.end(), [](const Json &a, const Json &b) {
|
||||
return a.at("points").get<int>() < b.at("points").get<int>();
|
||||
});
|
||||
for (size_t i = 0; i < rows.size(); ++i) rows[i]["rank"] = i + 1;
|
||||
return rows;
|
||||
}
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -0,0 +1,20 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
#pragma once
|
||||
#include "modern/ui/catalog.hpp"
|
||||
|
||||
namespace bmh::modern_ui {
|
||||
// Read-only presentation fixtures. Neither function constructs a game/session,
|
||||
// touches a random stream, or modifies the catalogue or a saved demo model.
|
||||
// scope: 0 = selected league, 1 = managed club; kind: goals/assists/yellow/red.
|
||||
// At most ten distinct actual outfield players form one shared category cohort.
|
||||
// Positive metrics sort descending with competition ranks (1,2,2,4).
|
||||
// Rows: player, club, name, club_name, photo, crest, goals, assists, yellow,
|
||||
// red, value, rank, original. Asset fields are catalogue references, not bytes.
|
||||
Json demo_scorer_rows(const Catalog &, const std::string &league,
|
||||
const std::string &managed_club, int scope = 0,
|
||||
int kind = 0);
|
||||
// Gold's fixed domestic overview uses every club of the first German league.
|
||||
// Rows: club, name, crest, yellow, red, points, rank, original; points are
|
||||
// yellow + 4*red, ascending, with original catalogue order breaking ties.
|
||||
Json demo_fairplay_rows(const Catalog &);
|
||||
} // namespace bmh::modern_ui
|
||||
@@ -0,0 +1,69 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
bool App::rankings_action(const std::string &action, Rml::Element *target) {
|
||||
if (!action.starts_with("rankings-")) return false;
|
||||
if (menu_ != "scorers" || !world_ || !target) return true;
|
||||
rankings_remember_scroll();
|
||||
const auto value = target->GetAttribute<Rml::String>("data-value", "");
|
||||
if (action == "rankings-tab") {
|
||||
const int kind = target->GetAttribute<int>("data-kind", -1);
|
||||
if (kind < 0 || kind > 3) return true;
|
||||
rankings_view_["tab"] = kind;
|
||||
focus_after_render_ = "player-stat-tab-" + std::to_string(kind);
|
||||
} else if (action == "rankings-country") {
|
||||
const auto leagues = world_->leagues(value);
|
||||
if (leagues.empty()) return true;
|
||||
rankings_view_["league"] = leagues.front()->at("id");
|
||||
} else if (action == "rankings-league") {
|
||||
const auto *league = world_->find("competitions", value);
|
||||
if (!league || league->value("type", "") != "league") return true;
|
||||
rankings_view_["league"] = value;
|
||||
} else if (action == "rankings-scope") {
|
||||
if (value != "0" && value != "1") return true;
|
||||
rankings_view_["scope"] = value == "1" ? 1 : 0;
|
||||
} else return true;
|
||||
refresh();
|
||||
return true;
|
||||
}
|
||||
bool App::rankings_event(Rml::Event &event) {
|
||||
if (menu_ != "scorers" || !report_detail_kind_.empty() ||
|
||||
!report_picker_.empty() || event.GetType() != "keydown") return false;
|
||||
auto *target = event.GetTargetElement();
|
||||
const auto key = Rml::Input::KeyIdentifier(event.GetParameter<int>("key_identifier", 0));
|
||||
if (key == Rml::Input::KI_TAB) {
|
||||
Rml::ElementList controls;
|
||||
if (auto *canvas = element("canvas"))
|
||||
canvas->QuerySelectorAll(controls, ".window button,.window input,.window select");
|
||||
std::erase_if(controls, [](auto *node) {
|
||||
return !node->IsVisible(true) || node->HasAttribute("disabled") ||
|
||||
(node->GetId().starts_with("player-stat-tab-") &&
|
||||
node->template GetAttribute<Rml::String>("aria-selected", "false") != "true");
|
||||
});
|
||||
if (!controls.empty()) {
|
||||
const auto found = std::find(controls.begin(), controls.end(), context_->GetFocusElement());
|
||||
const bool backwards = event.GetParameter<int>("shift_key", 0) != 0;
|
||||
const int count = int(controls.size()), old = found == controls.end() ? -1 : int(found - controls.begin());
|
||||
const int next = old < 0 ? (backwards ? count - 1 : 0)
|
||||
: (old + (backwards ? -1 : 1) + count) % count;
|
||||
controls[size_t(next)]->Focus(true);
|
||||
if (controls[size_t(next)]->GetId().starts_with("rankings-player-") ||
|
||||
controls[size_t(next)]->GetId().starts_with("rankings-club-"))
|
||||
controls[size_t(next)]->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));
|
||||
dirty_ = true;
|
||||
}
|
||||
event.StopImmediatePropagation();
|
||||
return true;
|
||||
}
|
||||
if (!target || !target->GetId().starts_with("player-stat-tab-")) return false;
|
||||
const int current = rankings_view_.value("tab", 0);
|
||||
int next = current;
|
||||
if (key == Rml::Input::KI_LEFT) next = (current + 3) % 4;
|
||||
else if (key == Rml::Input::KI_RIGHT) next = (current + 1) % 4;
|
||||
else if (key == Rml::Input::KI_HOME) next = 0;
|
||||
else if (key == Rml::Input::KI_END) next = 3;
|
||||
else return false;
|
||||
rankings_remember_scroll();
|
||||
rankings_view_["tab"] = next;
|
||||
focus_after_render_ = "player-stat-tab-" + std::to_string(next);
|
||||
refresh(); event.StopImmediatePropagation();
|
||||
return true;
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {
|
||||
const std::array<const char *, 4> rankings_categories{
|
||||
"Tore", "Vorlagen", "Gelbe Karten", "Rote Karten"};
|
||||
std::string rankings_cell_text(const std::string &value) {
|
||||
return "<span class=\"rankings-cell-value\">" + esc(value) + "</span>";
|
||||
}
|
||||
std::string rankings_league(const Catalog &world, const Json &state,
|
||||
const std::string &club) {
|
||||
const auto *own = world.find("clubs", club);
|
||||
const auto requested = state.value("reports", Json::object()).value(
|
||||
"league", own ? own->value("competition", "") : "");
|
||||
const auto *league = world.find("competitions", requested);
|
||||
if (league && league->value("type", "") == "league") return requested;
|
||||
const auto leagues = world.leagues();
|
||||
return leagues.empty() ? "" : leagues.front()->value("id", "");
|
||||
}
|
||||
std::string rankings_season(const Json &state, const Catalog &world) {
|
||||
const auto date = state.value("date", world.manifest().value("start_date", ""));
|
||||
if (date.size() < 7 || date.find_first_not_of("0123456789", 0) < 4) return "—";
|
||||
try {
|
||||
int year = std::stoi(date.substr(0, 4));
|
||||
if (std::stoi(date.substr(5, 2)) < 7) --year;
|
||||
return std::to_string(year) + "/" + std::to_string(year + 1).substr(2);
|
||||
} catch (...) { return "—"; }
|
||||
}
|
||||
std::string rankings_icon(int kind, const std::string &color) {
|
||||
const std::string shape = kind == 0
|
||||
? "<circle cx='12' cy='12' r='9'/><path d='m12 7 5 4-2 6H9l-2-6ZM12 3v4M3 10l4 1M5 19l4-2M19 19l-4-2M21 10l-4 1'/>"
|
||||
: "<path d='M3 17h7V7h10M15 2l5 5-5 5'/>";
|
||||
return "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24'><g fill='none' stroke='" +
|
||||
color + "' stroke-width='1.5' stroke-linecap='round' stroke-linejoin='round'>" + shape + "</g></svg>";
|
||||
}
|
||||
} // namespace
|
||||
|
||||
void App::rankings_remember_scroll() {
|
||||
if (!rankings_view_.is_object()) return;
|
||||
if (auto *list = element("rankings-list")) {
|
||||
const auto key = list->GetAttribute<Rml::String>("data-scroll-key", "");
|
||||
if (!key.empty()) rankings_view_["scrolls"][key] = list->GetScrollTop();
|
||||
}
|
||||
}
|
||||
void App::rankings_restore_scroll() {
|
||||
if ((menu_ != "scorers" && menu_ != "fairplay") ||
|
||||
!rankings_view_.value("restore_scroll", false)) return;
|
||||
rankings_view_["restore_scroll"] = false;
|
||||
if (auto *list = element("rankings-list")) {
|
||||
const auto key = list->GetAttribute<Rml::String>("data-scroll-key", "");
|
||||
const auto values = rankings_view_.value("scrolls", Json::object());
|
||||
if (auto it = values.find(key); it != values.end() && it->is_number())
|
||||
list->SetScrollTop(it->get<float>());
|
||||
}
|
||||
}
|
||||
std::string App::render_scorers() {
|
||||
rankings_remember_scroll();
|
||||
const auto snapshot = snap();
|
||||
const auto club = manager(snapshot).value("club", "");
|
||||
if (!rankings_view_.is_object()) rankings_view_ = Json::object();
|
||||
if (!rankings_view_.contains("league")) rankings_view_["league"] = rankings_league(*world_, snapshot.state, club);
|
||||
const auto league_id = rankings_view_.value("league", std::string());
|
||||
const int scope = std::clamp(rankings_view_.value("scope", 0), 0, 1),
|
||||
kind = std::clamp(rankings_view_.value("tab", 0), 0, 3);
|
||||
rankings_view_["scope"] = scope; rankings_view_["tab"] = kind;
|
||||
const auto *league = world_->find("competitions", league_id),
|
||||
*own = world_->find("clubs", club);
|
||||
const auto title = scope ? (own ? world_->name(*own) : "—")
|
||||
: (league ? world_->name(*league) : "—");
|
||||
const auto nation = scope ? (own ? own->value("nation", "") : "")
|
||||
: (league ? league->value("nation", "") : "");
|
||||
const auto rows = demo_scorer_rows(*world_, league_id, club, scope, kind);
|
||||
const auto key = "scorers:" + league_id + ":" + std::to_string(scope) + ":" + std::to_string(kind);
|
||||
const auto player_button = [&](const Json &r, bool leader) {
|
||||
const auto id = r.at("player").get<std::string>();
|
||||
const double size = leader ? 126 : 88;
|
||||
const auto image = "<span class=\"rankings-photo\" style=\"width:" + scalar(size) +
|
||||
"dp;height:" + scalar(size) + "dp;\">" + img(r.at("photo").get<std::string>(), size, size, true, true, 256) + "</span>";
|
||||
return btn("player-detail", image + "<span class=\"rankings-player-name\">" + esc(r.at("name").get<std::string>()) + "</span>",
|
||||
"rankings-player-button", "id=\"rankings-player-" + esc(id) + "\" data-id=\"" + esc(id) +
|
||||
"\" data-club=\"" + esc(r.at("club").get<std::string>()) + "\" title=\"" + esc(r.at("name").get<std::string>()) + "\"");
|
||||
};
|
||||
const auto club_button = [&](const Json &r, bool leader) {
|
||||
const auto id = r.at("club").get<std::string>();
|
||||
return btn("club-detail", label(world_->find("clubs", id), leader ? 34 : 42), "rankings-club-button " + std::string(id == club ? "current" : ""),
|
||||
"id=\"rankings-club-" + esc(r.at("player").get<std::string>()) + "\" data-id=\"" + esc(id) + "\"");
|
||||
};
|
||||
std::string out = "<section class=\"rankings-scorers kind-" + std::to_string(kind) + "\"><header class=\"rankings-heading\"><div><h2>" + esc(title) +
|
||||
"</h2><span>" + esc(world_->nation_name(nation)) + " · Saison " + esc(rankings_season(snapshot.state, *world_)) +
|
||||
"</span></div><p>Spielwerte fiktiv</p></header><nav class=\"rankings-tabs\" role=\"tablist\" aria-label=\"Spielerstatistik auswählen\">";
|
||||
for (int i = 0; i < 4; ++i) {
|
||||
const auto icon = i < 2 ? picture(renderer_.diagram("rankings-icon-" + std::to_string(i) + "-" + theme_, rankings_icon(i, theme_ == "silver" ? "#233443" : theme_ == "matchday" ? "#efeded" : "#b9cddd"), 102), 34, 34)
|
||||
: "<span class=\"rankings-card-icon " + std::string(i == 2 ? "yellow" : "red") + "\"></span>";
|
||||
out += btn("rankings-tab", "<span class=\"rankings-tab-icon\">" + icon + "</span><span>" + rankings_categories[size_t(i)] + "</span><span class=\"rankings-tab-underline\"></span>", "rankings-tab",
|
||||
"id=\"player-stat-tab-" + std::to_string(i) + "\" data-kind=\"" + std::to_string(i) + "\" role=\"tab\" aria-selected=\"" +
|
||||
std::string(kind == i ? "true" : "false") + "\" aria-controls=\"rankings-panel\" style=\"tab-index:" + (kind == i ? "auto" : "none") + ";\"");
|
||||
}
|
||||
out += "</nav><div id=\"rankings-panel\" class=\"rankings-panel\" role=\"tabpanel\" aria-labelledby=\"player-stat-tab-" + std::to_string(kind) + "\"><div class=\"rankings-leaders\" aria-label=\"Spitzenreiter\">";
|
||||
for (size_t i = 0; i < std::min(size_t(3), rows.size()); ++i) {
|
||||
const auto &r = rows[i];
|
||||
out += "<article class=\"rankings-leader " + std::string(i == 0 ? "first" : "") + "\" data-rank=\"" + r.at("rank").dump() + "\" data-value=\"" + r.at("value").dump() + "\"><span class=\"rankings-leader-rank\">" + r.at("rank").dump() + ".</span><div class=\"rankings-leader-person\">" + player_button(r, true) + club_button(r, true) + "</div><div class=\"rankings-leader-value\"><strong>" + r.at("value").dump() + "</strong><span>" + rankings_categories[size_t(kind)] + "</span></div></article>";
|
||||
}
|
||||
out += "</div><div id=\"rankings-list\" class=\"rankings-scorer-list\" data-scroll-key=\"" + esc(key) + "\"><div class=\"rankings-table\" role=\"table\"><div class=\"rankings-row rankings-head\" role=\"row\"><div>" + rankings_cell_text("Spieler") + "</div><div>" + rankings_cell_text("Verein") + "</div><div>" + rankings_cell_text(rankings_categories[size_t(kind)]) + "</div></div>";
|
||||
for (size_t i = 3; i < rows.size(); ++i) {
|
||||
const auto &r = rows[i];
|
||||
out += "<div class=\"rankings-row " + std::string(i % 2 ? "striped" : "") + "\" role=\"row\" data-rank=\"" + r.at("rank").dump() + "\" data-value=\"" + r.at("value").dump() + "\"><div class=\"rankings-rest-player\"><span class=\"rankings-rank\">" + r.at("rank").dump() + ".</span>" + player_button(r, false) + "</div><div>" + club_button(r, false) + "</div><div>" + rankings_cell_text(r.at("value").dump()) + "</div></div>";
|
||||
}
|
||||
if (rows.empty()) out += "<p class=\"rankings-empty\">" + rankings_cell_text("Keine Spieler mit Einträgen in dieser Kategorie.") + "</p>";
|
||||
out += "</div></div></div><nav class=\"report-footer rankings-footer\">";
|
||||
if (!scope) out += report_picker("country", 0, 854.666667) + report_picker("league", 878.666667, 854.666667);
|
||||
else out += "<span class=\"rankings-own-club\">" + label(own, 42) + "</span>";
|
||||
out += report_picker("scorer-scope", scope ? 1749.333333 : 1757.333333, scope ? 862.666667 : 854.666667);
|
||||
rankings_view_["restore_scroll"] = true;
|
||||
return out + "</nav></section>" + render_report_detail();
|
||||
}
|
||||
|
||||
std::string App::render_fairplay() {
|
||||
rankings_remember_scroll();
|
||||
const auto rows = demo_fairplay_rows(*world_);
|
||||
std::string out = "<section class=\"rankings-fairplay\"><header class=\"rankings-fair-heading\"><p>Strafpunkte · weniger ist besser</p><div><span class=\"rankings-yellow\">Gelb · 1 Punkt</span><span class=\"rankings-red\">Rot · 4 Punkte</span></div></header><div id=\"rankings-list\" class=\"rankings-fair-list\" data-scroll-key=\"fairplay\"><div class=\"rankings-table\" role=\"table\"><div class=\"rankings-fair-row rankings-head\" role=\"row\"><div>" + rankings_cell_text("Pl. / Verein") + "</div><div>" + rankings_cell_text("Gelb") + "</div><div>" + rankings_cell_text("Rot") + "</div><div>" + rankings_cell_text("Punkte") + "</div></div>";
|
||||
for (size_t i = 0; i < rows.size(); ++i) {
|
||||
const auto &r = rows[i];
|
||||
out += "<div class=\"rankings-fair-row " + std::string(i % 2 == 0 ? "striped" : "") + "\" role=\"row\" data-points=\"" + r.at("points").dump() + "\"><div><span class=\"rankings-fair-rank\">" + r.at("rank").dump() + ".</span>" + report_club_button(r.at("club").get<std::string>()) + "</div><div>" + rankings_cell_text(r.at("yellow").dump()) + "</div><div>" + rankings_cell_text(r.at("red").dump()) + "</div><div>" + rankings_cell_text(r.at("points").dump()) + "</div></div>";
|
||||
}
|
||||
if (rows.empty()) out += "<p class=\"rankings-empty\">" + rankings_cell_text("Keine Vereine in der deutschen Ligavorschau.") + "</p>";
|
||||
rankings_view_["restore_scroll"] = true;
|
||||
return out + "</div></div></section>" + render_report_detail();
|
||||
}
|
||||
@@ -2,11 +2,11 @@
|
||||
namespace {
|
||||
bool report_picker_menu(const std::string &menu) {
|
||||
return menu == "tables" || menu == "strengths" || menu == "league" ||
|
||||
menu == "other" || menu == "calendar" || menu == "friendlies" || menu == "almanac";
|
||||
menu == "other" || menu == "calendar" || menu == "friendlies" || menu == "almanac" || menu == "scorers";
|
||||
}
|
||||
bool report_picker_kind(const std::string &kind) {
|
||||
return kind == "country" || kind == "league" || kind == "filter" ||
|
||||
kind == "competition" || kind == "year";
|
||||
kind == "competition" || kind == "year" || kind == "scorer-scope";
|
||||
}
|
||||
} // namespace
|
||||
|
||||
@@ -15,6 +15,11 @@ App::report_picker_items(const std::string &kind) const {
|
||||
std::vector<std::pair<std::string, std::string>> items;
|
||||
if (!world_ || !report_picker_kind(kind))
|
||||
return items;
|
||||
if (kind == "scorer-scope") {
|
||||
if (menu_ == "scorers")
|
||||
items = {{"0", "Gesamte Liga"}, {"1", "Eigener Verein"}};
|
||||
return items;
|
||||
}
|
||||
if (kind == "year") {
|
||||
if (!source_) return items;
|
||||
const auto index = source_->read_almanac({{"kind", "index"}});
|
||||
@@ -66,6 +71,13 @@ std::string App::report_picker_value(const std::string &kind) const {
|
||||
if (!world_ || !report_picker_kind(kind))
|
||||
return {};
|
||||
if (kind == "year") return std::to_string(almanac_year_);
|
||||
if (menu_ == "scorers") {
|
||||
if (kind == "scorer-scope") return std::to_string(rankings_view_.value("scope", 0));
|
||||
const auto league = rankings_view_.value("league", "");
|
||||
if (kind == "league") return league;
|
||||
const auto *row = world_->find("competitions", league);
|
||||
return row ? row->value("nation", "") : "";
|
||||
}
|
||||
const auto reports = snap().state.at("reports");
|
||||
if (kind == "filter" || kind == "competition")
|
||||
return std::to_string(reports.at(kind).get<int>());
|
||||
@@ -92,7 +104,7 @@ std::string App::report_picker(const std::string &kind, double left,
|
||||
const bool open = report_picker_ == kind;
|
||||
const std::string menu_label = kind == "country" ? "Land"
|
||||
: kind == "league" ? "Liga"
|
||||
: kind == "filter" ? "Spiele" : kind == "year" ? "Kalenderjahr" : "Wettbewerb";
|
||||
: kind == "filter" ? "Spiele" : kind == "year" ? "Kalenderjahr" : kind == "scorer-scope" ? "Bereich" : "Wettbewerb";
|
||||
std::string out =
|
||||
"<div class=\"report-picker-wrapper\" data-report-picker=\"" + kind +
|
||||
"\" style=\"left:" + scalar(left) + "dp;width:" + scalar(width) + "dp;\">" +
|
||||
@@ -191,6 +203,10 @@ bool App::report_picker_action(const std::string &action, Rml::Element *target)
|
||||
almanac_day_.clear();
|
||||
almanac_match_.clear();
|
||||
almanac_tab_ = "lineups";
|
||||
} else if (menu_ == "scorers") {
|
||||
const auto ranking_action_name = kind == "country" ? "rankings-country"
|
||||
: kind == "league" ? "rankings-league" : "rankings-scope";
|
||||
rankings_action(ranking_action_name, target);
|
||||
} else if (menu_ == "friendlies")
|
||||
apply("calendar", {{"kind", "friendly-" + kind}, {"value", selection}});
|
||||
else if (menu_ == "calendar") {
|
||||
|
||||
@@ -887,6 +887,14 @@ std::string App::render_menu(const std::string &key) {
|
||||
body = render_lineup();
|
||||
else if (key == "transfer")
|
||||
body = render_transfer();
|
||||
else if (key == "achievements")
|
||||
body = render_achievements();
|
||||
else if (key == "scorers")
|
||||
body = render_scorers();
|
||||
else if (key == "fairplay")
|
||||
body = render_fairplay();
|
||||
else if (key == "highscore")
|
||||
body = render_highscore();
|
||||
else if (key == "environment")
|
||||
body = render_environment();
|
||||
else if (key == "advertising")
|
||||
|
||||
+23
-3
@@ -14,6 +14,8 @@
|
||||
#include "modern/ui/demo_sports.hpp"
|
||||
#include "modern/ui/demo_lineup.hpp"
|
||||
#include "modern/ui/demo_transfer.hpp"
|
||||
#include "modern/ui/demo_career_reports.hpp"
|
||||
#include "modern/ui/demo_rankings.hpp"
|
||||
#include "modern/ui/desktop.hpp"
|
||||
#include "modern/ui/gui_assets.hpp"
|
||||
#include "modern/ui/model.hpp"
|
||||
@@ -99,7 +101,7 @@ const std::array<std::string, 32> titles = {"Tabellen",
|
||||
"Stadion",
|
||||
"Statistiken",
|
||||
"Umfeld",
|
||||
"Fairplay",
|
||||
"Fairplaywertung",
|
||||
"Highscore",
|
||||
"Verträge",
|
||||
"Bilanz",
|
||||
@@ -366,6 +368,7 @@ class App final : public Rml::EventListener {
|
||||
std::string transfer_dialog_, transfer_return_focus_, transfer_notice_, transfer_poach_league_, transfer_poach_club_, transfer_picker_;
|
||||
uint64_t transfer_revision_ = 0;
|
||||
std::shared_ptr<const Catalog> transfer_world_;
|
||||
Json career_view_ = Json::object(), rankings_view_ = Json::object();
|
||||
float device_ratio_ = 1.f;
|
||||
Json desktop_ = Json::object(), saved_desktop_ = Json::object(),
|
||||
options_ = Json::object();
|
||||
@@ -584,6 +587,7 @@ class App final : public Rml::EventListener {
|
||||
transfer_view_ = Json::object(); transfer_draft_ = transfer_search_draft_ = Json();
|
||||
transfer_dialog_.clear(); transfer_picker_.clear(); transfer_notice_.clear(); transfer_return_focus_.clear();
|
||||
transfer_poach_league_.clear(); transfer_poach_club_.clear(); transfer_world_.reset(); transfer_revision_ = 0;
|
||||
career_view_ = Json::object(); rankings_view_ = Json::object();
|
||||
advertising_selected_ = -1; advertising_offer_ = 0; advertising_revision_ = 0; advertising_world_.reset();
|
||||
toto_column_ = 0; toto_dialog_.clear();
|
||||
for (auto &focus : toto_focus_) focus = {0, 1};
|
||||
@@ -744,6 +748,16 @@ class App final : public Rml::EventListener {
|
||||
void close_transfer(bool restore = true);
|
||||
void transfer_remember_scroll();
|
||||
void transfer_restore_scroll();
|
||||
std::string render_achievements();
|
||||
std::string render_highscore();
|
||||
bool career_report_action(const std::string &, Rml::Element *);
|
||||
bool career_report_event(Rml::Event &);
|
||||
std::string render_scorers();
|
||||
std::string render_fairplay();
|
||||
bool rankings_action(const std::string &, Rml::Element *);
|
||||
bool rankings_event(Rml::Event &);
|
||||
void rankings_remember_scroll();
|
||||
void rankings_restore_scroll();
|
||||
std::string render_almanac();
|
||||
bool almanac_action(const std::string &, Rml::Element *);
|
||||
std::string render_indoor();
|
||||
@@ -818,6 +832,7 @@ class App final : public Rml::EventListener {
|
||||
// open. Never keep that menu's modal/input gate in the destination view.
|
||||
if (menu_ != last_rendered_menu_) {
|
||||
planning_dialog_.clear();
|
||||
career_view_["dialog"] = ""; career_view_["return_focus"] = "";
|
||||
lineup_drag_ = Json(); lineup_drag_world_.reset(); lineup_ignore_click_ = false;
|
||||
transfer_dialog_.clear(); transfer_draft_ = transfer_search_draft_ = Json(); transfer_picker_.clear();
|
||||
transfer_world_.reset(); transfer_revision_ = 0; transfer_return_focus_.clear();
|
||||
@@ -871,10 +886,10 @@ class App final : public Rml::EventListener {
|
||||
setting_menu_markup_ = true;
|
||||
element("canvas")->SetInnerRML(markup);
|
||||
setting_menu_markup_ = false;
|
||||
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty()) {
|
||||
if (!report_detail_kind_.empty() || !planning_dialog_.empty() || !contracts_dialog_.empty() || !toto_dialog_.empty() || !transfer_dialog_.empty() || !career_view_.value("dialog", "").empty()) {
|
||||
Rml::ElementList behind;
|
||||
doc_->QuerySelectorAll(behind,
|
||||
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,.window .titlebar button");
|
||||
"#report-underlay button,#report-underlay input,#report-underlay select,#contracts-underlay button,#toto-underlay button,#lineup-underlay button,#lineup-underlay select,#lineup-underlay input,#transfer-underlay button,#transfer-underlay select,#transfer-underlay input,#career-report-underlay button,#career-report-underlay input,#career-report-underlay select,.rankings-scorers button,.rankings-scorers select,.rankings-fairplay button,.window .titlebar button");
|
||||
for (auto *node : behind)
|
||||
node->SetProperty("pointer-events", "none");
|
||||
}
|
||||
@@ -1026,6 +1041,7 @@ class App final : public Rml::EventListener {
|
||||
lineup_roster_scroll_.reset();
|
||||
}
|
||||
if (menu_ == "transfer") transfer_restore_scroll();
|
||||
if (menu_ == "scorers" || menu_ == "fairplay") rankings_restore_scroll();
|
||||
if (!report_option_to_scroll_.empty()) {
|
||||
if (auto *node = element(report_option_to_scroll_))
|
||||
node->ScrollIntoView(Rml::ScrollIntoViewOptions(Rml::ScrollAlignment::Nearest));
|
||||
@@ -1296,6 +1312,10 @@ public:
|
||||
#include "modern/ui/lineup_controls.inc"
|
||||
#include "modern/ui/transfer_screens.inc"
|
||||
#include "modern/ui/transfer_controls.inc"
|
||||
#include "modern/ui/career_report_screens.inc"
|
||||
#include "modern/ui/career_report_controls.inc"
|
||||
#include "modern/ui/rankings_screens.inc"
|
||||
#include "modern/ui/rankings_controls.inc"
|
||||
} // namespace
|
||||
bool is_modern_world(const fs::path &file) {
|
||||
try {
|
||||
|
||||
Reference in new issue
Block a user