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

ui improvements in session creation

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-14 16:59:50 +01:00
parent 99b1514d13
commit 2ba45964f9
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rowers/views/planviews.py
View File

@@ -513,6 +513,8 @@ def plannedsession_create_view(request,
startdate,enddate = get_dates_timeperiod(request,startdatestring=startdatestring, startdate,enddate = get_dates_timeperiod(request,startdatestring=startdatestring,
enddatestring=enddatestring) enddatestring=enddatestring)
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
if request.method == 'POST': if request.method == 'POST':
@@ -536,6 +538,7 @@ def plannedsession_create_view(request,
'userid':userid, 'userid':userid,
}) })
if '_continue' in request.POST: if '_continue' in request.POST:
url = reverse('plannedsession_edit_view',kwargs={ url = reverse('plannedsession_edit_view',kwargs={
'id':ps.id, 'id':ps.id,
@@ -543,6 +546,8 @@ def plannedsession_create_view(request,
elif '_addanother' in request.POST: elif '_addanother' in request.POST:
url = reverse('plannedsession_create_view',kwargs={'userid':userid}) url = reverse('plannedsession_create_view',kwargs={'userid':userid})
url = url+'?when='+timeperiod
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
@@ -641,7 +646,7 @@ def plannedsession_create_view(request,
except IndexError: except IndexError:
trainingplan = None trainingplan = None
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
dateform = DateRangeForm(initial={ dateform = DateRangeForm(initial={
'startdate':startdate, 'startdate':startdate,
@@ -653,6 +658,10 @@ def plannedsession_create_view(request,
'url': reverse(plannedsessions_view), 'url': reverse(plannedsessions_view),
'name': 'Planned Sessions' 'name': 'Planned Sessions'
}, },
{
'url': reverse(plannedsessions_view)+'?when='+timeperiod,
'name': timeperiod,
},
{ {
'url': reverse(plannedsession_create_view), 'url': reverse(plannedsession_create_view),
'name': 'Add Session' 'name': 'Add Session'
@@ -910,7 +919,8 @@ def plannedsession_teamcreate_view(request,
therower = getrequestplanrower(request,userid=userid) therower = getrequestplanrower(request,userid=userid)
startdate,enddate = get_dates_timeperiod(request)
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
teams = Team.objects.filter(manager=request.user) teams = Team.objects.filter(manager=request.user)
if teams.count()>0: if teams.count()>0:
@@ -921,7 +931,7 @@ def plannedsession_teamcreate_view(request,
url = reverse('rower_teams_view') url = reverse('rower_teams_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
startdate,enddate = get_dates_timeperiod(request)
trainingplan = None trainingplan = None
@@ -970,7 +980,9 @@ def plannedsession_teamcreate_view(request,
'id':ps.id, 'id':ps.id,
}) })
elif '_addanother' in request.POST: elif '_addanother' in request.POST:
url = reverse('plannedsession_create_view',kwargs={'userid':userid}) url = reverse('plannedsession_teamcreate_view',kwargs={'userid':userid})
url = url+'?when='+timeperiod
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -2446,12 +2458,11 @@ def rower_view_instantplan(request,id='',userid=0):
return HttpResponseRedirect(reverse('rower_select_instantplan')) return HttpResponseRedirect(reverse('rower_select_instantplan'))
plansteps = response.json() plansteps = response.json()
trainingdays = plansteps['plan']['trainingDays'] trainingdays = plansteps['trainingDays']
trainingdays2 = [] trainingdays2 = []
nextday = trainingdays.pop(0) nextday = trainingdays.pop(0)
for i in range(plansteps['plan']['duration']): for i in range(plansteps['duration']):
if nextday['order'] == i+1: if nextday['order'] == i+1:
nextday['week'] = (divmod(i,7)[0])+1 nextday['week'] = (divmod(i,7)[0])+1
trainingdays2.append(nextday) trainingdays2.append(nextday)
@@ -2475,6 +2486,7 @@ def rower_view_instantplan(request,id='',userid=0):
if request.method == 'POST': if request.method == 'POST':
form = TrainingPlanForm(request.POST,user=request.user) form = TrainingPlanForm(request.POST,user=request.user)
if form.is_valid(): if form.is_valid():
plansteps = response.json() plansteps = response.json()
name = form.cleaned_data['name'] name = form.cleaned_data['name']