diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index 7ca1476e..9b61d44c 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -17,9 +17,9 @@
{% if team %} -
+ {% else %} - + {% endif %} @@ -46,7 +46,7 @@ {% else %}

My Workouts

{% endif %} - + {% if workouts %}
@@ -196,6 +196,16 @@
+ {% if rankingonly and not team %} + + {% elif not team %} + + {% endif %} +

 

{% if team %} diff --git a/rowers/urls.py b/rowers/urls.py index e395fb87..96199525 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -121,6 +121,7 @@ urlpatterns = [ url(r'^400/$', TemplateView.as_view(template_name='400.html'),name='400'), url(r'^403/$', TemplateView.as_view(template_name='403.html'),name='403'), url(r'^imports/$', TemplateView.as_view(template_name='imports.html'), name='imports'), + url(r'^list-workouts/ranking$',views.workouts_view,{'rankingonly':True}), url(r'^list-workouts/team/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.workouts_view), url(r'^list-workouts/team/(?P\d+)/$',views.workouts_view), url(r'^list-workouts/(?P\w+.*)/(?P\w+.*)$',views.workouts_view), diff --git a/rowers/views.py b/rowers/views.py index 18240b21..349feb5d 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -4289,7 +4289,7 @@ def workouts_view(request,message='',successmessage='', startdatestring="",enddatestring="", startdate=timezone.now()-datetime.timedelta(days=365), enddate=timezone.now()+datetime.timedelta(days=1), - teamid=0): + teamid=0,rankingonly=False): request.session['referer'] = absolute(request)['PATH'] try: r = getrower(request.user) @@ -4365,6 +4365,9 @@ def workouts_view(request,message='',successmessage='', startdatetime__gte=activity_startdate, startdatetime__lte=activity_enddate).order_by("-startdatetime") + if rankingonly: + workouts = [w for w in workouts if w.rankingpiece] + query = request.GET.get('q') if query: query_list = query.split() @@ -4407,6 +4410,7 @@ def workouts_view(request,message='',successmessage='', 'enddate':enddate, 'announcements':announcements[0:4], 'team':theteam, + 'rankingonly':rankingonly, 'teams':get_my_teams(request.user), 'interactiveplot':script, 'the_div':div,