From 654364575797abc16a5bedbe831bd47865a63cc6 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Fri, 8 Feb 2019 17:47:02 +0100
Subject: [PATCH] adding wind/metar

---
 rowers/tests/mocks.py                 |   5 +++++
 rowers/tests/test_aworkouts.py        |  27 ++++++++++++++++++++++++++
 rowers/tests/test_plans.py            |   2 +-
 rowers/tests/testdata/testdata.csv.gz | Bin 11426 -> 11426 bytes
 rowers/views/workoutviews.py          |   7 +++++--
 5 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/rowers/tests/mocks.py b/rowers/tests/mocks.py
index 8afa3418..33401cba 100644
--- a/rowers/tests/mocks.py
+++ b/rowers/tests/mocks.py
@@ -127,6 +127,11 @@ def mocked_getsmallrowdata_db(*args, **kwargs):
 
     return df
 
+def mocked_getsmallrowdata_db_water(*args, **kwargs):
+    df = pd.read_csv('rowers/tests/testdata/colsfromdb.csv')
+
+    return df
+
 def mocked_getpowerdata_db(*args, **kwargs):
     df = pd.read_csv('rowers/tests/testdata/fake_powerdata.csv')
 
diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py
index cc23fa95..8647e20f 100644
--- a/rowers/tests/test_aworkouts.py
+++ b/rowers/tests/test_aworkouts.py
@@ -180,3 +180,30 @@ class WorkoutViewTest(TestCase):
         response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code,200)
         
+    @patch('rowers.dataprep.create_engine')
+    @patch('rowers.dataprep.getsmallrowdata_db')
+    def test_waterworkout_view(self, mocked_sqlalchemy, mocked_getsmallrowdata_db):
+        login = self.c.login(username=self.u.username, password=self.password)
+        self.assertTrue(login)
+
+        url  = reverse('workout_view',kwargs={'id':self.wwater.id})
+
+        response = self.c.get(url)
+        self.assertEqual(response.status_code,200)
+
+        url = reverse('workout_downloadmetar_view',kwargs={
+            'id': self.wwater.id,
+            'airportcode': 'LKHO'
+            }
+            )
+
+        response = self.c.get(url,follow=True)
+        self.assertEqual(response.status_code,200)
+
+        url = reverse('workout_downloadwind_view',kwargs={
+            'id': self.wwater.id,
+            }
+            )
+
+        response = self.c.get(url,follow=True)
+        self.assertEqual(response.status_code,200)        
diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py
index 24274625..df4aac67 100644
--- a/rowers/tests/test_plans.py
+++ b/rowers/tests/test_plans.py
@@ -993,7 +993,7 @@ class MandatoryTestCompleteTest(TestCase):
         self.assertEqual(response.status_code,200)
 
         url = reverse('plannedsession_compare_view',kwargs={'id':self.ps_dist.id})
-        response = self.c.get(url)
+        response = self.c.get(url,follow=True)
         self.assertEqual(response.status_code,200)
         
 class PlannedSessionsView(TestCase):
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index b9981412cb1b0a6c6235ccf6db153fa6e7cd3489..6474546cc304a1cc35ec8944056825d5bbc4ba82 100644
GIT binary patch
delta 15
WcmZ1!xhRrNzMF$1W#dM+IXVC<s|8B{

delta 15
WcmZ1!xhRrNzMF&NUCBnaIXVC>wgs2~

diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 8fcb3866..a3d235c8 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -987,8 +987,11 @@ def plannedsession_compare_view(request,id=0,userid=0):
     request.session['yparam'] = yparam
     request.session['plottype'] = plottype
     request.session['ps'] = ps.id
-    
-    url = reverse('multi_compare_view',kwargs={'userid':userid,'id':ids[0]})
+
+    if ids:
+        url = reverse('multi_compare_view',kwargs={'userid':userid,'id':ids[0]})
+    else:
+        url = reverse('plannedsession_view',kwargs={'id':ps.id})
 
     return HttpResponseRedirect(url)