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

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-06 19:39:09 +02:00
parent 5e835a1fdb
commit 295fd875e6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/tasks.py
View File

@@ -298,7 +298,7 @@ def handle_check_race_course(self,
rowdata = rowdata[rowdata['time']>splitsecond] rowdata = rowdata[rowdata['time']>splitsecond]
# we may want to expand the time (interpolate) # we may want to expand the time (interpolate)
rowdata['dt'] = rowdata['time'].apply( rowdata['dt'] = rowdata['time'].apply(
lambda x: safetimedelta(seconds=x) lambda x: safetimedelta(x)
) )
rowdata = rowdata.resample('100ms',on='dt').mean() rowdata = rowdata.resample('100ms',on='dt').mean()
rowdata = rowdata.interpolate() rowdata = rowdata.interpolate()
@@ -624,7 +624,7 @@ def handle_calctrimp(id,
df2['time'] = df2[' ElapsedTime (sec)'] df2['time'] = df2[' ElapsedTime (sec)']
df2['time'] = df2['time'].apply( df2['time'] = df2['time'].apply(
lambda x:safetimedelta(seconds=x) lambda x:safetimedelta(x)
) )
duration = df['TimeStamp (sec)'].max()-df['TimeStamp (sec)'].min() duration = df['TimeStamp (sec)'].max()-df['TimeStamp (sec)'].min()

2
rowsandall_app/urls.py
View File

@@ -39,7 +39,6 @@ import django.views.i18n
urlpatterns = [ urlpatterns = [
re_path('^', include('django.contrib.auth.urls')), 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_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'),
re_path(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'), re_path(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'),
re_path(r'^password_reset/$', re_path(r'^password_reset/$',
@@ -85,6 +84,7 @@ urlpatterns += [
re_path(r'^twitter\_callback',rowersviews.rower_process_twittercallback), re_path(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
re_path(r'^i18n/', include('django.conf.urls.i18n')), re_path(r'^i18n/', include('django.conf.urls.i18n')),
re_path(r'^tz_detect/', include('tz_detect.urls')), 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'), # re_path(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'),
] ]