Private
Public Access
1
0

issue #437 fixed

This commit is contained in:
Sander Roosendaal
2019-03-14 21:28:23 +01:00
parent 81f9320787
commit 8958d4430f
4 changed files with 20 additions and 4 deletions

View File

@@ -698,12 +698,14 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
return [script,div,js_resources,css_resources]
def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower'):
def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower',startdate=None,
enddate=None):
power4min = [int(m.PowerFourMin) for m in fitnessmetrics]
power2k = [int(m.PowerTwoK) for m in fitnessmetrics]
power1hr = [int(m.PowerOneHour) for m in fitnessmetrics]
dates = [m.date for m in fitnessmetrics]
mode = [m.workoutmode for m in fitnessmetrics]
if len(power4min) == 0:
@@ -772,7 +774,6 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower'):
)
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'
@@ -833,6 +834,15 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower'):
plot.sizing_mode = 'scale_width'
plot.y_range = Range1d(0,1.5*max(power4min))
if not startdate:
startdate = min(date)
if not enddate:
enddate = max(date)
plot.x_range = Range1d(
startdate,enddate,
)
plot.title.text = 'Power levels ('+workoutmode+') from workouts '+user.first_name
hover = plot.select(dict(type=HoverTool))