From 0fa2012d78cf544c2f3cc26ed325542661388426 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 22 Sep 2017 09:52:20 +0200 Subject: [PATCH] fixed mktime to arrow.get().timestamp in dataprep --- rowers/dataprep.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 1de838d4..9ebc2adb 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -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