edits
This commit is contained in:
@@ -20,7 +20,7 @@
|
||||
</table>
|
||||
<table>
|
||||
{{ teamform.as_table }}
|
||||
</table>
|
||||
</table>
|
||||
<input type="Submit" value="Set Date Range">
|
||||
</form>
|
||||
</p>
|
||||
|
||||
@@ -64,7 +64,11 @@
|
||||
|
||||
</script>
|
||||
|
||||
{% if team %}
|
||||
<h1>Clone Multiple Sessions for {{ team.name }}</h1>
|
||||
{% else %}
|
||||
<h1>Clone Multiple Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
|
||||
{% endif %}
|
||||
|
||||
<ul class="main-content">
|
||||
<li class="grid_2">
|
||||
@@ -73,6 +77,9 @@
|
||||
<table>
|
||||
{{ dateform.as_table }}
|
||||
</table>
|
||||
<table>
|
||||
{{ teamform.as_table }}
|
||||
</table>
|
||||
<input type="Submit" value="Set Date Range">
|
||||
</form>
|
||||
</p>
|
||||
|
||||
@@ -182,7 +182,7 @@ def plannedsession_multiclone_view(
|
||||
|
||||
|
||||
startdate,enddate = get_dates_timeperiod(request)
|
||||
|
||||
teamid = get_team(request)
|
||||
|
||||
if request.method == 'POST' and 'daterange' in request.POST:
|
||||
dateform = DateRangeForm(request.POST)
|
||||
@@ -245,6 +245,17 @@ def plannedsession_multiclone_view(
|
||||
"startdate","preferreddate","enddate").exclude(
|
||||
sessiontype='race')
|
||||
|
||||
if teamid:
|
||||
sps = sps.filter(team__in=[teamid])
|
||||
try:
|
||||
team = Team.objects.get(id=teamid)
|
||||
if team.manager != request.user:
|
||||
team = None
|
||||
except Team.DoesNotExist:
|
||||
team = None
|
||||
else:
|
||||
team = None
|
||||
|
||||
query = request.GET.get('q')
|
||||
if query:
|
||||
query_list = query.split()
|
||||
@@ -285,6 +296,13 @@ def plannedsession_multiclone_view(
|
||||
'enddate':enddate,
|
||||
})
|
||||
|
||||
if len(Team.objects.filter(manager=request.user))>=1:
|
||||
teamform = RowerTeamForm(request.user)
|
||||
if teamid:
|
||||
teamform = RowerTeamForm(request.user,initial={'team':teamid})
|
||||
else:
|
||||
teamform = None
|
||||
|
||||
return render(request, 'plannedsessions_multiclone_select.html',
|
||||
{'plannedsessions':sps,
|
||||
'breadcrumbs':breadcrumbs,
|
||||
@@ -297,6 +315,8 @@ def plannedsession_multiclone_view(
|
||||
'rower':r,
|
||||
'active':'nav-plan',
|
||||
'timeperiod':timeperiod,
|
||||
'team':team,
|
||||
'teamform':teamform,
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user