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

improved search forms

Browse Source
This commit is contained in:
Sander Roosendaal
2018-12-08 09:56:46 +01:00
parent 5496a0f533
commit b9062bd768
9 changed files with 60 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/templates/comparison_list.html
View File

@@ -34,10 +34,8 @@
<p> <p>
<form id="searchform" action="" <form id="searchform" action=""
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">
<button class="button blue small" type="submit"> {{ searchform }}
Search <input type="submit" value="GO"></input>
</button>
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
</form> </form>
</p> </p>
</div> </div>

8
rowers/templates/fusion_list.html
View File

@@ -32,10 +32,8 @@
<p> <p>
<form id="searchform" action="" <form id="searchform" action=""
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">
<button class="button blue small" type="submit"> {{ searchform }}
Search <input type="submit" value="GO"></input>
</button>
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
</form> </form>
</p> </p>
<p> <p>
@@ -49,7 +47,7 @@
</table> </table>
{% csrf_token %} {% csrf_token %}
</p> </p>
<input name='daterange' class="button green" type="submit" value="Submit"> </form> <input name='daterange' type="submit" value="Submit"> </form>
</li> </li>
<li class="grid_3"> <li class="grid_3">
<h1>Fuse this workout with data from:</h1> <h1>Fuse this workout with data from:</h1>

8
rowers/templates/list_courses.html
View File

@@ -60,14 +60,12 @@
<p> <p>
<form id="searchform" action="/rowers/list-courses/" <form id="searchform" action="/rowers/list-courses/"
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search"> {{ searchform }}
<button class="button blue small" type="submit"> <input type="submit" value="GO"></input>
Search
</button>
</form> </form>
</p> </p>
<p> <p>
<a class="button small green" href="/rowers/courses/upload">Add Courses</a> <a href="/rowers/courses/upload">Add Courses</a>
</p> </p>
{% if announcements %} {% if announcements %}
<h3>What's New?</h3> <h3>What's New?</h3>

6
rowers/templates/list_graphs.html
View File

@@ -16,10 +16,8 @@
<li class="grid_2"> <li class="grid_2">
<form id="searchform" action="." <form id="searchform" action="."
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">
<button class="button blue small" type="submit"> {{ searchform }}
Search <input type="submit" value="GO"></input>
</button>
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
</form> </form>
</li> </li>
<li class="grid_2"> <li class="grid_2">

8
rowers/templates/team_compare_select.html
View File

@@ -103,10 +103,8 @@
<form id="searchform" <form id="searchform"
action="" action=""
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search"> {{ searchform }}
<button class="button blue small" type="submit"> <input type="submit" value="GO"></input>
Search
</button>
</form> </form>
</li> </li>
<li class="grid_2 maxheight"> <li class="grid_2 maxheight">
@@ -133,7 +131,7 @@
</table> </table>
</p> </p>
<p> <p>
<input name="chartform" class="button green" type="submit" value="Compare"> <input name="chartform" type="submit" value="Compare">
</p> </p>
</form> </form>
</li> </li>

10
rowers/templates/user_boxplot_select.html
View File

@@ -101,7 +101,7 @@
{{ chartform.as_table }} {{ chartform.as_table }}
</table> </table>
<p> <p>
<input name='workoutselectform' class="button green" type="submit" value="Submit"> <input name='workoutselectform' type="submit" value="Submit">
</p> </p>
</form> </form>
</li> </li>
@@ -118,16 +118,14 @@
{{ optionsform.as_table }} {{ optionsform.as_table }}
</table> </table>
{% csrf_token %} {% csrf_token %}
<input name='optionsform' class="button green" type="submit" value="Submit"> <input name='optionsform' type="submit" value="Submit">
</form> </form>
</li> </li>
<li class="grid_2"> <li class="grid_2">
<form id="searchform" action="" <form id="searchform" action=""
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search"> {{ searchform }}
<button class="button blue small" type="submit"> <input type="submit" value="GO"></input>
Search
</button>
</form> </form>
</li> </li>

10
rowers/templates/user_multiflex_select.html
View File

@@ -92,16 +92,14 @@
{{ modalityform.as_table }} {{ modalityform.as_table }}
</table> </table>
{% csrf_token %} {% csrf_token %}
<input name='modalityform' class="button green" type="submit" value="Filter"> <input name='modalityform' type="submit" value="Filter">
</form> </form>
</li> </li>
<li class="grid_2"> <li class="grid_2">
<form id="searchform" action="" <form id="searchform" action=""
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search"> {{ searchform }}
<button class="button blue small" type="submit"> <input type="submit" value="GO"></input>
Search
</button>
</form> </form>
</li> </li>
<li class="grid_2 maxheight"> <li class="grid_2 maxheight">
@@ -122,7 +120,7 @@
{{ chartform.as_table }} {{ chartform.as_table }}
</table> </table>
<p> <p>
<input name='workoutselectform' class="button green" type="submit" value="Create Chart"> <input name='workoutselectform' type="submit" value="Create Chart">
</p> </p>
</form> </form>
</li> </li>

12
rowers/templates/workout_join_select.html
View File

