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

multiflex UI and bux fix

Browse Source
This commit is contained in:
Sander Roosendaal
2018-11-12 09:59:55 +01:00
parent 04a988430b
commit dce7785b58
2 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
rowers/templates/user_multiflex_select.html
View File

@@ -78,6 +78,32 @@
<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">
{% if theuser %}
<form enctype="multipart/form-data" action="/rowers/user-multiflex-select/user/{{ theuser.id }}/" method="post">
{% else %}
<form enctype="multipart/form-data" action="/rowers/user-multiflex-select/" method="post">
{% endif %}
<table>
{{ dateform.as_table }}
</table>
<table>
{{ modalityform.as_table }}
</table>
{% csrf_token %}
<input name='modalityform' class="button green" type="submit" value="Filter">
</form>
</li>
<li class="grid_2">
<form id="searchform" action=""
method="get" accept-charset="utf-8">
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
<button class="button blue small" type="submit">
Search
</button>
</form>
</li>
<li class="grid_2 maxheight"> <li class="grid_2 maxheight">
<form enctype="multipart/form-data" action="/rowers/user-multiflex/user/{{ theuser.id }}" method="post"> <form enctype="multipart/form-data" action="/rowers/user-multiflex/user/{{ theuser.id }}" method="post">
{% if workouts %} {% if workouts %}
@@ -96,36 +122,10 @@
{{ chartform.as_table }} {{ chartform.as_table }}
</table> </table>
<p> <p>
<input name='workoutselectform' class="button green" type="submit" value="Submit"> <input name='workoutselectform' class="button green" type="submit" value="Create Chart">
</p> </p>
</form> </form>
</li> </li>
<li class="grid_2">
{% if theuser %}
<form enctype="multipart/form-data" action="/rowers/user-multiflex-select/user/{{ theuser.id }}/" method="post">
{% else %}
<form enctype="multipart/form-data" action="/rowers/user-multiflex-select/" method="post">
{% endif %}
<table>
{{ dateform.as_table }}
</table>
<table>
{{ modalityform.as_table }}
</table>
{% csrf_token %}
<input name='modalityform' class="button green" type="submit" value="Submit">
</form>
</li>
<li class="grid_2">
<form id="searchform" action=""
method="get" accept-charset="utf-8">
<input class="searchfield" id="searchbox" name="q" type="text" placeholder="Search">
<button class="button blue small" type="submit">
Search
</button>
</form>
</li>
</ul> </ul>

6
rowers/views.py
View File

@@ -5655,8 +5655,10 @@ def user_multiflex_select(request,
if 'enddate' in request.session: if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) enddate = iso8601.parse_date(request.session['enddate'])
try:
waterboattype = request.session['waterboattype'] waterboattype = request.session['waterboattype']
except KeyError:
waterboattype = mytypes.waterboattype
else: else:
waterboattype = mytypes.waterboattype waterboattype = mytypes.waterboattype