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

a few updates

Browse Source
This commit is contained in:
Sander Roosendaal
2020-06-02 15:40:45 +02:00
parent ecb90c9ac4
commit e219b8580f
3 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
rowers/templates/mapcompare.html Normal file
View File

@@ -0,0 +1,49 @@
{% extends "newbase.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block title %}View Comparison {% endblock %}
{% block main %}
<script src="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.js"></script>
<script async="true" type="text/javascript">
Bokeh.set_log_level("info");
</script>
{{ interactiveplot |safe }}
<h1>Interactive Comparison</h1>
<ul class="main-content">
<li class="grid_4">
<div>
{{ the_div|safe }}
</div>
</li>
<li class="grid_4">
<form enctype="multipart/form-data" action="" method="post">
{% csrf_token %}
<table>
{{ chartform.as_table }}
</table>
<p>
<input name='workoutselectform' class="button green" type="submit" value="Submit">
</p>
</form>
</li>
</ul>
{% endblock %}
{% block sidebar %}
{% if active == 'nav-racing' %}
{% include 'menu_racing.html' %}
{% else %}
{% include 'menu_workouts.html' %}
{% endif %}
{% endblock %}

2
rowers/urls.py
View File

@@ -342,6 +342,8 @@ urlpatterns = [
re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/wind/$',views.workout_wind_view,name='workout_wind_view'), re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/wind/$',views.workout_wind_view,name='workout_wind_view'),
re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/image/$',views.workout_uploadimage_view,name='workout_uploadimage_view'), re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/image/$',views.workout_uploadimage_view,name='workout_uploadimage_view'),
re_path(r'^virtualevent/(?P<id>\d+)/compare/$',views.virtualevent_compare_view,name='virtualevent_compare_view'), re_path(r'^virtualevent/(?P<id>\d+)/compare/$',views.virtualevent_compare_view,name='virtualevent_compare_view'),
re_path(r'^virtualevent/(?P<id>\d+)/mapcompare/$',views.virtualevent_mapcompare_view,
name='virtualevent_mapcompare_view'),
re_path(r'^virtualevent/(?P<id>\d+)/image/$', re_path(r'^virtualevent/(?P<id>\d+)/image/$',
views.virtualevent_uploadimage_view,name='virtualevent_uploadimage_view'), views.virtualevent_uploadimage_view,name='virtualevent_uploadimage_view'),
re_path(r'^virtualevent/(?P<id>\d+)/setimage/(?P<logoid>\d+)/$', re_path(r'^virtualevent/(?P<id>\d+)/setimage/(?P<logoid>\d+)/$',

2
rowers/views/workoutviews.py
View File

@@ -1578,9 +1578,7 @@ def virtualevent_mapcompare_view(request,id=0):
'race':race, 'race':race,
'results':results, 'results':results,
'active':'nav-racing', 'active':'nav-racing',
'promember':promember,
'teamid':0, 'teamid':0,
'chartform':chartform,
'teams':[] 'teams':[]
}) })