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

Merge branch 'develop' into weatherbit

Browse Source
This commit is contained in:
Michael Teeuw
2020-11-15 19:59:12 +01:00
committed by GitHub
parent 92ab705ff5 2c3f83c70d
commit 7944045893
17 changed files with 429 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,13 @@
{% set forecast = forecast.slice(0, numSteps) %}
{% for f in forecast %}
<tr {% if config.colored %}class="colored"{% endif %} {% if config.fade %}style="opacity: {{ currentStep | opacity(numSteps) }};"{% endif %}>
<td class="day">{{ f.date.format('ddd') }}</td>
{% if (currentStep == 0) %}
<td class="day">{{ "TODAY" | translate }}</td>
{% elif (currentStep == 1) %}
<td class="day">{{ "TOMORROW" | translate }}</td>
{% else %}
<td class="day">{{ f.date.format('ddd') }}</td>
{% endif %}
<td class="bright weather-icon"><span class="wi weathericon wi-{{ f.weatherType }}"></span></td>
<td class="align-right bright max-temp">
{{ f.maxTemperature | roundValue | unit("temperature") }}

4
modules/default/weather/providers/ukmetofficedatahub.js
View File

@@ -87,7 +87,7 @@ WeatherProvider.register("ukmetofficedatahub", {
// Did not receive usable new data.
// Maybe this needs a better check?
Log.error("Possibly bad current/hourly data?");
Log.info(data);
Log.error(data);
return;
}
@@ -158,7 +158,7 @@ WeatherProvider.register("ukmetofficedatahub", {
// Did not receive usable new data.
// Maybe this needs a better check?
Log.error("Possibly bad forecast data?");
Log.info(data);
Log.error(data);
return;
}