moving toolbar to right on zones plot, expanding tests
This commit is contained in:
@@ -6868,7 +6868,7 @@ def interactive_zoneschart(rower,data,startdate,enddate,trainingzones='hr',date_
|
|||||||
df['percentage'] = 100.*df['hours']/df['totaltime']
|
df['percentage'] = 100.*df['hours']/df['totaltime']
|
||||||
df.drop('hours',inplace=True,axis='columns')
|
df.drop('hours',inplace=True,axis='columns')
|
||||||
df.drop('totaltime',inplace=True,axis='columns')
|
df.drop('totaltime',inplace=True,axis='columns')
|
||||||
print(df.head())
|
|
||||||
|
|
||||||
|
|
||||||
hv.extension('bokeh')
|
hv.extension('bokeh')
|
||||||
@@ -6907,7 +6907,7 @@ def interactive_zoneschart(rower,data,startdate,enddate,trainingzones='hr',date_
|
|||||||
|
|
||||||
p.plot_width=550
|
p.plot_width=550
|
||||||
p.plot_height=350
|
p.plot_height=350
|
||||||
p.toolbar_location = 'above'
|
p.toolbar_location = 'right'
|
||||||
p.y_range.start = 0
|
p.y_range.start = 0
|
||||||
p.sizing_mode = 'stretch_both'
|
p.sizing_mode = 'stretch_both'
|
||||||
|
|
||||||
|
|||||||
@@ -1141,6 +1141,36 @@ class MarkerPerformanceTest(TestCase):
|
|||||||
zones=zones,
|
zones=zones,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
response = self.c.get(url)
|
||||||
|
self.assertEqual(response.status_code,200)
|
||||||
|
|
||||||
|
dates = 'week'
|
||||||
|
yaxis = 'percentage'
|
||||||
|
url = reverse('trainingzones_view_data')
|
||||||
|
url += '?startdate={startdate}&enddate={enddate}&zones={zones}&yaxis={yaxis}&dates={dates}'.format(
|
||||||
|
startdate = startdate.strftime("%Y-%m-%d"),
|
||||||
|
enddate = enddate.strftime("%Y-%m-%d"),
|
||||||
|
zones=zones,
|
||||||
|
dates=dates,
|
||||||
|
yaxis=yaxis
|
||||||
|
)
|
||||||
|
|
||||||
|
response = self.c.get(url)
|
||||||
|
self.assertEqual(response.status_code,200)
|
||||||
|
|
||||||
|
zones = 'hr'
|
||||||
|
dates = 'month'
|
||||||
|
yaxis = 'percentage'
|
||||||
|
url = reverse('trainingzones_view_data')
|
||||||
|
url += '?startdate={startdate}&enddate={enddate}&zones={zones}&yaxis={yaxis}&dates={dates}'.format(
|
||||||
|
startdate = startdate.strftime("%Y-%m-%d"),
|
||||||
|
enddate = enddate.strftime("%Y-%m-%d"),
|
||||||
|
zones=zones,
|
||||||
|
dates=dates,
|
||||||
|
yaxis=yaxis
|
||||||
|
)
|
||||||
|
|
||||||
response = self.c.get(url)
|
response = self.c.get(url)
|
||||||
self.assertEqual(response.status_code,200)
|
self.assertEqual(response.status_code,200)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user