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

added effective drive length

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-03 15:41:51 +01:00
parent 866a4123b4
commit 5e5cc36da0
7 changed files with 109 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
rowers/views.py
View File

@@ -3154,10 +3154,6 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
fieldlist,fielddict = dataprep.getstatsfields()
fielddict.pop('workoutstate')
print "aap"
print datadf['catch'].mean()
print "noot"
for field,verbosename in fielddict.iteritems():
thedict = {
@@ -3433,6 +3429,12 @@ def workout_flexchart3_view(request,*args,**kwargs):
# div = res[1]
# js_resources = res[2]
# css_resources = res[3]
axchoicesbasic = {ax[0]:ax[1] for ax in axes if ax[4]=='basic'}
axchoicespro = {ax[0]:ax[1] for ax in axes if ax[4]=='pro'}
noylist = ["time","distance"]
axchoicesbasic.pop("cumdist")
if row.workouttype == 'water':
return render(request,
@@ -3447,13 +3449,25 @@ def workout_flexchart3_view(request,*args,**kwargs):
'yparam2':yparam2,
'plottype':plottype,
'mayedit':mayedit,
'promember':promember,
'axchoicesbasic':axchoicesbasic,
'axchoicespro':axchoicespro,
'noylist':noylist,
'workstrokesonly': not workstrokesonly,
'favoritenr':favoritenr,
'maxfav':maxfav,
})
else:
axchoicespro.pop('slip')
axchoicespro.pop('wash')
axchoicespro.pop('catch')
axchoicespro.pop('finish')
axchoicespro.pop('totalangle')
axchoicespro.pop('effectiveangle')
axchoicespro.pop('peakforceangle')
return render(request,
return render(request,
'flexchart3otw.html',
{'the_script':script,
'the_div':div,
@@ -3463,6 +3477,9 @@ def workout_flexchart3_view(request,*args,**kwargs):
'xparam':xparam,
'yparam1':yparam1,
'yparam2':yparam2,
'plottype':plottype,
'axchoicesbasic':axchoicesbasic,
'axchoicespro':axchoicespro,
'noylist':noylist,
'mayedit':mayedit,
'promember':promember,