diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index f1eed721..d8f455c5 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -4175,10 +4175,16 @@ def interactive_multiple_compare_chart(ids, xparam, yparam, plottype='line', compute=compute, workstrokesonly=workstrokesonly, for_chart=True) + + # check if dataframe not empty + if datadf.empty: # pragma: no cover + return ['

No non-zero data in selection

', ''] + datadf['workoutid'] = datadf['workoutid'].astype(int) datadf.dropna(axis=1, how='all', inplace=True) datadf.dropna(axis=0, how='all', inplace=True) + nrworkouts = len(ids) try: @@ -4187,11 +4193,11 @@ def interactive_multiple_compare_chart(ids, xparam, yparam, plottype='line', try: tseconds = datadf.loc[:, xparam] except: - return ['', '

A chart data error occurred

', '', 'A chart data error occurred'] + return ['

A chart data error occurred

', ''] # check if dataframe not empty if datadf.empty: # pragma: no cover - return ['', '

No non-zero data in selection

', '', 'No non-zero data in selection'] + return ['

No non-zero data in selection

', ''] if (xparam == 'time'): diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 7629a55f..9156a4de 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 3cca4b75..79a151f9 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1801,8 +1801,6 @@ def virtualevent_compare_view(request, id=0): promember=promember, plottype=plottype, labeldict=labeldict, startenddict=startenddict) - script = res[0] - div = res[1] breadcrumbs = [ {