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

form create changes

Browse Source
This commit is contained in:
Sander Roosendaal
2021-02-13 14:35:55 +01:00
parent 050c31a5c1
commit 3efcc8d042
8 changed files with 112 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
rowers/views/planviews.py
View File

@@ -441,6 +441,7 @@ def plannedsession_create_view(request,
course = cd['course']
name = cd['name']
interval_string = cd['interval_string']
fitfile = cd['fitfile']
@@ -467,25 +468,11 @@ def plannedsession_create_view(request,
ps.save()
if interval_string:
dct = trainingparser.parsetodict(interval_string)
dct = [item for item in dct if item['value'] != 0]
dct = trainingparser.tofitdict(dct)
ps.json_string = json.dumps(dct)
txt = ps_dict_get_description(dct)
ps.comment += '\n'+txt
ps.save()
if sessioncreateform.cleaned_data['fitfile']:
f = sessioncreateform.cleaned_data['fitfile']
filename, path_and_filename = handle_uploaded_file(f)
ps.fitfile.name = filename
structured_workout = FitWorkoutSteps(path_and_filename)
dct = structured_workout.get_dict()
ps.comment += '\n'+structured_workout.get_description()
ps.json_string = json.dumps(dct)
ps.save()
#if sessioncreateform.cleaned_data['fitfile']:
# f = sessioncreateform.cleaned_data['fitfile']
# filename, path_and_filename = handle_uploaded_file(f)
# ps.fitfile.name = filename
# ps.save()
add_rower_session(r,ps)
@@ -759,7 +746,7 @@ def plannedsession_teamcreate_view(request,
sessiontemplates = PlannedSession.objects.filter(manager=request.user,is_template=True)
if request.method == 'POST':
sessioncreateform = PlannedSessionForm(request.POST)
sessioncreateform = PlannedSessionForm(request.POST, request.FILES)
sessionteamselectform = PlannedSessionTeamForm(
request.user,request.POST
)
@@ -777,6 +764,9 @@ def plannedsession_teamcreate_view(request,
comment = cd['comment']
course = cd['course']
name = cd['name']
interval_string = cd['interval_string']
fitfile = cd['fitfile']
if sessionunit == 'min':
sessionmode = 'time'
@@ -795,6 +785,8 @@ def plannedsession_teamcreate_view(request,
comment=comment,
criterium=criterium,
course=course,
interval_string=interval_string,
fitfile=fitfile,
manager=request.user)
ps.save()
@@ -940,7 +932,7 @@ def plannedsession_teamedit_view(request,
"preferreddate","startdate","enddate")
if request.method == 'POST':
sessioncreateform = PlannedSessionForm(request.POST,instance=ps)
sessioncreateform = PlannedSessionForm(request.POST,request.FILES,instance=ps)
sessionteamselectform = PlannedSessionTeamForm(
request.user,request.POST
)
@@ -1792,7 +1784,7 @@ def plannedsession_edit_view(request,id=0,userid=0):
return HttpResponseRedirect(url)
if request.method == 'POST':
sessioncreateform = PlannedSessionForm(request.POST,instance=ps)
sessioncreateform = PlannedSessionForm(request.POST, request.FILES,instance=ps)
if sessioncreateform.is_valid():
cd = sessioncreateform.cleaned_data