Timeout-Check + MERGE-Prep
This commit is contained in:
@ -3,8 +3,19 @@ import datetime
|
||||
import recurring_ical_events
|
||||
from fetchMENSA import getMeals
|
||||
|
||||
shortnames = ["mon", "tue", "wed", "thu", "fri", "sat"]
|
||||
longnames = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"]
|
||||
|
||||
|
||||
def getWeek(weekstart: datetime, file: str, showsat: bool):
|
||||
"""
|
||||
Liefert alle Events einer Woche zurück.
|
||||
Wochenstart wird automatisch auf den Montag der Woche gelegt.
|
||||
:param weekstart:
|
||||
:param file:
|
||||
:param showsat:
|
||||
:return:
|
||||
"""
|
||||
if weekstart == "today":
|
||||
start_date = datetime.date.today()
|
||||
else:
|
||||
@ -42,11 +53,13 @@ def getWeek(weekstart: datetime, file: str, showsat: bool):
|
||||
return eventl, daylist(start_date, showsat)
|
||||
|
||||
|
||||
shortnames = ["mon", "tue", "wed", "thu", "fri", "sat"]
|
||||
longnames = ["Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"]
|
||||
|
||||
|
||||
def daylist(weekstart: datetime, showsat: bool):
|
||||
"""
|
||||
Gibt die Essen einer Woche zurück.
|
||||
:param weekstart:
|
||||
:param showsat:
|
||||
:return:
|
||||
"""
|
||||
weekday = weekstart
|
||||
dayl = []
|
||||
if showsat:
|
||||
|
||||
Reference in New Issue
Block a user