@@ -91,7 +91,7 @@
</table> </table>
<p> <p>
{% csrf_token %} {% csrf_token %}
<input name='workoutselectform' class="button green" type="submit" value="Submit"> <input name='workoutselectform' type="submit" value="Submit">
</p> </p>
</form> </form>
</li> </li>
@@ -106,7 +106,7 @@
</table> </table>
<p> <p>
{% csrf_token %} {% csrf_token %}
<input name='daterange' class="button green" type="submit" value="Submit"> <input name='daterange' type="submit" value="Submit">
</p> </p>
</form> </form>
</li> </li>
@@ -121,7 +121,7 @@
</table> </table>
<p> <p>
{% csrf_token %} {% csrf_token %}
<input name='modalityform' class="button green" type="submit" value="Submit"> <input name='modalityform' type="submit" value="Submit">
</p> </p>
</form> </form>
</li> </li>
@@ -133,10 +133,8 @@
<form id="searchform" action="/rowers/workouts-join-select/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}" <form id="searchform" action="/rowers/workouts-join-select/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">
{% endif %} {% endif %}
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search"> {{ searchform }}
<button class="button blue small" type="submit"> <input type="submit" value="GO"></input>
Search
</button>
</form> </form>
</li> </li>
</ul> </ul>

32
rowers/views.py
View File

@@ -5336,6 +5336,9 @@ def workouts_join_select(request,
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
form = WorkoutMultipleCompareForm() form = WorkoutMultipleCompareForm()
form.fields["workouts"].queryset = workouts form.fields["workouts"].queryset = workouts
@@ -5358,6 +5361,7 @@ def workouts_join_select(request,
return render(request, 'workout_join_select.html', return render(request, 'workout_join_select.html',
{'workouts': workouts, {'workouts': workouts,
'dateform':dateform, 'dateform':dateform,
'searchform':searchform,
'startdate':startdate, 'startdate':startdate,
'enddate':enddate, 'enddate':enddate,
'active':'nav-workouts', 'active':'nav-workouts',
@@ -5510,6 +5514,9 @@ def team_comparison_select(request,
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
if id: if id:
firstworkout = get_workout(id) firstworkout = get_workout(id)
@@ -5573,6 +5580,7 @@ def team_comparison_select(request,
'startdate':startdate, 'startdate':startdate,
'enddate':enddate, 'enddate':enddate,
'team':theteam, 'team':theteam,
'searchform':searchform,
'form':form, 'form':form,
'rower':r, 'rower':r,
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
@@ -5921,6 +5929,9 @@ def user_multiflex_select(request,
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
form = WorkoutMultipleCompareForm() form = WorkoutMultipleCompareForm()
form.fields["workouts"].queryset = workouts form.fields["workouts"].queryset = workouts
@@ -5975,6 +5986,7 @@ def user_multiflex_select(request,
'rower':r, 'rower':r,
'form':form, 'form':form,
'chartform':chartform, 'chartform':chartform,
'searchform':searchform,
'modalityform':modalityform, 'modalityform':modalityform,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })
@@ -6551,6 +6563,9 @@ def user_boxplot_select(request,
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
form = WorkoutMultipleCompareForm() form = WorkoutMultipleCompareForm()
form.fields["workouts"].queryset = workouts form.fields["workouts"].queryset = workouts
@@ -6592,6 +6607,7 @@ def user_boxplot_select(request,
'form':form, 'form':form,
'active':'nav-analysis', 'active':'nav-analysis',
'chartform':chartform, 'chartform':chartform,
'searchform':searchform,
'optionsform':optionsform, 'optionsform':optionsform,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })
@@ -6834,10 +6850,14 @@ def courses_view(request):
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
return render(request,'list_courses.html', return render(request,'list_courses.html',
{'courses':courses, {'courses':courses,
'active':'nav-racing', 'active':'nav-racing',
'searchform':searchform,
'rower':r, 'rower':r,
}) })
@@ -7108,6 +7128,9 @@ def workout_comparison_list(request,id=0,message='',successmessage='',
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
paginator = Paginator(workouts,15) # show 25 workouts per page paginator = Paginator(workouts,15) # show 25 workouts per page
page = request.GET.get('page') page = request.GET.get('page')
@@ -7130,6 +7153,7 @@ def workout_comparison_list(request,id=0,message='',successmessage='',
'workouts': workouts, 'workouts': workouts,
'last_name':u.last_name, 'last_name':u.last_name,
'first_name':u.first_name, 'first_name':u.first_name,
'searchform':searchform,
'dateform':dateform, 'dateform':dateform,
'startdate':startdate, 'startdate':startdate,
'enddate':enddate, 'enddate':enddate,
@@ -7190,6 +7214,9 @@ def workout_fusion_list(request,id=0,message='',successmessage='',
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
paginator = Paginator(workouts,15) # show 25 workouts per page paginator = Paginator(workouts,15) # show 25 workouts per page
page = request.GET.get('page') page = request.GET.get('page')
@@ -7225,6 +7252,7 @@ def workout_fusion_list(request,id=0,message='',successmessage='',
{'id':int(id), {'id':int(id),
'workout':row, 'workout':row,
'rower':r, 'rower':r,
'searchform':searchform,
'active':'nav-workouts', 'active':'nav-workouts',
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'workouts': workouts, 'workouts': workouts,
@@ -12067,6 +12095,9 @@ def graphs_view(request):
reduce(operator.and_, reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list)) (Q(notes__icontains=q) for q in query_list))
) )
searchform = SearchForm(initial={'q':query})
else:
searchform = SearchForm()
g = GraphImage.objects.filter(workout__in=workouts).order_by("-creationdatetime") g = GraphImage.objects.filter(workout__in=workouts).order_by("-creationdatetime")
@@ -12083,6 +12114,7 @@ def graphs_view(request):
return render(request, 'list_graphs.html', return render(request, 'list_graphs.html',
{'graphs': g, {'graphs': g,
'searchform':searchform,
'active':'nav-workouts', 'active':'nav-workouts',
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })