boyska/larigira
1
0
Fork 0
Code Issues 13 Pull requests Releases Activity

calendar: cleaner code and better hide

Browse source
This commit is contained in:
boyska 2020-08-04 10:36:54 +02:00
parent c3c837b7f4
commit 6495c625b4
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
larigira/dbadmin/__init__.py
View file

@ -71,13 +71,17 @@ def events_calendar():
actions = tuple(model.get_actions_by_alarm(alarm))
if not actions:
continue
t = datetime.fromtimestamp(int(today.strftime("%s")))
occurrences = [
t
for t in timegenerate(alarm, now=t, howmany=max_occurrences + 1)
if t is not None
and t <= datetime.combine(today + timedelta(days=max_days), time())
]
today_dt = datetime.fromtimestamp(int(today.strftime("%s")))
max_dt = datetime.combine(today_dt + timedelta(days=max_days), time())
occurrences = []
for t in timegenerate(
alarm, now=today_dt, howmany=max_occurrences + 1
):
if t is None:
break
if t > max_dt:
break
occurrences.append(t)
if not occurrences:
continue
if not show_all and len(occurrences) > max_occurrences: