From 0f1f64220d43cc3e094db0f82e590ec0cadf05d6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 10 May 2018 17:09:46 +0200 Subject: [PATCH 1/2] removed print statement --- rowers/interactiveplots.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index c9cd7d25..efbb5dbf 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2208,8 +2208,6 @@ def interactive_chart(id=0,promember=0): script, div = components(plot) - print div,"aap" - return [script,div] def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='', From 9e0f4f8aeab4375a680f18f4e3266c3373434ed9 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 14 May 2018 11:01:54 +0200 Subject: [PATCH 2/2] typo in session create --- rowers/templates/plannedsessioncreate.html | 2 +- rowers/templates/plannedsessionedit.html | 5 +++-- rowers/urls.py | 2 +- rowers/views.py | 8 +++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html index 1d48baba..d803e32c 100644 --- a/rowers/templates/plannedsessioncreate.html +++ b/rowers/templates/plannedsessioncreate.html @@ -103,7 +103,7 @@ Edit - Clone + Clone diff --git a/rowers/templates/plannedsessionedit.html b/rowers/templates/plannedsessionedit.html index e1bbedb3..deb11173 100644 --- a/rowers/templates/plannedsessionedit.html +++ b/rowers/templates/plannedsessionedit.html @@ -96,8 +96,9 @@ Edit - Clone - + Clone + Delete diff --git a/rowers/urls.py b/rowers/urls.py index b207fa47..23117eac 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -463,9 +463,9 @@ urlpatterns = [ url(r'^sessions/multicreate/(?P[\w\ ]+.*)$', views.plannedsession_multicreate_view), - url(r'^sessions/(?P\d+)/edit$',views.plannedsession_edit_view), url(r'^sessions/(?P\d+)/edit/(?P[\w\ ]+.*)/rower/(?P\d+)$',views.plannedsession_edit_view), url(r'^sessions/(?P\d+)/edit/(?P[\w\ ]+.*)$',views.plannedsession_edit_view), + url(r'^sessions/(?P\d+)/edit$',views.plannedsession_edit_view), url(r'^sessions/(?P\d+)/clone$',views.plannedsession_clone_view), url(r'^sessions/(?P\d+)/clone/(?P[\w\ ]+.*)/rower/(?P\d+)$',views.plannedsession_clone_view), diff --git a/rowers/views.py b/rowers/views.py index e3f056f7..29b1e8bc 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -10819,7 +10819,13 @@ def workout_split_view(request,id=id): splitsecond += splittime.second splitsecond += splittime.microsecond/1.e6 splitmode = form.cleaned_data['splitmode'] - ids,mesgs = dataprep.split_workout(r,row,splitsecond,splitmode) + try: + ids,mesgs = dataprep.split_workout( + r,row,splitsecond,splitmode + ) + except IndexError: + messages.error("Something went wrong in Split") + for message in mesgs: messages.info(request,message)