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

Merge branch 'develop' into feature/favoritecharts

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-07 18:35:52 +01:00
parent 84c3b7e175 861c7055ad
commit f4fe519a49
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/interactiveplots.py
View File

@@ -497,7 +497,7 @@ def interactive_chart(id=0,promember=0):
TOOLS = 'pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair' TOOLS = 'pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
columns = ['time','pace','hr'] columns = ['time','pace','hr','fpace','ftime']
datadf = dataprep.getsmallrowdata_db(columns,ids=[id]) datadf = dataprep.getsmallrowdata_db(columns,ids=[id])
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if datadf.empty: if datadf.empty:
@@ -554,7 +554,6 @@ def interactive_chart(id=0,promember=0):
('Pace','@fpace'), ('Pace','@fpace'),
('HR','@hr{int}'), ('HR','@hr{int}'),
('SPM','@spm{1.1}'), ('SPM','@spm{1.1}'),
('Distance','@cumdist{1.1}'),
]) ])
hover.mode = 'mouse' hover.mode = 'mouse'