From 645e7e3c635fbb924dd384083f77fc44cc900335 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 14 Jan 2017 09:30:00 +0100 Subject: [PATCH 1/2] set total distance and time to Concept2 data --- rowers/views.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rowers/views.py b/rowers/views.py index 548218b9..118fdcde 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -468,6 +468,14 @@ def add_workout_from_strokedata(user,importid,data,strokedata, totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min() totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)'] + # with Concept2 + if source=='c2': + try: + totaldist = data['distance'] + totaltime = data['time']/10. + except KeyError: + pass + hours = int(totaltime/3600.) minutes = int((totaltime - 3600.*hours)/60.) From cf9ba0851a9d3adc2fea6d85b1a260dc42f00b30 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 14 Jan 2017 14:58:26 +0100 Subject: [PATCH 2/2] removed some dead code from ST add strokedata --- rowers/views.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index 118fdcde..9f70d3c3 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -540,14 +540,12 @@ def add_workout_from_stdata(user,importid,data): except: rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S") rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) - - - try: - c2intervaltype = data['workout_type'] +# try: +# c2intervaltype = data['workout_type'] - except: - c2intervaltype = '' +# except: +# c2intervaltype = '' try: title = data['name']