diff --git a/src/logic/service/services/IcsService.py b/src/logic/service/services/IcsService.py index 70f42a43e56cb0119e255f81fa853d1a59414bd5..2a4549797e2eca5c6be9e65e5c9403affa3ea58a 100644 --- a/src/logic/service/services/IcsService.py +++ b/src/logic/service/services/IcsService.py @@ -55,13 +55,15 @@ class IcsService(MultiCacheKeyService): event.url = component.get('URL') events.append(event) + + events = sorted(events, key=lambda event: event.start) return {'events': events} if __name__ == '__main__': s = IcsService() - events = s.get_data('0815', 5, {'path': 'C:/Users/RobertG/Desktop/abfallkalender_2020_richard-wagner-str.ics'})['events'] + events = s.get_data('0815', 5, {'path': '../../../../abfallkalender_2021_richard-wagner-str.ics'})['events'] for x in events: # if 'Papier' in x.summary: - print(x.summary) + print(x.summary, x.start) diff --git a/src/logic/tile/tiles/GarbageContainerScheduleTile.py b/src/logic/tile/tiles/GarbageContainerScheduleTile.py index 02b82c161130ba926ff44bbf6a2f77dca4a21166..ceac49fcd7a98dcdab13239e2fd57e974bc66e6a 100644 --- a/src/logic/tile/tiles/GarbageContainerScheduleTile.py +++ b/src/logic/tile/tiles/GarbageContainerScheduleTile.py @@ -35,6 +35,7 @@ class GarbageContainerScheduleTile(Tile): events = icsService.get_data(cacheKey, self._intervalInSeconds, self._settings)['events'] eventsForGarbageType = [x for x in events if self._settings['garbageType'] in x.summary] + nextEvent = self.__find_next_date(eventsForGarbageType) nextEventDate = '--.--.'