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

Merge branch 'develop' into feature/restapi

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-02 09:35:31 +01:00
parent a98e724d3a 22ba557626
commit f886713639
6 changed files with 418 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/views.py
View File

@@ -3709,7 +3709,7 @@ def workout_upload_view(request,message=""):
w.save()
# put stroke data in database
res = dataprep.dataprep(row.df,id=w.id,bands=True,barchart=True,otwpower=True)
res = dataprep.dataprep(row.df,id=w.id,bands=True,barchart=True,otwpower=True,empower=True)
# Make Plot
if (make_plot):
@@ -4647,7 +4647,7 @@ def strokedatajson(request,id):
hrtr=r.tr,hran=r.an,ftp=r.ftp)
rowdata = rdata(row.csvfilename,rower=rr).df
datadf = dataprep.dataprep(rowdata,id=row.id,bands=True,barchart=True,otwpower=True)
datadf = dataprep.dataprep(rowdata,id=row.id,bands=True,barchart=True,otwpower=True,empower=True)
# mangling
#