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

Merge tag 'v7.08' into develop

Browse Source 
adding dropna
This commit is contained in:
Sander Roosendaal
2018-06-27 21:43:51 +02:00
parent cda17057f7 608a773566
commit 5122cbd383
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprepnodjango.py
View File

@@ -1037,7 +1037,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
hr=hr, hr=hr,
pace=p * 1e3, pace=p * 1e3,
spm=spm, spm=spm,
# velo=velo, velo=velo,
cumdist=cumdist, cumdist=cumdist,
ftime=niceformat(t2), ftime=niceformat(t2),
fpace=nicepaceformat(p2), fpace=nicepaceformat(p2),
@@ -1051,7 +1051,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
distance=distance, distance=distance,
drivespeed=drivespeed, drivespeed=drivespeed,
rhythm=rhythm, rhythm=rhythm,
# distanceperstroke=distanceperstroke, distanceperstroke=distanceperstroke,
) )
) )
@@ -1221,6 +1221,10 @@ 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')
data.dropna(axis=0,inplace=True,how='all')
data.dropna(axis=1,inplace=True,how='any')
# write data if id given # write data if id given
if id != 0: if id != 0:
data['workoutid'] = id data['workoutid'] = id

1
rowers/views.py
View File

@@ -2684,6 +2684,7 @@ def imports_view(request):
setattr(r,attr,value) setattr(r,attr,value)
r.save() r.save()
messages.info(request,'Settings Saved')
else: else:
form = RowerImportExportForm(instance=r) form = RowerImportExportForm(instance=r)