From 968f6f411ba923fb64b7e40eb558b7633997061d Mon Sep 17 00:00:00 2001 From: Philip Schell Date: Wed, 28 Aug 2019 12:51:16 +0200 Subject: [PATCH] Tiny Weather fixes --- Lora-Map/Lora-Map.csproj | 3 +++ Lora-Map/Model/WeatherWarnings.cs | 2 +- Lora-Map/resources/css/global.css | 7 +++++++ Lora-Map/resources/css/icons/filter.png | Bin 0 -> 848 bytes Lora-Map/resources/index.html | 1 + Lora-Map/resources/js/menu.js | 10 ++++++++-- 6 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 Lora-Map/resources/css/icons/filter.png diff --git a/Lora-Map/Lora-Map.csproj b/Lora-Map/Lora-Map.csproj index 956e965..af91716 100644 --- a/Lora-Map/Lora-Map.csproj +++ b/Lora-Map/Lora-Map.csproj @@ -102,6 +102,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/Lora-Map/Model/WeatherWarnings.cs b/Lora-Map/Model/WeatherWarnings.cs index 4b855bf..7050318 100644 --- a/Lora-Map/Model/WeatherWarnings.cs +++ b/Lora-Map/Model/WeatherWarnings.cs @@ -50,7 +50,7 @@ namespace Fraunhofer.Fit.IoT.LoraMap.Model { this.From = warning["properties"]["SENT"].ToString(); this.To = warning["properties"]["EXPIRES"].ToString(); this.Location = warning["properties"]["NAME"].ToString(); - this.Type = warning["properties"]["EVENT"].ToString(); + this.Type = warning["properties"]["EVENT"].ToString().ToLower(); this.Level = warning["properties"]["SEVERITY"].ToString().ToLower(); this.Headline = warning["properties"]["HEADLINE"].ToString(); this.Body = warning["properties"]["DESCRIPTION"].ToString(); diff --git a/Lora-Map/resources/css/global.css b/Lora-Map/resources/css/global.css index 24f1a65..02e9a0f 100644 --- a/Lora-Map/resources/css/global.css +++ b/Lora-Map/resources/css/global.css @@ -59,6 +59,9 @@ object { #menucollumn .pos { background-image: url("icons/placeholder.png"); } +#menucollumn .filter { + background-image: url("icons/filter.png"); +} #menucollumn .admin { background-image: url("icons/admin-with-cogwheels.png"); } @@ -220,6 +223,7 @@ margin: 4px; } #pannels #pannels_weather .alertitem { padding: 5px; + margin-bottom: 10px; } #pannels #pannels_weather .alertitem.minor { background-color: #ffeb3b; @@ -233,6 +237,9 @@ margin: 4px; #pannels #pannels_weather .alertitem.extreme { background-color: #880e4f; } +#pannels #pannels_weather .alertitem.hitze { + background-color: #c9f; +} #pannels #pannels_weather .alertitem .head { font-weight: bold; display: block; diff --git a/Lora-Map/resources/css/icons/filter.png b/Lora-Map/resources/css/icons/filter.png new file mode 100644 index 0000000000000000000000000000000000000000..18842766ee5168aa80b6c92807b5e8e3c7aff109 GIT binary patch literal 848 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50 z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-GzZ+Rj;xUkjGiz z5n0T@z;^_M8K-LVNdpDhOFVsD*&lPr@Gu%UB+qyZ)FkKW;uzv_eD9UmjJ`w(_7C%O z&751#)SRi9Rb$%wGvn06sgD|_FyC(Mm-U#V@G10kqwwM$;r5^?>wr&1O*LX?)uhwaeBq6yh1r&4Y&jPFjHy!GLpIU6_@eYhv_d1J_S zz74UZ5iIv>q?OhdO7~yQ{BTI=w@{DM=EKZ-ax(tg15ZB4X({~{VP;|f(rd;+p3u&V zRq-`f-hY{plHMxK^CV%4XXi!BREfuK!1`r}`C1Y8Is%OnkZF zLh8@Be>#^K#IiSBe(P~DdT&v!==7%x!(RVi60)3Um)P`>2P?{c?w@y3zvs$>Zrw~J zjcXaJcNJV>vegQ{XXicn^hyr*8YAVS{|s}NEwNkZs8h7vWxnsFgn92eY*MoOc2yhk zy$BH4RCkBH^048Fg8N^W{5l|1YsTl!S6s?pIn{FBZi5)hH(xDR^3T7Jl_XK<(&E^* zyXej#V{zT@2iU?7cgz%IE6kUB=`Z2Jy52=gvtMU^jOXE6 z^P{|Z>Z`p$E1tbij#gb4xPQi{6G_WmCYGhMMWvh6G58rS3J6-;&<;#IswJ)wB`Jv| zsaDBFsX&Us$iUE2*T6#8$Rfnhz{(yEr+qAXP8FD1G)j8!4b722WQ%mvv4FO#ry5UBLhV literal 0 HcmV?d00001 diff --git a/Lora-Map/resources/index.html b/Lora-Map/resources/index.html index d04c16c..a8ca4c2 100644 --- a/Lora-Map/resources/index.html +++ b/Lora-Map/resources/index.html @@ -54,6 +54,7 @@
  • Freepik licensed CC 3.0 BY
  • Silk Iconset licensed CC 2.5 BY
  • Those Icons licensed by CC 3.0 BY
    • +
  • Freepik licensed by CC 3.0 BY
    • diff --git a/Lora-Map/resources/js/menu.js b/Lora-Map/resources/js/menu.js index 4140b23..325a1c7 100644 --- a/Lora-Map/resources/js/menu.js +++ b/Lora-Map/resources/js/menu.js @@ -169,11 +169,17 @@ var html = ""; for (var i = 0; i < json.length; i++) { var walert = json[i]; - html += "
    " + + html += "
    " + "" + walert.Headline + "" + "" + walert.Location + "" + "" + walert.Body + (walert.Instructions != "" ? "

    " + walert.Instructions : "") + "    " + - "Von: vor " + FunctionsObject.TimeCalculation(walert.From, "difftext") + " Bis: in " + FunctionsObject.TimeCalculation(walert.To, "difftextn") + "" + + "Von: "; + if (FunctionsObject.TimeCalculation(walert.From, "diffraw") < 0) { + html += "in " + FunctionsObject.TimeCalculation(walert.From, "difftextn"); + } else { + html += "vor " + FunctionsObject.TimeCalculation(walert.From, "difftext"); + } + html += " Bis: in " + FunctionsObject.TimeCalculation(walert.To, "difftextn") + "" + "
    "; } document.getElementById("pannels_weather").innerHTML = html;