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

added ranking piece only button

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-09 09:32:52 +02:00
parent e1c1bbee68
commit 5b5c5c68a9
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rowers/templates/list_workouts.html
View File

@@ -17,9 +17,9 @@
<div class="grid_4 alpha"> <div class="grid_4 alpha">
{% if team %} {% if team %}
<form enctype="multipart/form-data" action="/rowers/list-workouts/team/{{ team.id }}/" method="post"> <form enctype="multipart/form-data" method="post">
{% else %} {% else %}
<form enctype="multipart/form-data" action="/rowers/list-workouts/" method="post"> <form enctype="multipart/form-data" method="post">
{% endif %} {% endif %}
<table> <table>
@@ -46,7 +46,7 @@
{% else %} {% else %}
<h3>My Workouts</h3> <h3>My Workouts</h3>
{% endif %} {% endif %}
{% if workouts %} {% if workouts %}
<table width="100%" class="listtable shortpadded"> <table width="100%" class="listtable shortpadded">
<thead> <thead>
@@ -196,6 +196,16 @@
<div class="grid_5 alpha"> <div class="grid_5 alpha">
{% if rankingonly and not team %}
<div class="grid_2 prefix_1 alpha">
<a class="button small green" href="/rowers/list-workouts">All Workouts</a>
</div>
{% elif not team %}
<div class="grid_2 prefix_1 alpha">
<a class="button small green" href="/rowers/list-workouts/ranking">Ranking Pieces Only</a>
</div>
{% endif %}
<p>&nbsp;</p>
{% if team %} {% if team %}
<form id="searchform" action="/rowers/list-workouts/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}" <form id="searchform" action="/rowers/list-workouts/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}"
method="get" accept-charset="utf-8"> method="get" accept-charset="utf-8">

1
rowers/urls.py
View File

@@ -121,6 +121,7 @@ urlpatterns = [
url(r'^400/$', TemplateView.as_view(template_name='400.html'),name='400'), 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'^403/$', TemplateView.as_view(template_name='403.html'),name='403'),
url(r'^imports/$', TemplateView.as_view(template_name='imports.html'), name='imports'), 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<teamid>\d+)/(?P<startdatestring>\w+.*)/(?P<enddatestring>\w+.*)$',views.workouts_view), url(r'^list-workouts/team/(?P<teamid>\d+)/(?P<startdatestring>\w+.*)/(?P<enddatestring>\w+.*)$',views.workouts_view),
url(r'^list-workouts/team/(?P<teamid>\d+)/$',views.workouts_view), url(r'^list-workouts/team/(?P<teamid>\d+)/$',views.workouts_view),
url(r'^list-workouts/(?P<startdatestring>\w+.*)/(?P<enddatestring>\w+.*)$',views.workouts_view), url(r'^list-workouts/(?P<startdatestring>\w+.*)/(?P<enddatestring>\w+.*)$',views.workouts_view),

6
rowers/views.py
View File

@@ -4289,7 +4289,7 @@ def workouts_view(request,message='',successmessage='',
startdatestring="",enddatestring="", startdatestring="",enddatestring="",
startdate=timezone.now()-datetime.timedelta(days=365), startdate=timezone.now()-datetime.timedelta(days=365),
enddate=timezone.now()+datetime.timedelta(days=1), enddate=timezone.now()+datetime.timedelta(days=1),
teamid=0): teamid=0,rankingonly=False):
request.session['referer'] = absolute(request)['PATH'] request.session['referer'] = absolute(request)['PATH']
try: try:
r = getrower(request.user) r = getrower(request.user)
@@ -4365,6 +4365,9 @@ def workouts_view(request,message='',successmessage='',
startdatetime__gte=activity_startdate, startdatetime__gte=activity_startdate,
startdatetime__lte=activity_enddate).order_by("-startdatetime") startdatetime__lte=activity_enddate).order_by("-startdatetime")
if rankingonly:
workouts = [w for w in workouts if w.rankingpiece]
query = request.GET.get('q') query = request.GET.get('q')
if query: if query:
query_list = query.split() query_list = query.split()
@@ -4407,6 +4410,7 @@ def workouts_view(request,message='',successmessage='',
'enddate':enddate, 'enddate':enddate,
'announcements':announcements[0:4], 'announcements':announcements[0:4],
'team':theteam, 'team':theteam,
'rankingonly':rankingonly,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
'interactiveplot':script, 'interactiveplot':script,
'the_div':div, 'the_div':div,