Port scoped National UI routes and isolated dummy planning (by Codex)
This commit is contained in:
1 parent
4fddecb06e
commit
1eb5e99847
19 files changed
+1075
-8
No files matched your search
@@ -4,6 +4,7 @@
|
||||
#include "modern/ui/demo_almanac.hpp"
|
||||
#include "modern/ui/demo_calendar.hpp"
|
||||
#include "modern/ui/demo_career.hpp"
|
||||
#include "modern/ui/demo_national_ui.hpp"
|
||||
#include "modern/ui/demo_environment.hpp"
|
||||
#include "modern/ui/demo_finance.hpp"
|
||||
#include "modern/ui/demo_lineup.hpp"
|
||||
@@ -233,6 +234,7 @@ DemoSource::DemoSource(std::shared_ptr<const Catalog> catalog)
|
||||
throw editor::Error("Ungültige Saisonvorbereitung.");
|
||||
if (!migrate_demo_career(state_, *catalog_))
|
||||
throw editor::Error("invalid_demo_career");
|
||||
if(!migrate_national_ui(state_))throw editor::Error("invalid_demo_national");
|
||||
saved_ = state_;
|
||||
}
|
||||
Snapshot DemoSource::snapshot() const { return {revision_, catalog_, state_}; }
|
||||
@@ -251,7 +253,8 @@ ActionResult DemoSource::apply(const Action &action) {
|
||||
if(state_.value("career",Json::object()).value("ended",false)&&action.kind!="start")return {false,revision_,"career_ended"};
|
||||
auto next = state_;
|
||||
try {
|
||||
if (action.kind == "career") {
|
||||
if(action.kind=="national"){const auto error=edit_national_ui(next,action.value);if(!error.empty())return {false,revision_,error};
|
||||
} else if (action.kind == "career") {
|
||||
const auto previous_club = demo_career_manager(next).value("club", "");
|
||||
const auto old_view = demo_career_view(next);
|
||||
const auto error = edit_demo_career(next, action.value, *catalog_);
|
||||
@@ -552,6 +555,7 @@ Json DemoSource::load_data(Json data, bool saved) {
|
||||
throw editor::Error("invalid_demo_settings");
|
||||
if (!migrate_demo_opening(data, *catalog_))
|
||||
throw editor::Error("Ungültige oder inkonsistente Saisonvorbereitung.");
|
||||
if(!migrate_national_ui(data))throw editor::Error("invalid_demo_national");
|
||||
for (const auto &[id,view]:data.at("career_views").items()) {
|
||||
auto probe=data;probe["career_views"]=Json::object();probe["desktop"]=default_desktop();
|
||||
probe["managers"]=Json::array({{{"name","Vorschau"},{"club",id},{"portrait",0}}});
|
||||
|
||||
Reference in new issue
Block a user