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

sessions by date now working

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-19 16:11:45 +02:00
parent 35b936b6fe
commit d343eb6748
3 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rowers/templates/trainingplan.html
View File

@@ -43,7 +43,7 @@
/ /
<a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a> <a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a>
/ /
<a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}
@@ -51,7 +51,7 @@
&nbsp; &nbsp;
</tr> </tr>
<tr> <tr>
<a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</tr> </tr>
{% endif %} {% endif %}
</table> </table>
@@ -99,7 +99,7 @@
/ /
<a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a> <a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a>
/ /
<a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}
@@ -108,7 +108,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -144,7 +144,7 @@
/ /
<a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a> <a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a>
/ /
<a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -153,7 +153,7 @@
&nbsp; &nbsp;
</tr> </tr>
<tr> <tr>
<a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</tr> </tr>
{% endif %} {% endif %}
</table> </table>
@@ -201,7 +201,7 @@
/ /
<a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a> <a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a>
/ /
<a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}
@@ -210,7 +210,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -251,7 +251,7 @@
/ /
<a href="/rowers/deletemicrocycle/{{ microcycle.id }}/">delete</a> <a href="/rowers/deletemicrocycle/{{ microcycle.id }}/">delete</a>
/ /
<a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -262,7 +262,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -310,7 +310,7 @@
/ /
<a href="/rowers/deletemicrocycle/{{ microcycle.id }}">delete</a> <a href="/rowers/deletemicrocycle/{{ microcycle.id }}">delete</a>
/ /
<a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}
@@ -319,7 +319,7 @@
</tr> </tr>
<tr> <tr>
<td colspan="4"> <td colspan="4">
<a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>sessions</a> <a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}

4
rowers/urls.py
View File

@@ -483,6 +483,10 @@ urlpatterns = [
url(r'^sessions/print/user/(?P<userid>\d+)$',views.plannedsessions_print_view), url(r'^sessions/print/user/(?P<userid>\d+)$',views.plannedsessions_print_view),
url(r'^sessions/$',views.plannedsessions_view), url(r'^sessions/$',views.plannedsessions_view),
url(r'^sessions/user/(?P<userid>\d+)$',views.plannedsessions_view), url(r'^sessions/user/(?P<userid>\d+)$',views.plannedsessions_view),
url(r'^sessions/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)$',
views.plannedsessions_view),
url(r'^sessions/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\d+-\d+-\d+)/user/(?P<userid>\d+)$',
views.plannedsessions_view),
url(r'^courses/(?P<id>\d+)/edit$',views.course_edit_view, url(r'^courses/(?P<id>\d+)/edit$',views.course_edit_view,
name='course_edit_view'), name='course_edit_view'),
url(r'^courses/(?P<id>\d+)/delete$',views.course_delete_view), url(r'^courses/(?P<id>\d+)/delete$',views.course_delete_view),

15
rowers/views.py
View File

@@ -6678,7 +6678,6 @@ def workouts_view(request,message='',successmessage='',
'name':'Workouts' 'name':'Workouts'
}, },
] ]
return render(request, 'list_workouts.html', return render(request, 'list_workouts.html',
{'workouts': workouts, {'workouts': workouts,
'active': 'nav-workouts', 'active': 'nav-workouts',
@@ -14395,7 +14394,7 @@ def plannedsessions_coach_view(request,
@login_required() @login_required()
def plannedsessions_view(request, def plannedsessions_view(request,
userid=0): userid=0,startdatestring='',enddatestring=''):
r = getrequestrower(request,userid=userid) r = getrequestrower(request,userid=userid)
@@ -14407,6 +14406,18 @@ def plannedsessions_view(request,
startdate,enddate = get_dates_timeperiod(timeperiod) startdate,enddate = get_dates_timeperiod(timeperiod)
if startdatestring:
try:
startdate = iso8601.parse_date(startdatestring)
except ParseError:
pass
if enddatestring:
try:
enddate = iso8601.parse_date(enddatestring)
except ParseError:
pass
try: try:
trainingplan = TrainingPlan.objects.filter( trainingplan = TrainingPlan.objects.filter(
startdate__lte = startdate, startdate__lte = startdate,