mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 03:39:55 +00:00
bf279d9a57
Fixes #2953 This is an attempt to fix the issue with precipitation amount and percentage mixup. I have created a separate `precipitationPercentage`-variable where the probability of rain can be stored. The config options now has the old `showPrecipitationAmount` in addition to a new setting: `showPrecipitationProbability` (shows the likelihood of rain). <details> <summary>Examples</summary> ### Yr I tested the Yr weather provider for a Norwegian city Bergen that has a lot of rain. I have removed properties that are irrelevant for this demo from the config-samples below. Config: ```js { module: "weather", config: { weatherProvider: "yr", type: "current", showPrecipitationAmount: true, showPrecipitationProbability: true } }, { module: "weather", config: { weatherProvider: "yr", type: "hourly", showPrecipitationAmount: true, showPrecipitationProbability: true } }, { module: "weather", config: { weatherProvider: "yr", type: "daily", showPrecipitationAmount: true, showPrecipitationProbability: true } } ``` Result:<br/> <img width="444" alt="screenshot" src="https://user-images.githubusercontent.com/34011212/216775423-4e37345c-f915-47e5-8551-7c544ebd24b1.png"> </details> --------- Co-authored-by: Magnus Marthinsen <magmar@online.no> Co-authored-by: Veeck <github@veeck.de>
35 lines
1.6 KiB
Plaintext
35 lines
1.6 KiB
Plaintext
{% if hourly %}
|
|
{% set numSteps = hourly | calcNumEntries %}
|
|
{% set currentStep = 0 %}
|
|
<table class="{{ config.tableClass }}">
|
|
{% set hours = hourly.slice(0, numSteps) %}
|
|
{% for hour in hours %}
|
|
<tr {% if config.colored %}class="colored"{% endif %} {% if config.fade %}style="opacity: {{ currentStep | opacity(numSteps) }};"{% endif %}>
|
|
<td class="day">{{ hour.date | formatTime }}</td>
|
|
<td class="bright weather-icon"><span class="wi weathericon wi-{{ hour.weatherType }}"></span></td>
|
|
<td class="align-right bright">
|
|
{{ hour.temperature | roundValue | unit("temperature") }}
|
|
</td>
|
|
{% if config.showPrecipitationAmount %}
|
|
<td class="align-right bright precipitationAmount">
|
|
{{ hour.precipitationAmount | unit("precip", hour.precipitationUnits) }}
|
|
</td>
|
|
{% endif %}
|
|
{% if config.showPrecipitationProbability %}
|
|
<td class="align-right bright precipitationProbability">
|
|
{{ hour.precipitationProbability }}%
|
|
</td>
|
|
{% endif %}
|
|
</tr>
|
|
{% set currentStep = currentStep + 1 %}
|
|
{% endfor %}
|
|
</table>
|
|
{% else %}
|
|
<div class="dimmed light small">
|
|
{{ "LOADING" | translate }}
|
|
</div>
|
|
{% endif %}
|
|
|
|
<!-- Uncomment the line below to see the contents of the `hourly` object. -->
|
|
<!-- <div style="word-wrap:break-word" class="xsmall dimmed">{{hourly | dump}}</div> -->
|