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

Merge branch 'develop' into feature/workoutfit

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-01 09:00:04 +01:00
parent dffaacc5a3 33188f3322
commit fe9bcfd1a4
13 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/views/analysisviews.py
View File

@@ -2217,8 +2217,8 @@ def rankings_view2(request,userid=0,
lastupdatedtime = arrow.get(lastupdated).timestamp
current_time = arrow.utcnow().timestamp
lastupdatedtime = arrow.get(lastupdated).timestamp()
current_time = arrow.utcnow().timestamp()
deltatime_seconds = current_time - lastupdatedtime
recalc = False

2
rowers/views/exportviews.py
View File

@@ -240,7 +240,7 @@ def workout_csvemail_view(request,id=0):
filename = code+'.csv'
rowdate = rowdata.rowdatetime
starttimeunix = arrow.get(rowdate).timestamp
starttimeunix = arrow.get(rowdate).timestamp()
df = rowdata.df
try:

2
rowers/views/statements.py
View File

@@ -1319,7 +1319,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,
except:
title = ''
starttimeunix = arrow.get(rowdatetime).timestamp
starttimeunix = arrow.get(rowdatetime).timestamp()
res = make_cumvalues(0.1*strokedata['t'])
cum_time = res[0]

6
rowers/views/workoutviews.py
View File

@@ -2613,7 +2613,7 @@ def workout_downloadwind_view(request,id=0,
startdatetime = dateutil.parser.parse("{}, {}".format(row.date,
row.starttime))
starttimeunix = int(arrow.get(row.startdatetime).timestamp)
starttimeunix = int(arrow.get(row.startdatetime).timestamp())
#starttimeunix = int(mktime(startdatetime.utctimetuple()))
avgtime = starttimeunix+avgtime
winddata = get_wind_data(avglat,avglon,avgtime)
@@ -2682,7 +2682,7 @@ def workout_downloadmetar_view(request,id=0,
startdatetime = dateutil.parser.parse("{}, {}".format(row.date,
row.starttime))
starttimeunix = arrow.get(row.startdatetime).timestamp
starttimeunix = arrow.get(row.startdatetime).timestamp()
#starttimeunix = int(mktime(startdatetime.utctimetuple()))
avgtime = starttimeunix +avgtime
winddata = get_metar_data(airportcode,avgtime)
@@ -3243,7 +3243,7 @@ def workout_erase_column_view(request, id=0,column=''):
row.write_csv(w.csvfilename,gzip=True)
row,workout = dataprep.getrowdata(id=w.id)
datadf = dataprep.dataprep(row.df,id=w.id)