From cc1df7a403aca340d9679d20fb28287d331cccbd Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 11 May 2017 16:06:46 +0200
Subject: [PATCH] third party import ids

---
 rowers/urls.py  | 10 +++++-----
 rowers/views.py |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/rowers/urls.py b/rowers/urls.py
index f4ce2529..a7593b1a 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -201,14 +201,14 @@ urlpatterns = [
     url(r'^workout/(?P<id>\d+)/undosmoothenpace$',views.workout_undo_smoothenpace_view),
     url(r'^workout/c2import/$',views.workout_c2import_view),
     url(r'^workout/stravaimport/$',views.workout_stravaimport_view),
-    url(r'^workout/c2import/(?P<id>\d+)/$',views.workout_getc2workout_view),
-    url(r'^workout/stravaimport/(?P<id>\d+)/$',views.workout_getstravaworkout_view),
+    url(r'^workout/c2import/(?P<c2id>\d+)/$',views.workout_getc2workout_view),
+    url(r'^workout/stravaimport/(?P<stravaid>\d+)/$',views.workout_getstravaworkout_view),
     url(r'^workout/sporttracksimport/$',views.workout_sporttracksimport_view),
-    url(r'^workout/sporttracksimport/(?P<id>\d+)/$',views.workout_getsporttracksworkout_view),
+    url(r'^workout/sporttracksimport/(?P<sporttracksid>\d+)/$',views.workout_getsporttracksworkout_view),
     url(r'^workout/runkeeperimport/$',views.workout_runkeeperimport_view),
-    url(r'^workout/runkeeperimport/(?P<id>\d+)/$',views.workout_getrunkeeperworkout_view),
+    url(r'^workout/runkeeperimport/(?P<runkeeperid>\d+)/$',views.workout_getrunkeeperworkout_view),
     url(r'^workout/underarmourimport/$',views.workout_underarmourimport_view),
-    url(r'^workout/underarmourimport/(?P<id>\d+)/$',views.workout_getunderarmourworkout_view),
+    url(r'^workout/underarmourimport/(?P<underarmourid>\d+)/$',views.workout_getunderarmourworkout_view),
     url(r'^workout/(?P<id>\d+)/deleteconfirm$',views.workout_delete_confirm_view),
     url(r'^workout/(?P<id>\d+)/c2uploadw/$',views.workout_c2_upload_view),
     url(r'^workout/(?P<id>\d+)/stravauploadw/$',views.workout_strava_upload_view),
diff --git a/rowers/views.py b/rowers/views.py
index af9d658c..eac39e2d 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -635,7 +635,10 @@ def add_workout_from_runkeeperdata(user,importid,data):
     spmseries = pd.Series(spm,index=times_spm)
     spmseries = spmseries.groupby(spmseries.index).first()
     hrseries = pd.Series(hr,index=times_hr)
-    hrseries = hrseries.groupby(hrseries.index).first()
+    try:
+        hrseries = hrseries.groupby(hrseries.index).first()
+    except TypeError:
+        hrseries = 0*distseries
 
 
     # Create dicts and big dataframe