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

some javascript to improve planned session manage

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-07 22:30:47 +01:00
parent 1e70708ce0
commit 6a56bb98b6
5 changed files with 94 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
rowers/views.py
View File

@@ -11724,6 +11724,11 @@ def plannedsession_create_view(request):
comment = cd['comment']
name = cd['name']
if sessionunit == 'min':
sessionmode = 'time'
elif sessionunit in ['km','m']:
sessionmode = 'distance'
ps = PlannedSession(
name=name,
startdate=startdate,
@@ -11786,7 +11791,12 @@ def plannedsessions_view(request,timeperiod='today',rowerid=0):
})
@login_required()
def plannedsessions_manage_view(request,timeperiod='today',rowerid=0):
def plannedsessions_manage_view(request,timeperiod='today',rowerid=0,
initialsession=0):
is_ajax = False
if request.is_ajax():
is_ajax = True
if rowerid==0:
r = getrower(request.user)
@@ -11799,10 +11809,12 @@ def plannedsessions_manage_view(request,timeperiod='today',rowerid=0):
raise Http404("You don't have access to this plan")
startdate,enddate = get_dates_timeperiod(timeperiod)
sps = get_sessions(r,startdate=startdate,enddate=enddate)
if initialsession==0:
initialsession=sps[0].id
ps0 = PlannedSession.objects.get(id=initialsession)
ws = Workout.objects.filter(
user=r,date__gte=startdate,
@@ -11812,6 +11824,8 @@ def plannedsessions_manage_view(request,timeperiod='today',rowerid=0):
)
initialworkouts = [w.id for w in Workout.objects.filter(user=r,plannedsession=ps0)]
plannedsessionstuple = []
for ps in sps:
@@ -11828,6 +11842,8 @@ def plannedsessions_manage_view(request,timeperiod='today',rowerid=0):
for w in ws:
wtpl = (w.id, w.__unicode__())
choices.append(wtpl)
if w.id in initialworkouts:
workoutdata['initial'].append(w.id)
workoutdata['choices'] = tuple(choices)
@@ -11856,8 +11872,25 @@ def plannedsessions_manage_view(request,timeperiod='today',rowerid=0):
messages.error(request,er)
ps_form = PlannedSessionSelectForm(plannedsessionstuple)
ps_form = PlannedSessionSelectForm(plannedsessionstuple,
initialsession=initialsession)
w_form = WorkoutSessionSelectForm(workoutdata=workoutdata)
if is_ajax:
ajax_workouts = []
for id,name in workoutdata['choices']:
if id in initialworkouts:
ajax_workouts.append((id,name,True))
else:
ajax_workouts.append((id,name,False))
ajax_response = {
'workouts':ajax_workouts,
'plannedsessionstuple':plannedsessionstuple,
}
return JSONResponse(ajax_response)
return render(request,'plannedsessionsmanage.html',
{
@@ -11896,6 +11929,12 @@ def plannedsession_edit_view(request,id=0):
sessionmode = cd['sessionmode']
sessionvalue = cd['sessionvalue']
sessionunit = cd['sessionunit']
if sessionunit == 'min':
sessionmode = 'time'
elif sessionunit in ['km','m']:
sessionmode = 'distance'
comment = cd['comment']
name = cd['name']
@@ -11952,8 +11991,6 @@ def plannedsession_view(request,id=0,rowerid=0):
ratio,status = is_session_complete(r,ps)
print ratio
ratio = int(100.*ratio)
return render(request,'plannedsessionview.html',