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

improvements in plan functionality

Browse Source
This commit is contained in:
Sander Roosendaal
2018-11-12 14:07:08 +01:00
parent 15555402d2
commit 1b1a8c63f7
5 changed files with 67 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/forms.py
View File

@@ -963,7 +963,6 @@ class PlannedSessionTeamForm(forms.Form):
return return
cd = self.cleaned_data cd = self.cleaned_data
print cd['team'],'aap'
if not cd['team']: if not cd['team']:
raise forms.ValidationError( raise forms.ValidationError(
'You must select at least one team' 'You must select at least one team'

2
rowers/models.py
View File

@@ -1638,7 +1638,7 @@ class PlannedSession(models.Model):
('session','Training Session'), ('session','Training Session'),
('challenge','Challenge'), ('challenge','Challenge'),
('test','Mandatory Test'), ('test','Mandatory Test'),
('cycletarget','Cycle Target'), ('cycletarget','Total for a time period'),
('coursetest','OTW test over a course'), ('coursetest','OTW test over a course'),
('race','Virtual Race'), ('race','Virtual Race'),
) )

36
rowers/templates/trainingplan.html
View File

@@ -58,8 +58,10 @@
/ /
<a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a> <a href="/rowers/deletemacrocycle/{{ macrocycle.0.id }}/">delete</a>
/ /
<a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>add sessions</a>
/
{% endif %} {% endif %}
<a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}
@@ -67,7 +69,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" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
</tr> </tr>
{% endif %} {% endif %}
</table> </table>
@@ -127,8 +129,10 @@
Replan by Months Replan by Months
</a> </a>
/ /
<a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>add sessions</a>
/
{% endif %} {% endif %}
<a href='/rowers/sessions/{{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}
@@ -137,7 +141,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" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ macrocycle.0.startdate|date:"Y-m-d" }}/{{ macrocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -174,8 +178,10 @@
/ /
<a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a> <a href="/rowers/deletemesocycle/{{ mesocycle.0.id }}/">delete</a>
/ /
<a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>add sessions</a>
/
{% endif %} {% endif %}
<a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -184,7 +190,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" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
</tr> </tr>
{% endif %} {% endif %}
</table> </table>
@@ -244,8 +250,10 @@
Replan by Weeks Replan by Weeks
</a> </a>
/ /
<a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>add sessions</a>
/
{% endif %} {% endif %}
<a href='/rowers/sessions/{{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}
@@ -254,7 +262,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" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ mesocycle.0.startdate|date:"Y-m-d" }}/{{ mesocycle.0.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -296,8 +304,10 @@
/ /
<a href="/rowers/deletemicrocycle/{{ microcycle.id }}/">delete</a> <a href="/rowers/deletemicrocycle/{{ microcycle.id }}/">delete</a>
/ /
<a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>add sessions</a>
/
{% endif %} {% endif %}
<a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -308,7 +318,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" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}
@@ -366,8 +376,10 @@
/ /
<a href="/rowers/deletemicrocycle/{{ microcycle.id }}">delete</a> <a href="/rowers/deletemicrocycle/{{ microcycle.id }}">delete</a>
/ /
<a href='/rowers/sessions/create/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>add sessions</a>
/
{% endif %} {% endif %}
<a href='/rowers/sessions/{{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% else %} {% else %}
@@ -376,7 +388,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" }}/user/{{ rower.user.id }}'>sessions</a> <a href='/rowers/sessions/user/{{ rower.user.id }}?when={{ microcycle.startdate|date:"Y-m-d" }}/{{ microcycle.enddate|date:"Y-m-d" }}'>view sessions</a>
</td> </td>
</tr> </tr>
{% endif %} {% endif %}

4
rowers/urls.py
View File

