diff --git a/src/logic/tile/tiles/GarbageContainerScheduleTile.html b/src/logic/tile/tiles/GarbageContainerScheduleTile.html index 471abb30b0101373b427e4c1797f8b16dd629688..8a8119f0c5cffa3b1cf504174eca51f7ec8528c5 100644 --- a/src/logic/tile/tiles/GarbageContainerScheduleTile.html +++ b/src/logic/tile/tiles/GarbageContainerScheduleTile.html @@ -29,6 +29,6 @@ <div class="garbageContainerScheduleTile"> <div class="content"> <img src="../../static/images/{{ data['iconFileName'] }}" class="icon"/> - {{ data['nextEventDate'] }} + {{ data['nextEventDate'] }} - {{ data['remainingDays'] }} Tag(e) </div> </div> diff --git a/src/logic/tile/tiles/GarbageContainerScheduleTile.py b/src/logic/tile/tiles/GarbageContainerScheduleTile.py index b525907ca34a422dc9488a979201e7e7bc2a9476..02b82c161130ba926ff44bbf6a2f77dca4a21166 100644 --- a/src/logic/tile/tiles/GarbageContainerScheduleTile.py +++ b/src/logic/tile/tiles/GarbageContainerScheduleTile.py @@ -11,7 +11,7 @@ from logic.tile.Tile import Tile class GarbageContainerScheduleTile(Tile): - DATE_FORMAT = 'dd.MM. (E)' + DATE_FORMAT = 'E dd.MM' ICON_BY_GARBAGE_TYPE = { 'Papier': 'garbage_paper', @@ -38,15 +38,22 @@ class GarbageContainerScheduleTile(Tile): nextEvent = self.__find_next_date(eventsForGarbageType) nextEventDate = '--.--.' + remainingDays = '' if nextEvent: nextEventDate = nextEvent.start + if isinstance(nextEventDate, datetime): + remainingDays = nextEventDate - datetime.now() + else: + remainingDays = nextEventDate - datetime.now().date() + remainingDays = remainingDays.days nextEventDate = format_date(nextEventDate, self.DATE_FORMAT, 'de') iconName = self.ICON_BY_GARBAGE_TYPE[self._settings['garbageType']] return { 'nextEventDate': nextEventDate, - 'iconFileName': f'{iconName}.png' + 'iconFileName': f'{iconName}.png', + 'remainingDays': remainingDays } def __find_next_date(self, events: List[CalendarEvent]) -> CalendarEvent or None: