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

redirect after multi clone improvement

Browse Source
This commit is contained in:
Sander Roosendaal
2018-11-07 21:09:22 +01:00
parent 83fd09d4e9
commit fa66ec76d0
1 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
rowers/views.py
View File

@@ -13987,6 +13987,7 @@ def plannedsession_multiclone_view(
std = min([ps.startdate for ps in sps]) std = min([ps.startdate for ps in sps])
shiftstartdate = dateshiftform.cleaned_data['shiftstartdate'] shiftstartdate = dateshiftform.cleaned_data['shiftstartdate']
delta = shiftstartdate-std delta = shiftstartdate-std
lastdate = shiftstartdate
for ps in sps: for ps in sps:
rowers = ps.rower.all() rowers = ps.rower.all()
teams = ps.team.all() teams = ps.team.all()
@@ -13994,18 +13995,23 @@ def plannedsession_multiclone_view(
ps.startdate += delta ps.startdate += delta
ps.preferreddate += delta ps.preferreddate += delta
ps.enddate += delta ps.enddate += delta
if ps.enddate > lastdate:
lastdate = ps.enddate
ps.save() ps.save()
for rower in rowers: for rower in rowers:
add_rower_session(rower,ps) add_rower_session(rower,ps)
for team in teams: for team in teams:
add_team_session(team,ps) add_team_session(team,ps)
url = reverse(plannedsession_multicreate_view, startdatestring = shiftstartdate.strftime('%Y-%m-%d')
enddatestring = lastdate.strftime('%Y-%m-%d')
url = reverse(plannedsessions_view,
kwargs = { kwargs = {
'userid':r.user.id, 'userid':r.user.id,
'startdatestring':startdatestring,
'enddatestring':enddatestring,
}) })
if when:
url += '?when='+when
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -14219,26 +14225,8 @@ def plannedsession_multicreate_view(request,
except IndexError: except IndexError:
trainingplan = None trainingplan = None
sps = get_sessions(r,startdate=startdate,enddate=enddate)
m = Rower.objects.get(user=request.user) m = Rower.objects.get(user=request.user)
if m.rowerplan == 'coach':
teams = Team.objects.filter(manager=request.user)
members = Rower.objects.filter(team__in=teams).distinct()
if r in members:
qset = PlannedSession.objects.filter(
rower__in=[r],
startdate__lte=enddate,
enddate__gte=startdate,
).order_by("startdate","preferreddate","enddate").exclude(
sessiontype='race')
else:
qset = []
else:
qset = []
if not qset:
qset = PlannedSession.objects.filter( qset = PlannedSession.objects.filter(
rower__in=[r], rower__in=[r],
manager = request.user, manager = request.user,