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

all a bit neater and now working

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-02 14:06:15 +01:00
parent c57500fa35
commit 04f823578f
2 changed files with 34 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
rowers/views/planviews.py
View File

@@ -431,57 +431,18 @@ def plannedsession_create_view(request,
if request.method == 'POST':
sessioncreateform = PlannedSessionForm(request.POST, request.FILES)
if sessioncreateform.is_valid():
cd = sessioncreateform.cleaned_data
startdate = cd['startdate']
enddate = cd['enddate']
preferreddate = cd['preferreddate']
sessiontype = cd['sessiontype']
sessionmode = cd['sessionmode']
criterium = cd['criterium']
sessionsport = cd['sessionsport']
sessionvalue = cd['sessionvalue']
sessionunit = cd['sessionunit']
comment = cd['comment']
course = cd['course']
name = cd['name']
interval_string = cd['interval_string']
fitfile = cd['fitfile']
if sessionunit == 'min':
sessionmode = 'time'
elif sessionunit in ['km','m']:
sessionmode = 'distance'
ps = PlannedSession(
name=name,
startdate=startdate,
enddate=enddate,
preferreddate=preferreddate,
course=course,
sessiontype=sessiontype,
sessionmode=sessionmode,
sessionvalue=sessionvalue,
sessionunit=sessionunit,
sessionsport=sessionsport,
comment=comment,
criterium=criterium,
interval_string=interval_string,
manager=request.user)
ps = sessioncreateform.save(commit=False)
ps.manager = request.user
ps.save()
if sessioncreateform.cleaned_data['fitfile']:
f = sessioncreateform.cleaned_data['fitfile']
filename, path_and_filename = handle_uploaded_file(f)
ps.fitfile = filename
ps.save()
add_rower_session(r,ps)
request.session['fstartdate'] = str(arrow.get(startdate))
request.session['fenddate'] = str(arrow.get(enddate))
request.session['fprefdate'] = str(arrow.get(preferreddate))
request.session['fstartdate'] = str(arrow.get(ps.startdate))
request.session['fenddate'] = str(arrow.get(ps.enddate))
request.session['fprefdate'] = str(arrow.get(ps.preferreddate))
else:
if 'fstartdate' in request.session:
@@ -765,50 +726,10 @@ def plannedsession_teamcreate_view(request,
if sessioncreateform.is_valid() and sessionteamselectform.is_valid():
cd = sessioncreateform.cleaned_data
startdate = cd['startdate']
enddate = cd['enddate']
preferreddate = cd['preferreddate']
sessiontype = cd['sessiontype']
sessionmode = cd['sessionmode']
criterium = cd['criterium']
sessionvalue = cd['sessionvalue']
sessionunit = cd['sessionunit']
sessionsport = cd['sessionsport']
comment = cd['comment']
course = cd['course']
name = cd['name']
interval_string = cd['interval_string']
fitfile = cd['fitfile']
if sessionunit == 'min':
sessionmode = 'time'
elif sessionunit in ['km','m']:
sessionmode = 'distance'
ps = PlannedSession(
name=name,
startdate=startdate,
enddate=enddate,
preferreddate=preferreddate,
sessiontype=sessiontype,
sessionmode=sessionmode,
sessionsport=sessionsport,
sessionvalue=sessionvalue,
sessionunit=sessionunit,
comment=comment,
criterium=criterium,
course=course,
interval_string=interval_string,
fitfile=fitfile,
manager=request.user)
ps = sessioncreateform.save(commit=False)
ps.manager = request.user
ps.save()
if fitfile:
f = sessioncreateform.cleaned_data['fitfile']
filename, path_and_filename = handle_uploaded_file(f)
ps.fitfile.name = filename
ps.save()
cd = sessionteamselectform.cleaned_data
teams = cd['team']
@@ -2235,7 +2156,7 @@ class PlannedSessionDelete(DeleteView):
w.plannedsession = None
w.save()
url = reverse(plannedsessions_view)
next = self.request.GET.get('next',url)