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

bug fix cloning behavior

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-03 17:53:47 +02:00
parent 9c3cb7d246
commit fc9e680801
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
rowers/views/planviews.py
View File

@@ -416,12 +416,20 @@ def plannedsession_create_view(request,
'preferreddate':fprefdate 'preferreddate':fprefdate
} }
else: else:
preferreddate = startdate.date() try:
preferreddate = startdate.date()
except AttributeError:
preferreddate = startdate
if preferreddate < timezone.now().date(): if preferreddate < timezone.now().date():
preferreddate = timezone.now().date() preferreddate = timezone.now().date()
if preferreddate > enddate.date(): try:
preferreddate = enddate.date() enddate = enddate.date()
except AttributeError:
pass
if preferreddate > enddate:
preferreddate = enddate
forminitial = { forminitial = {
'startdate':startdate, 'startdate':startdate,
@@ -1427,16 +1435,20 @@ def plannedsession_clone_view(request,id=0,userid=0):
ps.name += ' (copy)' ps.name += ' (copy)'
ps.is_template = False ps.is_template = False
deltadays = ps.enddate-ps.startdate deltadays = ps.preferreddate-ps.startdate
ps.startdate = timezone.now().date() ps.startdate = startdate
ps.enddate = (timezone.now()+deltadays).date() ps.enddate = enddate
ps.preferreddate = ps.preferreddate+deltadays ps.preferreddate = ps.startdate+deltadays
ps.save() ps.save()
for rower in rowers: if rowers:
add_rower_session(rower,ps) for rower in rowers:
add_rower_session(rower,ps)
else:
add_rower_session(r,ps)
for team in teams: for team in teams:
add_team_session(team,ps) add_team_session(team,ps)
@@ -1602,6 +1614,7 @@ def plannedsession_edit_view(request,id=0,userid=0):
cd['sessionmode'] = 'distance' cd['sessionmode'] = 'distance'
res,message = update_plannedsession(ps,cd) res,message = update_plannedsession(ps,cd)
if res: if res: