kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-30 13:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into weather-test-absolute

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Karsten Hassel 2022-01-07 21:46:17 +01:00
commit 7fa54642e1
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -12,7 +12,7 @@ _This release is scheduled to be released on 2022-04-01._
### Added ### Added
- Added a config option under the weather module, absoluteDates, providing an option to format weather forecast date output with either absolute or relative dates. - Added a config option under the weather module, absoluteDates, providing an option to format weather forecast date output with either absolute or relative dates.
- Added test for new weather forecast absolute porperty. - Added test for new weather forecast absoluteDates porperty.
### Updated ### Updated

4
modules/default/weather/forecast.njk
View File

@ -8,9 +8,9 @@
{% set forecast = forecast.slice(0, numSteps) %} {% set forecast = forecast.slice(0, numSteps) %}
{% for f in forecast %} {% for f in forecast %}
<tr {% if config.colored %}class="colored"{% endif %} {% if config.fade %}style="opacity: {{ currentStep | opacity(numSteps) }};"{% endif %}> <tr {% if config.colored %}class="colored"{% endif %} {% if config.fade %}style="opacity: {{ currentStep | opacity(numSteps) }};"{% endif %}>
{% if (currentStep == 0) and config.ignoreToday == false %} {% if (currentStep == 0) and config.ignoreToday == false and config.absoluteDates == false %}
<td class="day">{{ "TODAY" | translate }}</td> <td class="day">{{ "TODAY" | translate }}</td>
{% elif (currentStep == 1) and config.ignoreToday == false %} {% elif (currentStep == 1) and config.ignoreToday == false and config.absoluteDates == false %}
<td class="day">{{ "TOMORROW" | translate }}</td> <td class="day">{{ "TOMORROW" | translate }}</td>
{% else %} {% else %}
<td class="day">{{ f.date.format('ddd') }}</td> <td class="day">{{ f.date.format('ddd') }}</td>

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

@ -43,7 +43,8 @@ Module.register("weather", {
onlyTemp: false, onlyTemp: false,
showPrecipitationAmount: false, showPrecipitationAmount: false,
colored: false, colored: false,
showFeelsLike: true showFeelsLike: true,
absoluteDates: false
}, },
// Module properties. // Module properties.