From 60a66dfbf7437bd357330bdf7f0d3c5e70878364 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 16 Oct 2018 13:19:45 +0200
Subject: [PATCH] bug fixes

---
 rowers/templates/menu_workout.html |  2 +-
 rowers/templates/workout_view.html |  2 ++
 rowers/tests.py                    | 35 +++++++++++++++---------------
 rowers/urls.py                     |  2 +-
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html
index b39e243d..0347e01c 100644
--- a/rowers/templates/menu_workout.html
+++ b/rowers/templates/menu_workout.html
@@ -173,7 +173,7 @@
       </li>
       <li id="export-rk">
         {% if workout.uploadedtorunkeeper %}
-        <a href="https://runkeeper.com/user/{{ rower|rkuserid }}/activity/{{ workout.uploadedtorunkeeper }}">
+        <a href="https://runkeeper.com/user/{{ user|rkuserid }}/activity/{{ workout.uploadedtorunkeeper }}">
           Runkeeper   <i class="fas fa-check"></i>
         </a>
         {% elif user.rower.runkeepertoken == None or user.rower.runkeepertoken == '' %}
diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html
index 9e2bae74..852444d6 100644
--- a/rowers/templates/workout_view.html
+++ b/rowers/templates/workout_view.html
@@ -94,6 +94,7 @@
       </pre>
     </p>
   </li>
+  {% if mapdiv %}
   <li class="grid_2">
     <div class="mapdiv">
 
@@ -103,6 +104,7 @@
     {{ mapscript|safe }}
     </div>
   </li>
+  {% endif %}
   <li class="grid_2">
     <script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
     <script async="true" type="text/javascript">
diff --git a/rowers/tests.py b/rowers/tests.py
index 43838b70..3b179640 100644
--- a/rowers/tests.py
+++ b/rowers/tests.py
@@ -429,10 +429,10 @@ class C2Objects(DjangoTestCase):
         response = self.c.get('/rowers/workout/1/c2uploadw/')
 
         self.assertRedirects(response,
-                             expected_url = '/rowers/workout/1/export',
+                             expected_url = '/rowers/workout/1/edit',
                              status_code=302,target_status_code=200)
 
-        self.assertEqual(response.url, '/rowers/workout/1/export')
+        self.assertEqual(response.url, '/rowers/workout/1/edit')
         self.assertEqual(response.status_code, 302)
 
     @patch('rowers.c2stuff.requests.post', side_effect=mocked_requests)
@@ -599,10 +599,10 @@ class STObjects(DjangoTestCase):
         response = self.c.get('/rowers/workout/1/sporttracksuploadw/')
 
         self.assertRedirects(response,
-                             expected_url = '/rowers/workout/1/export',
+                             expected_url = '/rowers/workout/1/edit',
                              status_code=302,target_status_code=200)
 
-        self.assertEqual(response.url, '/rowers/workout/1/export')
+        self.assertEqual(response.url, '/rowers/workout/1/edit')
         self.assertEqual(response.status_code, 302)
 
     @patch('rowers.sporttracksstuff.requests.get', side_effect=mocked_requests)
@@ -706,10 +706,10 @@ class RunKeeperObjects(DjangoTestCase):
         response = self.c.get('/rowers/workout/1/runkeeperuploadw/')
 
         self.assertRedirects(response,
-                             expected_url = '/rowers/workout/1/export',
+                             expected_url = '/rowers/workout/1/edit',
                              status_code=302,target_status_code=200)
 
-        self.assertEqual(response.url, '/rowers/workout/1/export')
+        self.assertEqual(response.url, '/rowers/workout/1/edit')
         self.assertEqual(response.status_code, 302)
 
     @patch('rowers.runkeeperstuff.requests.get', side_effect=mocked_requests)
@@ -807,10 +807,10 @@ class UAObjects(DjangoTestCase):
         response = self.c.get('/rowers/workout/1/underarmouruploadw/')
 
         self.assertRedirects(response,
-                             expected_url = '/rowers/workout/1/export',
+                             expected_url = '/rowers/workout/1/edit',
                              status_code=302,target_status_code=200)
 
-        self.assertEqual(response.url, '/rowers/workout/1/export')
+        self.assertEqual(response.url, '/rowers/workout/1/edit')
         self.assertEqual(response.status_code, 302)
 
     @patch('rowers.underarmourstuff.requests.get', side_effect=mocked_requests)
@@ -907,10 +907,10 @@ class TPObjects(DjangoTestCase):
         response = self.c.get('/rowers/workout/1/tpuploadw/')
 
         self.assertRedirects(response,
-                             expected_url = '/rowers/workout/1/export',
+                             expected_url = '/rowers/workout/1/edit',
                              status_code=302,target_status_code=200)
 
-        self.assertEqual(response.url, '/rowers/workout/1/export')
+        self.assertEqual(response.url, '/rowers/workout/1/edit')
         self.assertEqual(response.status_code, 302)
 
 
@@ -1334,11 +1334,9 @@ class ViewTest(TestCase):
 	response = self.c.get('/rowers/workout/1/', form_data, follow=True)
 	self.assertEqual(response.status_code, 200)
 
-        response = self.c.get('/rowers/workout/1/export', form_data, follow=True)
+        response = self.c.get('/rowers/workout/1/edit', form_data, follow=True)
         self.assertEqual(response.status_code, 200)
         
-	response = self.c.get('/rowers/workout/1/interactiveplot', form_data, follow=True)
-	self.assertEqual(response.status_code, 200)
 
         response = self.c.get('/rowers/workout/1/histo', form_data, follow=True)
 	self.assertEqual(response.status_code, 200)
@@ -1388,9 +1386,15 @@ class ViewTest(TestCase):
             'boattype':'1x',
 	    'notes':'aap noot mies',
 	    'make_plot':False,
-	    'upload_to_c2':False,
+	    'upload_to_C2':False,
+	    'upload_to_Strava':False,
+	    'upload_to_SportTracks':False,
+	    'upload_to_RunKeeper':False,
+	    'upload_to_MapMyFitness':False,
 	    'plottype':'timeplot',
 	    'file': f,
+            'makeprivate':False,
+            'landingpage':'workout_edit_view',
 	    }
 
 	form = DocumentsForm(form_data,file_data)
@@ -1407,9 +1411,6 @@ class ViewTest(TestCase):
 	response = self.c.get('/rowers/workout/1/', form_data, follow=True)
 	self.assertEqual(response.status_code, 200)
 	
-	response = self.c.get('/rowers/workout/1/interactiveplot', form_data, follow=True)
-	self.assertEqual(response.status_code, 200)
-
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
diff --git a/rowers/urls.py b/rowers/urls.py
index defa4a3e..d25d63b0 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -259,7 +259,7 @@ urlpatterns = [
     url(r'^workout/(?P<id>\d+)/split$',views.workout_split_view),
 #    url(r'^workout/(?P<id>\d+)/interactiveplot$',views.workout_biginteractive_view),
     url(r'^workout/(?P<id>\d+)/view$',views.workout_view),
-    url(r'^workout/(?P<id>\d+)$',views.workout_view),
+    url(r'^workout/(?P<id>\d+)/$',views.workout_view),
     url(r'^workout/fusion/(?P<id1>\d+)/(?P<id2>\d+)$',views.workout_fusion_view),
     url(r'^workout/fusion/(?P<id>\d+)/$',views.workout_fusion_list),
     url(r'^workout/fusion/(?P<id>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\w+.*)$',views.workout_fusion_list),