diff --git a/rowers/forms.py b/rowers/forms.py index 641afe89..66d723c0 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -1216,7 +1216,7 @@ bulkactions = ( ('rower assign','rower assign'), ) destinations = ( - ('C2','C2'), + ('c2','c2'), ('strava','strava'), ('sporttracks','sporttracks'), ('trainingpeaks','trainingpeaks') diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 3e1336fc..891e7a14 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -342,7 +342,6 @@ def interactive_boxchart(datadf, fieldname, extratitle='', return '', 'Not enough data' - datadf = datadf.with_columns((pl.col("date").dt.strftime("%Y-%m-%d")).alias("date")) datadf = datadf.with_columns((pl.col(fieldname)).alias("value")) @@ -352,7 +351,6 @@ def interactive_boxchart(datadf, fieldname, extratitle='', "data": data_dict } - script, div = get_chart("/boxplot", boxplot_data, debug=False) return script, div @@ -1802,7 +1800,7 @@ def interactive_flexchart_stacked(id, r, xparam='time', 'metrics': metrics_list, } - script, div = get_chart("/stacked", chart_data, debug=True) + script, div = get_chart("/stacked", chart_data, debug=False) return script, div diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 64463768..4c96e43b 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 5fa3fa82..a2c254f9 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -938,17 +938,17 @@ def boxplotdata(workouts, options): try: datadf = datadf.filter( - pl.col("spm")>spmmin, - pl.col("spm")workmin, - pl.col("driveenergy")=spmmin, + pl.col("spm")<=spmmax, + pl.col("driveenergy")>=workmin, + pl.col("driveenergy")<=workmax, ) except ColumnNotFoundError: pass try: datadf = datadf.with_columns((pl.col("workoutid").apply(lambda x: datemapping[x])).alias("date")) - except ComputeError: + except ComputeError as e: return ("","No Valid Data") if userid == 0: # pragma: no cover @@ -959,7 +959,10 @@ def boxplotdata(workouts, options): savedata = options.get('savedata',False) if savedata: # pragma: no cover - return datadf.to_pandas() + return datadf.to_pandas() + + + script, div = interactive_boxchart(datadf, plotfield, extratitle=extratitle,