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

minor improvements

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-08 22:47:35 +01:00
parent 2457a0d968
commit f149e2b431
28 changed files with 21741 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rowers/views.py
View File

@@ -11712,8 +11712,7 @@ def agegrouprecordview(request,sex='male',weightcategory='hwt',
# Individual user creates training for himself
@user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None)
def plannedsession_create_view(request,timeperiod='today',rowerid=0):
def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0):
if rowerid==0:
r = getrower(request.user)
else:
@@ -11777,10 +11776,11 @@ def plannedsession_create_view(request,timeperiod='today',rowerid=0):
'form':sessioncreateform,
'plannedsessions':sps,
'rower':r,
'timeperiod':timeperiod,
})
@login_required()
def plannedsessions_view(request,timeperiod='today',rowerid=0):
def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
if rowerid==0:
r = getrower(request.user)
@@ -11797,10 +11797,19 @@ def plannedsessions_view(request,timeperiod='today',rowerid=0):
sps = get_sessions(r,startdate=startdate,enddate=enddate)
completeness = {}
actualvalue = {}
completiondate = {}
for ps in sps:
ratio,status = is_session_complete(r,ps)
actualvalue[ps.id] = int(ps.sessionvalue*ratio)
completeness[ps.id] = status
ws = Workout.objects.filter(user=r,plannedsession=ps)
if len(ws):
date = min([w.date for w in ws])
completiondate[ps.id] = date
else:
completiondate[ps.id] = ''
return render(request,'plannedsessions.html',
{
@@ -11809,10 +11818,12 @@ def plannedsessions_view(request,timeperiod='today',rowerid=0):
'rower':r,
'timeperiod':timeperiod,
'completeness':completeness,
'actualvalue':actualvalue,
'completiondate':completiondate,
})
@login_required()
def plannedsessions_manage_view(request,timeperiod='today',rowerid=0,
def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,
initialsession=0):
is_ajax = False
@@ -11833,9 +11844,15 @@ def plannedsessions_manage_view(request,timeperiod='today',rowerid=0,
sps = get_sessions(r,startdate=startdate,enddate=enddate)
if initialsession==0:
initialsession=sps[0].id
try:
initialsession=sps[0].id
except IndexError:
initialsession=0
ps0 = PlannedSession.objects.get(id=initialsession)
if initialsession:
ps0 = PlannedSession.objects.get(id=initialsession)
else:
ps0 = None
ws = Workout.objects.filter(
user=r,date__gte=startdate,
@@ -11929,7 +11946,7 @@ def plannedsessions_manage_view(request,timeperiod='today',rowerid=0,
@user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None)
def plannedsession_clone_view(request,id=0,rowerid=0,
timeperiod='today'):
timeperiod='thisweek'):
if rowerid==0:
r = getrower(request.user)
else:
@@ -11974,7 +11991,7 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
# Edit an existing planned session
@user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None)
def plannedsession_edit_view(request,id=0,timeperiod='today',rowerid=0):
def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0):
if rowerid==0:
r = getrower(request.user)