Bind the tablet to real mailbox states and engine press events (by Codex)
This commit is contained in:
1 parent
0fc26624d9
commit
256d6d5211
15 files changed
+633
-44
No files matched your search
@@ -1,8 +1,10 @@
|
||||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
namespace {std::string news_body_markup(const std::string &text){auto value=esc(text);size_t at=0;while((at=value.find('\n',at))!=std::string::npos){value.replace(at,1,"<br/>");at+=5;}return value;}}
|
||||
std::string App::render_news_art(const Json &message, double size) {
|
||||
const auto kind = message.at("kind").get<std::string>();
|
||||
std::string art;
|
||||
if (kind == "national" ||
|
||||
if(kind=="mail")art=glyph("mail",size*.65);
|
||||
else if (kind == "national" ||
|
||||
(message.contains("scope") &&
|
||||
message.at("scope").value("kind", "") == "national"))
|
||||
art = picture(
|
||||
@@ -11,7 +13,7 @@ std::string App::render_news_art(const Json &message, double size) {
|
||||
else if (kind == "club" || kind == "career") {
|
||||
const auto id =
|
||||
message.value("scope", Json::object()).value("id", std::string());
|
||||
art = crest(snap().world->find("clubs", id), size * .69);
|
||||
art = crest(world_->find("clubs", id), size * .69);
|
||||
if (art.empty())
|
||||
art = glyph("world", size * .55);
|
||||
} else {
|
||||
@@ -33,8 +35,8 @@ std::string App::render_news_feed(const Json &data) {
|
||||
for (const auto &m : data.at("items")) {
|
||||
const auto id = m.at("id").get<std::string>(),
|
||||
name = m.at("title").get<std::string>();
|
||||
const bool unread = !m.at("read").get<bool>(),
|
||||
archived = m.at("folder") == "archive";
|
||||
const bool unread = m.at("read").is_boolean() && !m.at("read").get<bool>(),
|
||||
archived = m.at("folder") == "archive" || (engine_mode_&&m.at("folder")=="trash");
|
||||
out += "<div id=\"news-row-" + id + "\" class=\"news-message" +
|
||||
(unread ? " is-unread" : "") + "\">";
|
||||
if (unread)
|
||||
@@ -68,11 +70,11 @@ std::string App::render_news_feed(const Json &data) {
|
||||
: "Archivieren: ") +
|
||||
esc(name) + "\" title=\"" +
|
||||
std::string(archived ? "Ins Postfach verschieben" : "Archivieren") +
|
||||
"\"");
|
||||
"\" " + std::string(engine_mode_&&m.value("mutable",false)==false?"disabled":""));
|
||||
out += btn("news-delete", glyph("trash", 36), "news-icon-button",
|
||||
"id=\"news-delete-" + id + "\" data-id=\"" + id +
|
||||
"\" aria-label=\"Löschen: " + esc(name) +
|
||||
"\" title=\"Löschen\"");
|
||||
"\" title=\"Löschen\" " + std::string(engine_mode_&&(m.value("mutable",false)==false||m.at("folder")=="trash")?"disabled":""));
|
||||
out += "</div></div>";
|
||||
}
|
||||
if (out.empty()) {
|
||||
@@ -104,27 +106,23 @@ std::string App::render_news_detail(const Json &message) {
|
||||
esc(message.at("category").get<std::string>()) + "</p><p>" +
|
||||
esc(message.at("display_date").get<std::string>()) +
|
||||
"</p></div></div><p class=\"news-detail-body\">" +
|
||||
esc(message.at("body").get<std::string>()) +
|
||||
"</p><small>Fiktive Meldung für den "
|
||||
"Oberflächen-Prototyp.</small></div><div "
|
||||
(engine_mode_?news_body_markup(message.at("body").get<std::string>()):esc(message.at("body").get<std::string>())) +
|
||||
"</p><small>" + std::string(engine_mode_?(message.value("source",std::string())=="mail"?"Aus dem Spielpostfach":"Bericht aus dem Almanach"):"Fiktive Meldung für den Oberflächen-Prototyp.") + "</small></div><div "
|
||||
"class=\"news-detail-actions\">" +
|
||||
btn("news-detail-close", "Schließen", {}, "id=\"news-detail-close\"") +
|
||||
btn("news-detail-move",
|
||||
message.at("folder") == "archive" ? "Ins Postfach" : "Archivieren",
|
||||
{}, "id=\"news-detail-move\"") +
|
||||
(message.at("folder") == "archive" || (engine_mode_&&message.at("folder")=="trash")) ? "Ins Postfach" : "Archivieren",
|
||||
{}, "id=\"news-detail-move\" " + std::string(engine_mode_&&message.value("mutable",false)==false?"disabled":"")) +
|
||||
"</div></div></div>";
|
||||
}
|
||||
std::string App::render_news() {
|
||||
const auto s = snap();
|
||||
if (news_world_ != s.world || news_source_ != source_.get()) {
|
||||
const auto s = engine_mode_?Snapshot{}:snap();
|
||||
if (!engine_mode_ && (news_world_ != s.world || news_source_ != source_.get())) {
|
||||
reset_news();
|
||||
news_world_ = s.world;
|
||||
news_source_ = source_.get();
|
||||
}
|
||||
const auto data = demo_news_view(
|
||||
*s.world, s.state, news_view_.value("folder", "inbox"),
|
||||
news_view_.value("query", ""),
|
||||
ui_preferences_.at("display").value("language", std::string("de")));
|
||||
const auto data = news_data(news_view_.value("folder","inbox"),news_view_.value("query",""));
|
||||
if (!data.value("ok", false))
|
||||
return window("Nachrichten",
|
||||
"<p>Das Nachrichtenpostfach ist nicht verfügbar.</p>");
|
||||
@@ -142,15 +140,15 @@ std::string App::render_news() {
|
||||
? picture(renderer_.diagram("news-header-national",
|
||||
ui_nation_flag_svg("de"), 176),
|
||||
88, 59)
|
||||
: crest(s.world->find("clubs", data.value("club", std::string())),
|
||||
: crest(world_->find("clubs", data.value("club", std::string())),
|
||||
88)) +
|
||||
"</div></div>";
|
||||
content += "<div class=\"news-navigation\"><div class=\"news-tabs\" "
|
||||
"role=\"tablist\" aria-label=\"Postfach und Archiv\">";
|
||||
for (const auto &f : {std::string("inbox"), std::string("archive")})
|
||||
for (const auto &f : (engine_mode_?std::vector<std::string>{"inbox","archive","trash"}:std::vector<std::string>{"inbox","archive"}))
|
||||
content +=
|
||||
btn("news-folder",
|
||||
"<span>" + std::string(f == "inbox" ? "Postfach" : "Archiv") +
|
||||
"<span>" + std::string(f == "inbox" ? "Postfach" : f=="archive"?"Archiv":"Papierkorb") +
|
||||
"</span><span class=\"news-tab-count\">" +
|
||||
std::to_string(data.at("counts").at(f).get<int>()) + "</span>",
|
||||
std::string("news-tab ") + (folder == f ? "active" : ""),
|
||||
@@ -188,19 +186,18 @@ std::string App::render_news() {
|
||||
(data.at("unbound_count").get<size_t>() == 1
|
||||
? " Altbestand ohne Besitzerbeleg unverändert erhalten"
|
||||
: " Altbestände ohne Besitzerbeleg unverändert erhalten"));
|
||||
if(engine_mode_&&!data.at("unsupported").empty())content+=esc(" · "+std::to_string(data.at("unsupported").size())+" weitere Berichte sind noch nicht aufbereitet");
|
||||
content += "</p>" +
|
||||
btn("news-undo", glyph("undo", 32) + "<span>Rückgängig</span>",
|
||||
"news-undo",
|
||||
"id=\"news-undo\" style=\"display:" +
|
||||
std::string(news_undo_.is_array() && !news_undo_.empty()
|
||||
std::string((engine_mode_?engine_news_undo_.is_object():news_undo_.is_array() && !news_undo_.empty())
|
||||
? "flex"
|
||||
: "none") +
|
||||
";\"") +
|
||||
"</div></div>";
|
||||
if (!news_dialog_.empty()) {
|
||||
const auto all = demo_news_view(
|
||||
*s.world, s.state, folder, "",
|
||||
ui_preferences_.at("display").value("language", std::string("de")));
|
||||
const auto all = news_data(folder,"");
|
||||
const auto &items = all.at("items");
|
||||
const auto found =
|
||||
std::find_if(items.begin(), items.end(),
|
||||
@@ -215,9 +212,7 @@ std::string App::render_news() {
|
||||
btn("close", "<span>×</span>", "close",
|
||||
"id=\"window-close\" aria-label=\"Fenster schließen\"") +
|
||||
"<h1>Nachrichten</h1></div><div class=\"content\">" + content +
|
||||
"</div><div class=\"news-screen-footer\"><span>Fiktive "
|
||||
"Meldungen · Modern UI "
|
||||
"Demo</span><span>OpenBMH</span></div><div "
|
||||
"</div><div class=\"news-screen-footer\"><span>" + std::string(engine_mode_?"Dein Spieljournal":"Fiktive Meldungen · Modern UI Demo") + "</span><span>OpenBMH</span></div><div "
|
||||
"class=\"news-homebar\"></div></div>";
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user