fixed power time fitness chart
This commit is contained in:
@@ -1535,6 +1535,7 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower',startdate=None,
|
||||
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:
|
||||
@@ -1584,7 +1585,6 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower',startdate=None,
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
# fit
|
||||
|
||||
resampled = groups.set_index('dates')
|
||||
@@ -1667,11 +1667,13 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower',startdate=None,
|
||||
plot.sizing_mode = 'stretch_both'
|
||||
|
||||
plot.y_range = Range1d(0,1.5*max(power4min))
|
||||
startdate = datetime.datetime.combine(startdate,datetime.datetime.min.time())
|
||||
enddate = datetime.datetime.combine(enddate,datetime.datetime.min.time())
|
||||
if not startdate:
|
||||
startdate = min(date)
|
||||
startdate = datetime.datetime.combine(min(date), datetime.datetime.min.time())
|
||||
|
||||
if not enddate:
|
||||
enddate = max(date)
|
||||
enddate = datetime.datetime.combine(max(date), datetime.datetime.min.time())
|
||||
|
||||
plot.x_range = Range1d(
|
||||
startdate,enddate,
|
||||
@@ -1689,6 +1691,8 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower',startdate=None,
|
||||
|
||||
script,div = components(plot)
|
||||
|
||||
print(len(script))
|
||||
|
||||
return [script,div]
|
||||
|
||||
def interactive_histoall(theworkouts,histoparam,includereststrokes,
|
||||
|
||||
Reference in New Issue
Block a user