@@ -358,8 +358,8 @@ urlpatterns = [
url(r'^me/exportsettings/$',views.rower_exportsettings_view), url(r'^me/exportsettings/$',views.rower_exportsettings_view),
url(r'^me/exportsettings/user/(?P<userid>\d+)$',views.rower_exportsettings_view), url(r'^me/exportsettings/user/(?P<userid>\d+)$',views.rower_exportsettings_view),
url(r'^team/(?P<id>\d+)/$',views.team_view), url(r'^team/(?P<id>\d+)/$',views.team_view),
url(r'^team/(?P<id>\d+)/memberstats$',views.team_members_stats_view), url(r'^team/(?P<id>\d+)/memberstats/$',views.team_members_stats_view),
url(r'^team/(?P<id>\d+)/edit$',views.team_edit_view), url(r'^team/(?P<id>\d+)/edit/$',views.team_edit_view),
url(r'^team/(?P<id>\d+)/leaveconfirm/$',views.team_leaveconfirm_view), url(r'^team/(?P<id>\d+)/leaveconfirm/$',views.team_leaveconfirm_view),
url(r'^team/(?P<id>\d+)/leave/$',views.team_leave_view), url(r'^team/(?P<id>\d+)/leave/$',views.team_leave_view),
url(r'^team/(?P<id>\d+)/deleteconfirm/$',views.team_deleteconfirm_view), url(r'^team/(?P<id>\d+)/deleteconfirm/$',views.team_deleteconfirm_view),

65
rowers/views.py
View File

@@ -14326,8 +14326,9 @@ def plannedsession_multicreate_view(request,
) )
if when: startdatestring = startdate.strftime('%Y-%m-%d')
url += '?when='+when enddatestring = enddate.strftime('%Y-%m-%d')
url += '?when='+startdatestring+'/'+enddatestring
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -14394,6 +14395,9 @@ def plannedsession_teamcreate_view(request,
sps += res sps += res
sps = list(set(sps)) sps = list(set(sps))
ids = [ps.id for ps in sps]
sps = PlannedSession.objects.filter(id__in=ids).order_by(
"preferreddate","startdate","enddate")
if request.method == 'POST': if request.method == 'POST':
sessioncreateform = PlannedSessionForm(request.POST) sessioncreateform = PlannedSessionForm(request.POST)
@@ -14437,6 +14441,7 @@ def plannedsession_teamcreate_view(request,
cd = sessionteamselectform.cleaned_data cd = sessionteamselectform.cleaned_data
teams = cd['team'] teams = cd['team']
request.session['teams'] = [team.id for team in teams]
for team in teams: for team in teams:
add_team_session(team,ps) add_team_session(team,ps)
rs = Rower.objects.filter(team__in=[team]) rs = Rower.objects.filter(team__in=[team])
@@ -14444,11 +14449,12 @@ def plannedsession_teamcreate_view(request,
add_rower_session(r,ps) add_rower_session(r,ps)
url = reverse(plannedsession_teamcreate_view) url = reverse(plannedsession_teamcreate_view)
if when: startdatestring = startdate.strftime('%Y-%m-%d')
url += '?when='+when enddatestring = enddate.strftime('%Y-%m-%d')
url += '?when='+startdatestring+'/'+enddatestring
return HttpResponseRedirect(url)
return HttpResponseRedirect(url)
else: else:
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d') timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
breadcrumbs = [ breadcrumbs = [
@@ -14481,10 +14487,19 @@ def plannedsession_teamcreate_view(request,
'enddate':enddate, 'enddate':enddate,
'preferreddate':startdate, 'preferreddate':startdate,
} }
if 'teams' in request.session:
teams = request.session['teams']
theteams = Team.objects.filter(id__in=teams)
initialteam = {
'team':theteams
}
else:
initialteam = {}
sessioncreateform = PlannedSessionForm(initial=initial) sessioncreateform = PlannedSessionForm(initial=initial)
sessionteamselectform = PlannedSessionTeamForm( sessionteamselectform = PlannedSessionTeamForm(
request.user request.user,initial=initialteam
) )
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d') timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
@@ -14561,6 +14576,9 @@ def plannedsession_teamedit_view(request,
sps = list(set(sps)) sps = list(set(sps))
ids = [ps.id for ps in sps]
sps = PlannedSession.objects.filter(id__in=ids).order_by(
"preferreddate","startdate","enddate")
if request.method == 'POST': if request.method == 'POST':
sessioncreateform = PlannedSessionForm(request.POST,instance=ps) sessioncreateform = PlannedSessionForm(request.POST,instance=ps)
@@ -14621,8 +14639,10 @@ def plannedsession_teamedit_view(request,
'sessionid':sessionid, 'sessionid':sessionid,
}) })
if when: startdatestring = startdate.strftime('%Y-%m-%d')
url += '?when='+when enddatestring = enddate.strftime('%Y-%m-%d')
url += '?when='+startdatestring+'/'+enddatestring
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
@@ -15060,11 +15080,6 @@ def plannedsession_clone_view(request,id=0,userid=0):
r = getrequestrower(request,userid=userid) r = getrequestrower(request,userid=userid)
if when:
timeperiod = when
else:
timeperiod = 'thisweek'
startdate,enddate = get_dates_timeperiod(request) startdate,enddate = get_dates_timeperiod(request)
try: try:
@@ -15109,8 +15124,10 @@ def plannedsession_clone_view(request,id=0,userid=0):
} }
) )
if when: startdatestring = startdate.strftime('%Y-%m-%d')
url += '?when='+when enddatestring = enddate.strftime('%Y-%m-%d')
url += '?when='+startdatestring+'/'+enddatestring
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -15175,8 +15192,9 @@ def plannedsession_edit_view(request,id=0,userid=0):
'userid':r.user.id, 'userid':r.user.id,
}) })
if when: startdatestring = startdate.strftime('%Y-%m-%d')
url += '?when='+when enddatestring = enddate.strftime('%Y-%m-%d')
url += '?when='+startdatestring+'/'+enddatestring
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
@@ -16695,11 +16713,8 @@ def rower_trainingplan_view(request,
thismesoid=0): thismesoid=0):
when = request.GET.get('when') startdate,enddate = get_dates_timeperiod(request)
if when:
startdate,enddate = get_dates_timeperiod(request)
else:
startdate = datetime.date.today()
try: try:
plan = TrainingPlan.objects.get(id=id) plan = TrainingPlan.objects.get(id=id)