From 766140f483be96a95ac11c03e04b8bbd6f67a103 Mon Sep 17 00:00:00 2001 From: Kristof Rado Date: Thu, 28 May 2020 10:10:00 +0200 Subject: [PATCH 1/3] Ability to hide sun details --- modules/default/weather/current.njk | 18 ++++++++++-------- modules/default/weather/weather.js | 1 + 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/modules/default/weather/current.njk b/modules/default/weather/current.njk index 33dac07a..d89c5f53 100755 --- a/modules/default/weather/current.njk +++ b/modules/default/weather/current.njk @@ -22,14 +22,16 @@ {% if config.showHumidity and current.humidity %} {{ current.humidity | decimalSymbol }}  {% endif %} - - - {% if current.nextSunAction() === "sunset" %} - {{ current.sunset | formatTime }} - {% else %} - {{ current.sunrise | formatTime }} - {% endif %} - + {% if config.showSun %} + + + {% if current.nextSunAction() === "sunset" %} + {{ current.sunset | formatTime }} + {% else %} + {{ current.sunrise | formatTime }} + {% endif %} + + {% endif %} {% endif %}
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js index 868316d9..46485c7b 100644 --- a/modules/default/weather/weather.js +++ b/modules/default/weather/weather.js @@ -33,6 +33,7 @@ Module.register("weather",{ useBeaufort: true, lang: config.language, showHumidity: false, + showSun: true, degreeLabel: false, decimalSymbol: ".", showIndoorTemperature: false, From e6ef64968bc99b6f8ed30fb0f1a581bc78763a97 Mon Sep 17 00:00:00 2001 From: Kristof Rado Date: Sat, 30 May 2020 00:06:20 +0200 Subject: [PATCH 2/3] Disable Sunrise/Sunset in Config option --- tests/configs/modules/weather/currentweather_options.js | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/configs/modules/weather/currentweather_options.js b/tests/configs/modules/weather/currentweather_options.js index 2b5f9774..3c9021f5 100644 --- a/tests/configs/modules/weather/currentweather_options.js +++ b/tests/configs/modules/weather/currentweather_options.js @@ -28,6 +28,7 @@ let config = { initialLoadDelay: 3000, useBeaufort: false, showWindDirectionAsArrow: true, + showSun: false, showHumidity: true, roundTemp: true, degreeLabel: true From bb972f84495c74247584681a66ffe60be4237dcb Mon Sep 17 00:00:00 2001 From: Kristof Rado Date: Sat, 30 May 2020 00:11:14 +0200 Subject: [PATCH 3/3] Updated CHANGELOG.md --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 78a594e6..8fbc2928 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ _This release is scheduled to be released on 2020-07-01._ - Added prettier for an even cleaner codebase +- Hide Sunrise/Sunset in Weather module + ### Updated - Cleaned up alert module code