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

Merge branch 'develop' of bitbucket.org:sanderroosendaal/rowsandall into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-08-01 20:31:37 +02:00
parent fa87202e51 41498737d4
commit 9b65731902
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/views/apiviews.py
View File

@@ -150,10 +150,9 @@ def strokedatajson(request,id):
'peakforceangle':peakforceangle, 'peakforceangle':peakforceangle,
}) })
# Following part should be replaced with dataprep.new_workout_from_df
r = getrower(request.user) r = getrower(request.user)
timestr = row.startdatetime.strftime("%Y%m%d-%H%M%S") timestr = row.startdatetime.strftime("%Y%m%d-%H%M%S")
csvfilename ='media/Import_'+timestr+'.csv' csvfilename ='media/Import_'+timestr+'.csv'

4
rowsandall_app/urls.py
View File

@@ -58,10 +58,10 @@ urlpatterns += [
re_path(r'^getblogs/$',rowersviews.get_blog_posts), re_path(r'^getblogs/$',rowersviews.get_blog_posts),
re_path(r'^login/', re_path(r'^login/',
# auth_views.LoginView, # auth_views.LoginView,
auth_views.LoginView, auth_views.LoginView.as_view(),
name='login'), name='login'),
re_path(r'^logout/$', re_path(r'^logout/$',
auth_views.LogoutView, auth_views.LogoutView.as_view(),
{'next_page': '/'}, {'next_page': '/'},
name='logout',), name='logout',),
re_path(r'^rowers/',include('rowers.urls')), re_path(r'^rowers/',include('rowers.urls')),