diff --git a/rowers/tasks.py b/rowers/tasks.py index 04c65fec..5e8059f9 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -298,7 +298,7 @@ def handle_check_race_course(self, rowdata = rowdata[rowdata['time']>splitsecond] # we may want to expand the time (interpolate) rowdata['dt'] = rowdata['time'].apply( - lambda x: safetimedelta(seconds=x) + lambda x: safetimedelta(x) ) rowdata = rowdata.resample('100ms',on='dt').mean() rowdata = rowdata.interpolate() @@ -624,7 +624,7 @@ def handle_calctrimp(id, df2['time'] = df2[' ElapsedTime (sec)'] df2['time'] = df2['time'].apply( - lambda x:safetimedelta(seconds=x) + lambda x:safetimedelta(x) ) duration = df['TimeStamp (sec)'].max()-df['TimeStamp (sec)'].min() diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index b73c61f8..db3e2216 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -39,7 +39,6 @@ import django.views.i18n urlpatterns = [ re_path('^', include('django.contrib.auth.urls')), - re_path(r'^django-rq/',include('django_rq.urls')), re_path(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'), re_path(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'), re_path(r'^password_reset/$', @@ -85,6 +84,7 @@ urlpatterns += [ re_path(r'^twitter\_callback',rowersviews.rower_process_twittercallback), re_path(r'^i18n/', include('django.conf.urls.i18n')), re_path(r'^tz_detect/', include('tz_detect.urls')), + path('django-rq/', include('django_rq.urls')) # re_path(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'), ]