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

adding workout selector to virtual event compare

Browse Source
This commit is contained in:
Sander Roosendaal
2020-06-06 16:20:16 +02:00
parent 3d622ecfda
commit 55ad7ce2d9
3 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/templates/list_workouts.html
View File

@@ -65,7 +65,10 @@
</p> </p>
<link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" /> <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
<link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" /> <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
<script async="true" src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script> <script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
<script async="true" type="text/text/javascript">
Bokeh.set_log_level("info")
</script>
{{ interactiveplot |safe }} {{ interactiveplot |safe }}

32
rowers/templates/multicompare.html
View File

@@ -15,28 +15,34 @@
<h1>Interactive Comparison</h1> <h1>Interactive Comparison</h1>
<form enctype="multipart/form-data" action="" method="post">
<ul class="main-content"> <ul class="main-content">
<li class="grid_4"> <li class="grid_4">
<div> <div>
{{ the_div|safe }} {{ the_div|safe }}
</div> </div>
</li> </li>
<li class="grid_4">
<form enctype="multipart/form-data" action="" method="post"> <li class="grid_2">
{% csrf_token %}
<table> {% csrf_token %}
{{ chartform.as_table }} <table>
</table> {{ chartform.as_table }}
</table>
</li>
<li class="grid_2">
<table>
{{ form.as_table }}
</table>
<p> <p>
<input name='workoutselectform' class="button green" type="submit" value="Submit"> <input name='workoutselectform' class="button" type="submit" value="Submit">
</p> </p>
</form> </li>
</li>
</ul>
</ul>
</form>
{% endblock %} {% endblock %}

34
rowers/views/workoutviews.py
View File

@@ -1615,6 +1615,8 @@ def virtualevent_compare_view(request,id=0):
workoutids = [result.workoutid for result in results] workoutids = [result.workoutid for result in results]
startenddict = {} startenddict = {}
if race.sessiontype == 'race': if race.sessiontype == 'race':
for result in results: for result in results:
@@ -1659,6 +1661,10 @@ def virtualevent_compare_view(request,id=0):
except Workout.DoesNotExist: except Workout.DoesNotExist:
pass pass
form = WorkoutMultipleCompareForm()
form.fields["workouts"].queryset = Workout.objects.filter(id__in=workoutids)
form.fields["workouts"].initial = Workout.objects.filter(id__in=workoutids)
labeldict = { labeldict = {
int(w.id): w.__str__() for w in workouts int(w.id): w.__str__() for w in workouts
@@ -1674,7 +1680,25 @@ def virtualevent_compare_view(request,id=0):
'teamid':0 'teamid':0
} }
) )
if request.method == 'POST' and 'workouts' in request.POST:
form = WorkoutMultipleCompareForm(request.POST)
form.fields["workouts"].queryset = Workout.objects.filter(id__in=workoutids)
chartform = ChartParamChoiceForm(request.POST)
if form.is_valid() and chartform.is_valid():
cd = form.cleaned_data
workouts = cd['workouts']
workoutids = [w.id for w in workouts]
xparam = chartform.cleaned_data['xparam']
yparam = chartform.cleaned_data['yparam']
plottype = chartform.cleaned_data['plottype']
teamid = chartform.cleaned_data['teamid']
ids = [int(w.id) for w in workouts]
request.session['ids'] = ids
elif request.method == 'POST': elif request.method == 'POST':
form = WorkoutMultipleCompareForm()
form.fields["workouts"].queryset = Workout.objects.filter(id__in=workoutids)
request.session['ids'] = workoutids
chartform = ChartParamChoiceForm(request.POST) chartform = ChartParamChoiceForm(request.POST)
if chartform.is_valid(): if chartform.is_valid():
xparam = chartform.cleaned_data['xparam'] xparam = chartform.cleaned_data['xparam']
@@ -1686,7 +1710,6 @@ def virtualevent_compare_view(request,id=0):
except KeyError: except KeyError:
pass pass
request.session['ids'] = workoutids
workouts = [] workouts = []
for id in workoutids: for id in workoutids:
try: try:
@@ -1695,11 +1718,9 @@ def virtualevent_compare_view(request,id=0):
except Workout.DoesNotExist: except Workout.DoesNotExist:
pass pass
labeldict = { labeldict = {
int(w.id): w.__str__() for w in workouts int(w.id): w.__str__() for w in workouts
} }
else:
raise HttpResponse('Only GET and POST allowed',status=405)
res = interactive_multiple_compare_chart(workoutids,xparam,yparam, res = interactive_multiple_compare_chart(workoutids,xparam,yparam,
@@ -1747,6 +1768,7 @@ def virtualevent_compare_view(request,id=0):
'promember':promember, 'promember':promember,
'teamid':0, 'teamid':0,
'chartform':chartform, 'chartform':chartform,
'form':form,
'teams':[] 'teams':[]
}) })