diff --git a/MMM-covid19.css b/MMM-covid19.css index ed62d5e..1656429 100644 --- a/MMM-covid19.css +++ b/MMM-covid19.css @@ -7,6 +7,6 @@ text-align: right; } -.covid19 .new7 .good { color: darkgreen; } -.covid19 .new7 .warn { color: darkorange; } -.covid19 .new7 .bad { color: darkred; } +.covid19 .good { color: darkgreen; } +.covid19 .warn { color: darkorange; } +.covid19 .bad { color: darkred; } diff --git a/MMM-covid19.js b/MMM-covid19.js index 3c18de4..d4b4174 100644 --- a/MMM-covid19.js +++ b/MMM-covid19.js @@ -22,7 +22,6 @@ Module.register("MMM-covid19", { total: "N/A", death: "N/A", cured: "N/A", - trend: "N/A", ts: "N/A", }, @@ -78,19 +77,5 @@ Module.register("MMM-covid19", { this.cases.death = data[this.config.region]["tot"]; this.cases.cured = data[this.config.region]["gesund"]; this.cases.ts = data[this.config.region]["date"]; - - // determine trend: - // calc this and last weeks cases and substract - // result is the difference of new cases between this and last week - currentToLastWeekDiff = (data[this.config.region]["last_7"] * 2) - data[this.config.region]["last_14"] - if (currentToLastWeekDiff > 10) { - this.cases.trend = "bad"; - } else if (currentToLastWeekDiff > 0) { - this.cases.trend = "warn"; - } else if (currentToLastWeekDiff == 0) { - this.cases.trend = "even"; - } else if (currentToLastWeekDiff < 0) { - this.cases.trend = "good"; - } }, }); diff --git a/MMM-covid19.njk b/MMM-covid19.njk index f86560e..7cd3320 100644 --- a/MMM-covid19.njk +++ b/MMM-covid19.njk @@ -23,11 +23,10 @@ {% endif %}
- - Neu: {{ cases.new7 }} - ({{ cases.new7_100k }}) - {{ trend | safe }} + + Inzidenz: {{ cases.new7_100k }}
+ Neu: {{ cases.new7 }}
Aktiv: {{ cases.active }}
Gesamt: {{ cases.total }}
Tote: {{ cases.death }}
diff --git a/screenshot.png b/screenshot.png index 0f576f6..84333cf 100644 Binary files a/screenshot.png and b/screenshot.png differ