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

fixed mktime to arrow.get().timestamp in dataprep

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-22 09:52:20 +02:00
parent 7e0ac724e7
commit 0fa2012d78
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/dataprep.py
View File

@@ -15,6 +15,7 @@ from pandas import DataFrame,Series
from pytz import timezone as tz,utc
from django.utils import timezone
from time import strftime,strptime,mktime,time,daylight
import arrow
from django.utils.timezone import get_current_timezone
thetimezone = get_current_timezone()
from rowingdata import (
@@ -1012,7 +1013,8 @@ def new_workout_from_df(r,df,
df.rename(columns = columndict,inplace=True)
starttimeunix = mktime(startdatetime.utctimetuple())
#starttimeunix = mktime(startdatetime.utctimetuple())
starttimeunix = arrow.get(startdatetime).timestamp
df[' ElapsedTime (sec)'] = df['TimeStamp (sec)']
df['TimeStamp (sec)'] = df['TimeStamp (sec)']+starttimeunix