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

Merge branch 'hotfix/v4.06'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-25 22:34:32 +02:00
parent 3638d89c43 8f3d6f21bb
commit e3ed06d8d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -1017,8 +1017,8 @@ def new_workout_from_df(r,df,
df.rename(columns = columndict,inplace=True) df.rename(columns = columndict,inplace=True)
#starttimeunix = mktime(startdatetime.utctimetuple()) starttimeunix = mktime(startdatetime.utctimetuple())
starttimeunix = arrow.get(startdatetime).timestamp #starttimeunix = arrow.get(startdatetime).timestamp
df[' ElapsedTime (sec)'] = df['TimeStamp (sec)'] df[' ElapsedTime (sec)'] = df['TimeStamp (sec)']
df['TimeStamp (sec)'] = df['TimeStamp (sec)']+starttimeunix df['TimeStamp (sec)'] = df['TimeStamp (sec)']+starttimeunix