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

rowers/views/apiviews.py

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

rowsandall_app/urls.py

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