polars
This commit is contained in:
@@ -1515,7 +1515,10 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
|
||||
data.append(df)
|
||||
except (IsADirectoryError, FileNotFoundError, OSError, ArrowInvalid, IndexError): # pragma: no cover
|
||||
rowdata, row = getrowdata(id=id)
|
||||
shutil.rmtree(f)
|
||||
try:
|
||||
shutil.rmtree(f)
|
||||
except:
|
||||
pass
|
||||
if rowdata and len(rowdata.df):
|
||||
_ = dataprep(rowdata.df, id=id,
|
||||
bands=True, otwpower=True, barchart=True,
|
||||
@@ -1564,7 +1567,7 @@ def getsmallrowdata_pl(columns, ids=[], doclean=True, workstrokesonly=True, comp
|
||||
workstrokesonly=workstrokesonly,
|
||||
for_chart=for_chart)
|
||||
|
||||
data = data.drop_nulls()
|
||||
data = data.fill_nan(None).drop_nulls()
|
||||
|
||||
return data
|
||||
|
||||
|
||||
@@ -2312,6 +2312,7 @@ 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)
|
||||
@@ -2319,6 +2320,7 @@ 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
|
||||
@@ -2415,7 +2417,7 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
|
||||
'trendline': trendline,
|
||||
}
|
||||
|
||||
script, div = get_chart("/dots", chart_data)
|
||||
script, div = get_chart("/dots", chart_data, debug=False)
|
||||
|
||||
return script, div
|
||||
|
||||
|
||||
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
Binary file not shown.
Reference in New Issue
Block a user