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

Merge tag 'v7.05' into develop

Browse Source 
bug fix
This commit is contained in:
Sander Roosendaal
2018-06-27 19:04:18 +02:00
parent 13d627a720 571d61b22c
commit 9d2c7c04ac
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rowers/dataprepnodjango.py
View File

@@ -1219,10 +1219,45 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
data = data.replace([-np.inf,np.inf],np.nan) data = data.replace([-np.inf,np.inf],np.nan)
data = data.fillna(method='ffill') data = data.fillna(method='ffill')
# write data if id given # write data if id given
if id != 0: if id != 0:
data['workoutid'] = id data['workoutid'] = id
data = data[['averageforce',
'cumdist',
'distance',
'distanceperstroke',
'driveenergy',
'drivelength',
'drivespeed',
'forceratio',
'fpace',
'ftime',
'hr',
'pace',
'peakforce',
'power',
'spm',
'time',
'velo',
'workoutstate',
'x_right',
'wash',
'catch',
'slip',
'finish',
'peakforceangle',
'totalangle',
'effectiveangle',
'efficiency',
'ergpace',
'nowindpace',
'equivergpower',
'fergpace',
'fnowindpace',
'workoutid']]
if debug: if debug:
engine = create_engine(database_url_debug, echo=False) engine = create_engine(database_url_debug, echo=False)
else: else:

1
rowers/utils.py
View File

@@ -286,6 +286,7 @@ def myqueue(queue,function,*args,**kwargs):
job_id = str(uuid.uuid4()) job_id = str(uuid.uuid4())
kwargs['job_id'] = job_id kwargs['job_id'] = job_id
kwargs['jobkey'] = job_id kwargs['jobkey'] = job_id
kwargs['timeout'] = 3600
job = queue.enqueue(function,*args,**kwargs) job = queue.enqueue(function,*args,**kwargs)