diff --git a/modules/ical.py b/modules/ical.py index 89fae3f..a2020d0 100644 --- a/modules/ical.py +++ b/modules/ical.py @@ -367,7 +367,7 @@ class IcalModule: ) elif "end" in evt and not isinstance(evt["end"], datetime): pass - elif "end" in evt and (("new_start" in evt and now > evt["new_start"].astimezone(pytz.timezone('Europe/Paris'))) or ("new_start" not in evt and now > evt["start"].astimezone(pytz.timezone('Europe/Paris')))): + elif "end" in evt and (("new_start" in evt and now > evt["new_start"]) or ("new_start" not in evt and now > evt["start"])): align += display_longtext(draw, (2 + fnt_R.getsize(evt["start"].astimezone(pytz.timezone('Europe/Paris')).strftime("%H:%M "))[0], align+line_height*0.6), "Fin à " + (evt["new_end"] if "new_end" in evt else evt["end"]).astimezone(pytz.timezone('Europe/Paris')).strftime("%H:%M"), diff --git a/modules/weather.py b/modules/weather.py index 18bcb26..3297115 100644 --- a/modules/weather.py +++ b/modules/weather.py @@ -224,15 +224,12 @@ class WeatherRainModule: elif thisdayweather["avgvis_km"] < 10: gauge.add('Visibilité', [{'value': thisdayweather["avgvis_km"] * 10, 'color': '#999'}]) icon_path = "wi-fog.png" - elif "air_quality" in thisdayweather: + else: gauge.add("Qualité de l'air", [{'value': thisdayweather["air_quality"]["gb-defra-index"] * 10}]) if thisdayweather["air_quality"]["gb-defra-index"] >= 5: icon_path = "wi-smog.png" else: icon_path = "wi-smoke.png" - else: - gauge.add('Vent', [{'value': thisdayweather["maxwind_kph"], 'color': '#999'}]) - icon_path = "wi-wind-beaufort-1.png" image = Image.open(io.BytesIO(gauge.render_to_png()))