Merge tag 'v7.08' into develop
adding dropna
This commit is contained in:
@@ -1037,7 +1037,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
|
||||
hr=hr,
|
||||
pace=p * 1e3,
|
||||
spm=spm,
|
||||
# velo=velo,
|
||||
velo=velo,
|
||||
cumdist=cumdist,
|
||||
ftime=niceformat(t2),
|
||||
fpace=nicepaceformat(p2),
|
||||
@@ -1051,7 +1051,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
|
||||
distance=distance,
|
||||
drivespeed=drivespeed,
|
||||
rhythm=rhythm,
|
||||
# distanceperstroke=distanceperstroke,
|
||||
distanceperstroke=distanceperstroke,
|
||||
)
|
||||
)
|
||||
|
||||
@@ -1220,6 +1220,10 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
|
||||
|
||||
data = data.replace([-np.inf,np.inf],np.nan)
|
||||
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
|
||||
if id != 0:
|
||||
|
||||
@@ -2684,6 +2684,7 @@ def imports_view(request):
|
||||
setattr(r,attr,value)
|
||||
|
||||
r.save()
|
||||
messages.info(request,'Settings Saved')
|
||||
|
||||
else:
|
||||
form = RowerImportExportForm(instance=r)
|
||||
|
||||
Reference in New Issue
Block a user