From 6bad876967b34e303b1100224187d8e1bb470288 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Mon, 17 Jun 2019 20:28:39 +0200
Subject: [PATCH] edits
---
.../templates/plannedsession_multicreate.html | 2 +-
.../plannedsessions_multiclone_select.html | 7 ++++++
rowers/views/planviews.py | 22 ++++++++++++++++++-
3 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/rowers/templates/plannedsession_multicreate.html b/rowers/templates/plannedsession_multicreate.html
index 53418ea0..581e8a85 100644
--- a/rowers/templates/plannedsession_multicreate.html
+++ b/rowers/templates/plannedsession_multicreate.html
@@ -20,7 +20,7 @@
{{ teamform.as_table }}
-
+
diff --git a/rowers/templates/plannedsessions_multiclone_select.html b/rowers/templates/plannedsessions_multiclone_select.html
index cfbddce6..674dd7a3 100644
--- a/rowers/templates/plannedsessions_multiclone_select.html
+++ b/rowers/templates/plannedsessions_multiclone_select.html
@@ -64,7 +64,11 @@
+{% if team %}
+Clone Multiple Sessions for {{ team.name }}
+{% else %}
Clone Multiple Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}
+{% endif %}
-
@@ -73,6 +77,9 @@
+
+ {{ teamform.as_table }}
+
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index e1804a74..440ed4dd 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -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,
}
)