h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-22 22:18:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

change same day check for forecast

Browse Source
This commit is contained in:
joBr99
2022-04-18 16:52:26 +02:00
parent 31de412850
commit a903a8e377
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/nspanel-lovelace-ui/luibackend/config.py
View File

@@ -100,6 +100,7 @@ class LuiBackendConfig(object):
'type': 'screensaver', 'type': 'screensaver',
'entity': 'weather.example', 'entity': 'weather.example',
'weatherUnit': 'celsius', 'weatherUnit': 'celsius',
'forecastSkip': 0,
'weatherOverrideForecast1': None, 'weatherOverrideForecast1': None,
'weatherOverrideForecast2': None, 'weatherOverrideForecast2': None,
'weatherOverrideForecast3': None, 'weatherOverrideForecast3': None,

37
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -67,27 +67,34 @@ class LuiPagesGen(object):
icon_cur = get_icon_id_ha("weather", state=we.state) icon_cur = get_icon_id_ha("weather", state=we.state)
text_cur = convert_temperature(we.attributes.temperature, unit) text_cur = convert_temperature(we.attributes.temperature, unit)
# seconds between first and second forecast item forecastSkip = self._config._config_screensaver.raw_config.get(f"forecastSkip")+1
interval = (dp.parse(we.attributes.forecast[1]['datetime']) - dp.parse(we.attributes.forecast[0]['datetime'])).total_seconds() # check if the first 2 forecast items are on the same day
same_day = dp.parse(we.attributes.forecast[0]['datetime']).weekday() == dp.parse(we.attributes.forecast[forecastSkip]['datetime']).weekday()
self._ha_api.log("test123 %s", same_day)
weather_res = "" weather_res = ""
for i in range(1,5): for i in range(1,5):
wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}") wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}")
if wOF is None: if wOF is None:
up = we.attributes.forecast[i-1]['datetime'] fid = (i-1)*forecastSkip
up = dp.parse(up) if len(we.attributes.forecast) >= fid:
if babel_spec is not None: up = we.attributes.forecast[fid]['datetime']
if interval >= 86400.0: up = dp.parse(up)
up = babel.dates.format_date(up, "E", locale=self._locale) if babel_spec is not None:
if same_day:
up = babel.dates.format_time(up, "H:mm", locale=self._locale)
else:
up = babel.dates.format_date(up, "E", locale=self._locale)
else: else:
up = babel.dates.format_time(up, "H:mm", locale=self._locale) if same_day:
up = up.strftime('%H:%M')
else:
up = up.strftime('%a')
icon = get_icon_id_ha("weather", state=we.attributes.forecast[fid]['condition'])
down = convert_temperature(we.attributes.forecast[fid]['temperature'], unit)
else: else:
if interval >= 86400.0: up = ""
up = up.strftime('%a') icon = ""
else: down = ""
up = up.strftime('%H:%M')
icon = get_icon_id_ha("weather", state=we.attributes.forecast[i-1]['condition'])
down = convert_temperature(we.attributes.forecast[i-1]['temperature'], unit)
else: else:
self._ha_api.log(f"Forecast {i} is overriden with {wOF}") self._ha_api.log(f"Forecast {i} is overriden with {wOF}")
icon = wOF.get("icon") icon = wOF.get("icon")