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

more pl

Browse Source
This commit is contained in:
Sander Roosendaal
2024-04-08 19:02:28 +02:00
parent 69007e56be
commit fc96d44e72
3 changed files with 33 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/interactiveplots.py
View File

@@ -478,7 +478,7 @@ def interactive_forcecurve(theworkouts):
rowdata.dropna(axis=0, how='any', inplace=True)
if rowdata.empty:
return "", "No Valid Data Available", "", ""
return "", "No Valid Data Available"
data_dict = rowdata.to_dict("records")
@@ -2312,7 +2312,6 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
columns_basic = columns_basic + ['spm', 'driveenergy', 'distance', 'workoutstate']
datadf = pd.DataFrame()
start = timezone.now()
if promember:
datadf = dataprep.getsmallrowdata_pl(columns, ids=ids, doclean=True,
workstrokesonly=workstrokesonly, for_chart=True)
@@ -2320,7 +2319,6 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
datadf = dataprep.getsmallrowdata_pl(columns_basic, ids=ids, doclean=True,
workstrokesonly=workstrokesonly, for_chart=True)
print(timezone.now()-start)
try:
_ = datadf[yparam2]
except (KeyError, ColumnNotFoundError): # pragma: no cover
@@ -2331,9 +2329,7 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
except (KeyError, ColumnNotFoundError):
yparam1 = 'None'
datadf.drop_nulls()
#datadf.dropna(axis=1, how='all', inplace=True)
#datadf.dropna(axis=0, how='any', inplace=True)
datadf = datadf.fill_nan(None).drop_nulls()
# test if we have drive energy
try: # pragma: no cover