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

better time switching

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-29 14:03:27 +01:00
parent 0d8cab48be
commit d201fc90de
6 changed files with 139 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
rowers/plannedsessions.py
View File

@@ -29,7 +29,7 @@ import metrics
import numpy as np
import dataprep
import courses
import iso8601
from rowers.tasks import handle_check_race_course
def get_todays_micro(plan,thedate=date.today()):
@@ -400,8 +400,12 @@ def remove_rower_session(r,ps):
return 1
def get_dates_timeperiod(timeperiod):
def get_dates_timeperiod(timeperiod,startdatestring='',enddatestring=''):
# set start end date according timeperiod
if not timeperiod:
timeperiod = 'thisweek'
daterangetester = re.compile('^(\d+-\d+-\d+)\/(\d+-\d+-\d+)')
if timeperiod=='today':
@@ -445,11 +449,11 @@ def get_dates_timeperiod(timeperiod):
enddate = enddate.replace(day=1)
enddate = enddate-timezone.timedelta(days=1)
elif daterangetester.match(timeperiod):
startdatestring = daterangetester.match(timeperiod).group(1)
enddatestring = daterangetester.match(timeperiod).group(2)
tstartdatestring = daterangetester.match(timeperiod).group(1)
tenddatestring = daterangetester.match(timeperiod).group(2)
try:
startdate = dt.datetime.strptime(startdatestring,'%Y-%m-%d').date()
enddate = dt.datetime.strptime(enddatestring,'%Y-%m-%d').date()
startdate = dt.datetime.strptime(tstartdatestring,'%Y-%m-%d').date()
enddate = dt.datetime.strptime(tenddatestring,'%Y-%m-%d').date()
if startdate > enddate:
startdate2 = enddate
enddate = startdate
@@ -460,6 +464,19 @@ def get_dates_timeperiod(timeperiod):
else:
startdate = date.today()
enddate = date.today()
if startdatestring != '':
try:
startdate = iso8601.parse_date(startdatestring)
except ParseError:
pass
if enddatestring != '':
try:
enddate = iso8601.parse_date(enddatestring)
except ParseError:
pass
return startdate,enddate