Skip to content
Snippets Groups Projects
Commit 061caad8 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #33 - GarbageScheduleTile: add remaining days counter

parent f4af2a39
Branches
Tags
No related merge requests found
...@@ -29,6 +29,6 @@ ...@@ -29,6 +29,6 @@
<div class="garbageContainerScheduleTile"> <div class="garbageContainerScheduleTile">
<div class="content"> <div class="content">
<img src="../../static/images/{{ data['iconFileName'] }}" class="icon"/> <img src="../../static/images/{{ data['iconFileName'] }}" class="icon"/>
{{ data['nextEventDate'] }} {{ data['nextEventDate'] }} - {{ data['remainingDays'] }} Tag(e)
</div> </div>
</div> </div>
...@@ -11,7 +11,7 @@ from logic.tile.Tile import Tile ...@@ -11,7 +11,7 @@ from logic.tile.Tile import Tile
class GarbageContainerScheduleTile(Tile): class GarbageContainerScheduleTile(Tile):
DATE_FORMAT = 'dd.MM. (E)' DATE_FORMAT = 'E dd.MM'
ICON_BY_GARBAGE_TYPE = { ICON_BY_GARBAGE_TYPE = {
'Papier': 'garbage_paper', 'Papier': 'garbage_paper',
...@@ -38,15 +38,22 @@ class GarbageContainerScheduleTile(Tile): ...@@ -38,15 +38,22 @@ class GarbageContainerScheduleTile(Tile):
nextEvent = self.__find_next_date(eventsForGarbageType) nextEvent = self.__find_next_date(eventsForGarbageType)
nextEventDate = '--.--.' nextEventDate = '--.--.'
remainingDays = ''
if nextEvent: if nextEvent:
nextEventDate = nextEvent.start 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') nextEventDate = format_date(nextEventDate, self.DATE_FORMAT, 'de')
iconName = self.ICON_BY_GARBAGE_TYPE[self._settings['garbageType']] iconName = self.ICON_BY_GARBAGE_TYPE[self._settings['garbageType']]
return { return {
'nextEventDate': nextEventDate, 'nextEventDate': nextEventDate,
'iconFileName': f'{iconName}.png' 'iconFileName': f'{iconName}.png',
'remainingDays': remainingDays
} }
def __find_next_date(self, events: List[CalendarEvent]) -> CalendarEvent or None: def __find_next_date(self, events: List[CalendarEvent]) -> CalendarEvent or None:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment