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

fixes #447

Browse Source
This commit is contained in:
Sander Roosendaal
2019-03-25 20:44:13 +01:00
parent 61982d24ce
commit 2e77366b94
3 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/views/workoutviews.py
View File

@@ -1178,12 +1178,15 @@ def workouts_view(request,message='',successmessage='',
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
query = None
if request.method == 'POST':
dateform = DateRangeForm(request.POST)
searchform = SearchForm(request.POST)
if dateform.is_valid():
startdate = dateform.cleaned_data['startdate']
enddate = dateform.cleaned_data['enddate']
if searchform.is_valid():
query = searchform.cleaned_data['q']
else:
dateform = DateRangeForm(initial={
'startdate':startdate,
@@ -1293,7 +1296,6 @@ def workouts_view(request,message='',successmessage='',
for w in workoutsnohr:
res = dataprep.workout_trimp(w)
query = request.GET.get('q')
if query:
query_list = query.split()
workouts = workouts.filter(