sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-16 13:19:45 +02:00
parent 6c516cd383
commit 60a66dfbf7
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/menu_workout.html
View File

@@ -173,7 +173,7 @@
</li> </li>
<li id="export-rk"> <li id="export-rk">
{% if workout.uploadedtorunkeeper %} {% 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> Runkeeper <i class="fas fa-check"></i>
</a> </a>
{% elif user.rower.runkeepertoken == None or user.rower.runkeepertoken == '' %} {% elif user.rower.runkeepertoken == None or user.rower.runkeepertoken == '' %}

2
rowers/templates/workout_view.html
View File

@@ -94,6 +94,7 @@
</pre> </pre>
</p> </p>
</li> </li>
{% if mapdiv %}
<li class="grid_2"> <li class="grid_2">
<div class="mapdiv"> <div class="mapdiv">
@@ -103,6 +104,7 @@
{{ mapscript|safe }} {{ mapscript|safe }}
</div> </div>
</li> </li>
{% endif %}
<li class="grid_2"> <li class="grid_2">
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script> <script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
<script async="true" type="text/javascript"> <script async="true" type="text/javascript">

35
rowers/tests.py
View File

@@ -429,10 +429,10 @@ class C2Objects(DjangoTestCase):
response = self.c.get('/rowers/workout/1/c2uploadw/') response = self.c.get('/rowers/workout/1/c2uploadw/')
self.assertRedirects(response, self.assertRedirects(response,
expected_url = '/rowers/workout/1/export', expected_url = '/rowers/workout/1/edit',
status_code=302,target_status_code=200) 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) self.assertEqual(response.status_code, 302)
@patch('rowers.c2stuff.requests.post', side_effect=mocked_requests) @patch('rowers.c2stuff.requests.post', side_effect=mocked_requests)
@@ -599,10 +599,10 @@ class STObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/1/sporttracksuploadw/') response = self.c.get('/rowers/workout/1/sporttracksuploadw/')
self.assertRedirects(response, self.assertRedirects(response,
expected_url = '/rowers/workout/1/export', expected_url = '/rowers/workout/1/edit',
status_code=302,target_status_code=200) 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) self.assertEqual(response.status_code, 302)
@patch('rowers.sporttracksstuff.requests.get', side_effect=mocked_requests) @patch('rowers.sporttracksstuff.requests.get', side_effect=mocked_requests)
@@ -706,10 +706,10 @@ class RunKeeperObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/1/runkeeperuploadw/') response = self.c.get('/rowers/workout/1/runkeeperuploadw/')
self.assertRedirects(response, self.assertRedirects(response,
expected_url = '/rowers/workout/1/export', expected_url = '/rowers/workout/1/edit',
status_code=302,target_status_code=200) 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) self.assertEqual(response.status_code, 302)
@patch('rowers.runkeeperstuff.requests.get', side_effect=mocked_requests) @patch('rowers.runkeeperstuff.requests.get', side_effect=mocked_requests)
@@ -807,10 +807,10 @@ class UAObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/1/underarmouruploadw/') response = self.c.get('/rowers/workout/1/underarmouruploadw/')
self.assertRedirects(response, self.assertRedirects(response,
expected_url = '/rowers/workout/1/export', expected_url = '/rowers/workout/1/edit',
status_code=302,target_status_code=200) 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) self.assertEqual(response.status_code, 302)
@patch('rowers.underarmourstuff.requests.get', side_effect=mocked_requests) @patch('rowers.underarmourstuff.requests.get', side_effect=mocked_requests)
@@ -907,10 +907,10 @@ class TPObjects(DjangoTestCase):
response = self.c.get('/rowers/workout/1/tpuploadw/') response = self.c.get('/rowers/workout/1/tpuploadw/')
self.assertRedirects(response, self.assertRedirects(response,
expected_url = '/rowers/workout/1/export', expected_url = '/rowers/workout/1/edit',
status_code=302,target_status_code=200) 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) self.assertEqual(response.status_code, 302)
@@ -1334,11 +1334,9 @@ class ViewTest(TestCase):
response = self.c.get('/rowers/workout/1/', form_data, follow=True) response = self.c.get('/rowers/workout/1/', form_data, follow=True)
self.assertEqual(response.status_code, 200) 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) 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) response = self.c.get('/rowers/workout/1/histo', form_data, follow=True)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
@@ -1388,9 +1386,15 @@ class ViewTest(TestCase):
'boattype':'1x', 'boattype':'1x',
'notes':'aap noot mies', 'notes':'aap noot mies',
'make_plot':False, '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', 'plottype':'timeplot',
'file': f, 'file': f,
'makeprivate':False,
'landingpage':'workout_edit_view',
} }
form = DocumentsForm(form_data,file_data) form = DocumentsForm(form_data,file_data)
@@ -1407,9 +1411,6 @@ class ViewTest(TestCase):
response = self.c.get('/rowers/workout/1/', form_data, follow=True) response = self.c.get('/rowers/workout/1/', form_data, follow=True)
self.assertEqual(response.status_code, 200) 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) w = Workout.objects.get(id=1)
f_to_be_deleted = w.csvfilename f_to_be_deleted = w.csvfilename

2
rowers/urls.py
View File

@@ -259,7 +259,7 @@ urlpatterns = [
url(r'^workout/(?P<id>\d+)/split$',views.workout_split_view), 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+)/interactiveplot$',views.workout_biginteractive_view),
url(r'^workout/(?P<id>\d+)/view$',views.workout_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<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+)/$',views.workout_fusion_list),
url(r'^workout/fusion/(?P<id>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\w+.*)$',views.workout_fusion_list), url(r'^workout/fusion/(?P<id>\d+)/(?P<startdatestring>\d+-\d+-\d+)/(?P<enddatestring>\w+.*)$',views.workout_fusion_list),