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