sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v12.40'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-11 21:21:11 +02:00
parent d9261d6911 0d41ee9ea0
commit a73fc59fd1
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/plannedsessions.py
View File

@@ -723,8 +723,18 @@ def get_dates_timeperiod(request,startdatestring='',enddatestring='',
startdate = dt.datetime.strptime(startdatestring,'%Y-%m-%d').date() startdate = dt.datetime.strptime(startdatestring,'%Y-%m-%d').date()
enddate = dt.datetime.strptime(enddatestring,'%Y-%m-%d').date() enddate = dt.datetime.strptime(enddatestring,'%Y-%m-%d').date()
except ValueError: except ValueError:
startdate = parser.parse(startdatestring,fuzzy=True).date() try:
enddate = parser.parse(enddatestring, fuzzy=True).date() startdate = parser.parse(startdatestring,fuzzy=True).date()
enddate = parser.parse(enddatestring, fuzzy=True).date()
except ValueError:
startdate = timezone.now()-timezone.timedelta(days=5)
startdate = startdate.date()
enddate = timezone.now().date()
if startdate>enddate:
e = startdate
startdate = enddate
enddate = e
return startdate,enddate return startdate,enddate