kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-03 22:36:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2032 from radokristof/weather-module

Browse Source 
[weather] Ability to hide sun details
This commit is contained in:
Michael Teeuw 2020-06-02 09:15:31 +02:00 committed by GitHub
commit 5f2c465274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -15,6 +15,8 @@ _This release is scheduled to be released on 2020-07-01._
- Added prettier for an even cleaner codebase - Added prettier for an even cleaner codebase
- Hide Sunrise/Sunset in Weather module
### Updated ### Updated
- Cleaned up alert module code - Cleaned up alert module code

2
modules/default/weather/current.njk
View File

@ -22,6 +22,7 @@
{% if config.showHumidity and current.humidity %} {% if config.showHumidity and current.humidity %}
<span>{{ current.humidity | decimalSymbol }}</span><sup>&nbsp;<i class="wi wi-humidity humidityIcon"></i></sup> <span>{{ current.humidity | decimalSymbol }}</span><sup>&nbsp;<i class="wi wi-humidity humidityIcon"></i></sup>
{% endif %} {% endif %}
{% if config.showSun %}
<span class="wi dimmed wi-{{ current.nextSunAction() }}"></span> <span class="wi dimmed wi-{{ current.nextSunAction() }}"></span>
<span> <span>
{% if current.nextSunAction() === "sunset" %} {% if current.nextSunAction() === "sunset" %}
@ -30,6 +31,7 @@
{{ current.sunrise | formatTime }} {{ current.sunrise | formatTime }}
{% endif %} {% endif %}
</span> </span>
{% endif %}
</div> </div>
{% endif %} {% endif %}
<div class="large light"> <div class="large light">

1
modules/default/weather/weather.js
View File

@ -31,6 +31,7 @@ Module.register("weather", {
useBeaufort: true, useBeaufort: true,
lang: config.language, lang: config.language,
showHumidity: false, showHumidity: false,
showSun: true,
degreeLabel: false, degreeLabel: false,
decimalSymbol: ".", decimalSymbol: ".",
showIndoorTemperature: false, showIndoorTemperature: false,

1
tests/configs/modules/weather/currentweather_options.js
View File

@ -28,6 +28,7 @@ let config = {
initialLoadDelay: 3000, initialLoadDelay: 3000,
useBeaufort: false, useBeaufort: false,
showWindDirectionAsArrow: true, showWindDirectionAsArrow: true,
showSun: false,
showHumidity: true, showHumidity: true,
roundTemp: true, roundTemp: true,
degreeLabel: true degreeLabel: true