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

Merge branch 'feature/c2splits' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2017-01-14 14:59:14 +01:00
parent 24364dcfb1 cf9ba0851a
commit d1a3493ee4
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rowers/views.py
View File

@@ -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 = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)'] 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.) hours = int(totaltime/3600.)
minutes = int((totaltime - 3600.*hours)/60.) minutes = int((totaltime - 3600.*hours)/60.)
@@ -532,14 +540,12 @@ def add_workout_from_stdata(user,importid,data):
except: except:
rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
try: # try:
c2intervaltype = data['workout_type'] # c2intervaltype = data['workout_type']
except: # except:
c2intervaltype = '' # c2intervaltype = ''
try: try:
title = data['name'] title = data['name']