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

Merge branch 'release/v14.02' into master

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-13 21:36:46 +02:00
parent 09dec187ff 86b3daf498
commit 06e63df4df
2 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
rowers/templates/user_analysis_select.html
View File

@@ -309,12 +309,25 @@
<p>TIP: Agree with your team members to put tags (e.g. '8x500m') in the notes section of <p>TIP: Agree with your team members to put tags (e.g. '8x500m') in the notes section of
your workouts. That makes it easy to search.</p> your workouts. That makes it easy to search.</p>
</li> </li>
<li class="grid_2 maxheight"> <li class="grid_2">
<form id="searchform" action="" <form enctype="multipart/form-data" method="post">
method="get" accept-charset="utf-8"> <table>
{{ dateform.as_table }}
</table>
<table>
{{ optionsform.as_table }}
</table>
</li>
<li class="grid_2">
<p>Select two or more workouts, set your plot settings below,
and press submit
</p>
<table>
{{ chartform.as_table }}
</table>
</li>
<li class="grid_2 maxheight">
{{ searchform }} {{ searchform }}
<input type="submit" value="GO"></input>
</form>
<form enctype="multipart/form-data" action="" method="post"> <form enctype="multipart/form-data" action="" method="post">
{% if workouts %} {% if workouts %}
@@ -326,27 +339,9 @@
{% else %} {% else %}
<p> No workouts found </p> <p> No workouts found </p>
{% endif %} {% endif %}
</li> {% csrf_token %}
<li class="grid_2"> <input name='optionsform' type="submit" value="Submit">
<p>Select two or more workouts, set your plot settings below, </form>
and press submit
</p>
{% csrf_token %}
<table>
{{ chartform.as_table }}
</table>
</li>
<li class="grid_2">
<form enctype="multipart/form-data" method="post">
<table>
{{ dateform.as_table }}
</table>
<table>
{{ optionsform.as_table }}
</table>
{% csrf_token %}
<input name='optionsform' type="submit" value="Submit">
</form>
</li> </li>
</ul> </ul>

2
rowers/views/analysisviews.py
View File

@@ -197,7 +197,7 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0):
if rankingonly: if rankingonly:
workouts = workouts.exclude(rankingpiece=False) workouts = workouts.exclude(rankingpiece=False)
query = request.GET.get('q') query = request.POST.get('q')
if query: if query:
query_list = query.split() query_list = query.split()
workouts = workouts.filter( workouts = workouts.filter(