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

changed start date behavior in list_workouts

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-13 08:48:47 +02:00
parent 06ecf74cb5
commit 50638575a4
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rowers/views.py
View File

@@ -2744,6 +2744,10 @@ def histo_all(request,theuser=0,
if enddatestring != "": if enddatestring != "":
enddate = iso8601.parse_date(enddatestring) enddate = iso8601.parse_date(enddatestring)
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
if enddate < startdate: if enddate < startdate:
s = enddate s = enddate
enddate = startdate enddate = startdate
@@ -6411,9 +6415,8 @@ def courses_view(request):
# List Workouts # List Workouts
@login_required() @login_required()
def workouts_view(request,message='',successmessage='', def workouts_view(request,message='',successmessage='',
startdatestring="",enddatestring="", startdatestring='',
startdate=timezone.now()-datetime.timedelta(days=365), enddatestring='',
enddate=timezone.now(),
teamid=0,rankingonly=False,rowerid=0,userid=0): teamid=0,rankingonly=False,rowerid=0,userid=0):
request.session['referer'] = absolute(request)['PATH'] request.session['referer'] = absolute(request)['PATH']
@@ -6433,13 +6436,26 @@ def workouts_view(request,message='',successmessage='',
if not checkaccessuser(request.user,r): if not checkaccessuser(request.user,r):
raise PermissionDenied("Access denied") raise PermissionDenied("Access denied")
if startdatestring:
startdate = iso8601.parse_date(startdatestring)
else:
startdate = datetime.date.today()-datetime.timedelta(days=365)
if enddatestring:
enddate = iso8601.parse_date(enddatestring)
else:
enddate = datetime.date.today()
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
if request.method == 'POST': if request.method == 'POST':
dateform = DateRangeForm(request.POST) dateform = DateRangeForm(request.POST)
if dateform.is_valid(): if dateform.is_valid():
startdate = dateform.cleaned_data['startdate'] startdate = dateform.cleaned_data['startdate']
enddate = dateform.cleaned_data['enddate'] enddate = dateform.cleaned_data['enddate']
startdatestring = None
enddatestring = None
else: else:
dateform = DateRangeForm(initial={ dateform = DateRangeForm(initial={
'startdate':startdate, 'startdate':startdate,
@@ -6450,16 +6466,15 @@ def workouts_view(request,message='',successmessage='',
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59)) enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
#enddate = enddate+datetime.timedelta(days=1) #enddate = enddate+datetime.timedelta(days=1)
if startdatestring:
startdate = iso8601.parse_date(startdatestring)
if enddatestring:
enddate = iso8601.parse_date(enddatestring)
if enddate < startdate: if enddate < startdate:
s = enddate s = enddate
enddate = startdate enddate = startdate
startdate = s startdate = s
startdatestring = startdate.strftime('%Y-%m-%d')
enddatestring = enddate.strftime('%Y-%m-%d')
# start date for the small graph # start date for the small graph
activity_startdate = enddate-datetime.timedelta(days=15) activity_startdate = enddate-datetime.timedelta(days=15)