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

2019-08-01 20:31:37 +02:00
parent fa87202e51 41498737d4
commit 9b65731902
2 changed files with 3 additions and 4 deletions
--- a/rowers/views/apiviews.py
+++ b/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'