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

Merge branch 'feature/eff_metric' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2017-08-08 12:03:25 +02:00
parent 981075fd68 fc23750731
commit b59ead6094
5 changed files with 160 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/views.py
View File

@@ -3571,19 +3571,25 @@ def multiflex_view(request,userid=0,
# prepare data frame
datadf = dataprep.read_cols_df_sql(ids,fieldlist)
datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly)
datadf = dataprep.filter_df(datadf,'spm',spmmin,
largerthan=True)
datadf = dataprep.filter_df(datadf,'spm',spmmax,
largerthan=False)
datadf = dataprep.filter_df(datadf,'driveenergy',workmin,
largerthan=True)
datadf = dataprep.filter_df(datadf,'driveneergy',workmax,
largerthan=False)
datadf.dropna(axis=0,how='any',inplace=True)
datemapping = {
w.id:w.date for w in workouts
}
@@ -4038,7 +4044,6 @@ def workouts_view(request,message='',successmessage='',
else:
activity_enddate = enddate
print "aap",activity_enddate
if teamid:
try:
@@ -5631,7 +5636,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
axchoicespro.pop('totalangle')
axchoicespro.pop('effectiveangle')
axchoicespro.pop('peakforceangle')
axchoicespro.pop('efficiency')
return render(request,
'flexchart3otw.html',