From 83f3f4f160f9b1a498f51400f240e9db5896cbca Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sat, 5 Jun 2021 11:19:23 +0200
Subject: [PATCH] moving toolbar to right on zones plot, expanding tests

---
 rowers/interactiveplots.py    |  4 ++--
 rowers/tests/test_analysis.py | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 0d5aa14a..4cbc5518 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -6868,7 +6868,7 @@ def interactive_zoneschart(rower,data,startdate,enddate,trainingzones='hr',date_
         df['percentage'] = 100.*df['hours']/df['totaltime']
         df.drop('hours',inplace=True,axis='columns')
         df.drop('totaltime',inplace=True,axis='columns')
-        print(df.head())
+
 
 
     hv.extension('bokeh')
@@ -6907,7 +6907,7 @@ def interactive_zoneschart(rower,data,startdate,enddate,trainingzones='hr',date_
 
     p.plot_width=550
     p.plot_height=350
-    p.toolbar_location = 'above'
+    p.toolbar_location = 'right'
     p.y_range.start = 0
     p.sizing_mode = 'stretch_both'
 
diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py
index f12a469b..819ab6a8 100644
--- a/rowers/tests/test_analysis.py
+++ b/rowers/tests/test_analysis.py
@@ -1141,6 +1141,36 @@ class MarkerPerformanceTest(TestCase):
             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)
         self.assertEqual(response.status_code,200)