From 5eb2edc60ff30b82eca54b3cb28bf7edcbaea79f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 28 Jun 2018 10:07:34 +0200
Subject: [PATCH] moving save routine to dataprepnodjango

---
 rowers/dataprepnodjango.py |  9 +++++++++
 rowers/tasks.py            | 12 +++---------
 rowers/views.py            |  5 ++++-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py
index b7fc97a7..957d110f 100644
--- a/rowers/dataprepnodjango.py
+++ b/rowers/dataprepnodjango.py
@@ -135,6 +135,15 @@ def rdata(file,rower=rrower()):
 
 from utils import totaltime_sec_to_string
 
+def create_strava_stroke_data_db(workoutid,df,csvfilename,debug=False):
+    df.sort_values(by='TimeStamp (sec)',ascending=True)
+
+    res = df.to_csv(csvfilename+'.gz',index_label='index',compression='gzip')
+
+
+    data = dataprep(df,id=workoutid,bands=False,debug=debug)
+
+    return data
 
 # Creates C2 stroke data
 def create_c2_stroke_data_db(
diff --git a/rowers/tasks.py b/rowers/tasks.py
index 0263626c..a51e0f83 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -47,7 +47,8 @@ from rowers.dataprepnodjango import (
     update_agegroup_db,fitnessmetric_to_sql,
     add_c2_stroke_data_db,totaltime_sec_to_string,
     create_c2_stroke_data_db,update_empower,
-    database_url_debug,database_url,dataprep
+    database_url_debug,database_url,dataprep,
+    create_strava_stroke_data_db
 )
 
 
@@ -201,15 +202,8 @@ def handle_strava_import_stroke_data(stravatoken,
                        ' Power (watts)':watts,
     })
 
+    res = create_strava_stroke_data_db(workoutid,df,csvfilename,debug=debug)
 
-    df.sort_values(by='TimeStamp (sec)',ascending=True)
-
-    res = df.to_csv(csvfilename+'.gz',index_label='index',compression='gzip')
-
-
-    #    data = update_strokedata(workoutid,df,debug=debug)
-    data = dataprep(df,id=workoutid,bands=False,debug=debug)
-	# startdatetime = datetime.datetime.strptime(startdatetime,"%Y-%m-%d-%H:%M:%S")
 
     return 1
     
diff --git a/rowers/views.py b/rowers/views.py
index 42b22d0d..635a8961 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -10263,7 +10263,10 @@ def workout_getstravaworkout_next(request):
     
     
 
-    url = reverse(workouts_view)
+    url = reverse(r.defaultlandingpage,
+                  kwargs={
+                      'id':workoutid,
+                  })
     return HttpResponseRedirect(url)