Skip to content

Commit 52afe0a

Browse files
veeckveeck
authored andcommitted
add error to weather njk
1 parent fbca0a0 commit 52afe0a

5 files changed

Lines changed: 14 additions & 1 deletion

File tree

modules/default/weather/current.njk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,10 @@
9090
{% if config.showHumidity === "below" %}
9191
<span class="medium dimmed">{{ humidity() }}</span>
9292
{% endif %}
93+
{% elseif error %}
94+
<div class="small dimmed">
95+
{{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Weather", ERROR: error}) | safe }}
96+
</div>
9397
{% else %}
9498
<div class="dimmed light small">{{ "LOADING" | translate }}</div>
9599
{% endif %}

modules/default/weather/forecast.njk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
{% set currentStep = currentStep + 1 %}
4040
{% endfor %}
4141
</table>
42+
{% elseif error %}
43+
<div class="small dimmed">
44+
{{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Weather", ERROR: error}) | safe }}
45+
</div>
4246
{% else %}
4347
<div class="dimmed light small">{{ "LOADING" | translate }}</div>
4448
{% endif %}

modules/default/weather/hourly.njk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
{% set currentStep = currentStep + 1 %}
4242
{% endfor %}
4343
</table>
44+
{% elseif error %}
45+
<div class="small dimmed">
46+
{{ "MODULE_CONFIG_ERROR" | translate({MODULE_NAME: "Weather", ERROR: error}) | safe }}
47+
</div>
4448
{% else %}
4549
<div class="dimmed light small">{{ "LOADING" | translate }}</div>
4650
{% endif %}

modules/default/weather/providers/ukmetofficedatahub.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,7 @@ WeatherProvider.register("ukmetofficedatahub", {
273273
30: "thunderstorm"
274274
};
275275

276+
// TODO check for duplicat eand if neeeded
276277
return weatherTypes.hasOwnProperty(weatherType) ? weatherTypes[weatherType] : null;
277278
}
278279
});

tests/e2e/modules/calendar_spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe("Calendar module", () => {
99
* @param {string} not reverse result
1010
* @returns {boolean} result
1111
*/
12-
const testElementLength = async (element, result, not) => {
12+
const testElementLength = async (element, result, not = "") => {
1313
const elem = await helpers.waitForAllElements(element);
1414
expect(elem).not.toBeNull();
1515
if (not === "not") {

0 commit comments

Comments
 (0)