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

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2024-06-25 16:32:57 +02:00
parent 7c62d4c55b
commit 83c1edf123
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/forms.py
View File

@@ -1216,7 +1216,7 @@ bulkactions = (
('rower assign','rower assign'), ('rower assign','rower assign'),
) )
destinations = ( destinations = (
('C2','C2'), ('c2','c2'),
('strava','strava'), ('strava','strava'),
('sporttracks','sporttracks'), ('sporttracks','sporttracks'),
('trainingpeaks','trainingpeaks') ('trainingpeaks','trainingpeaks')

4
rowers/interactiveplots.py
View File

@@ -342,7 +342,6 @@ def interactive_boxchart(datadf, fieldname, extratitle='',
return '', 'Not enough data' return '', 'Not enough data'
datadf = datadf.with_columns((pl.col("date").dt.strftime("%Y-%m-%d")).alias("date")) datadf = datadf.with_columns((pl.col("date").dt.strftime("%Y-%m-%d")).alias("date"))
datadf = datadf.with_columns((pl.col(fieldname)).alias("value")) datadf = datadf.with_columns((pl.col(fieldname)).alias("value"))
@@ -352,7 +351,6 @@ def interactive_boxchart(datadf, fieldname, extratitle='',
"data": data_dict "data": data_dict
} }
script, div = get_chart("/boxplot", boxplot_data, debug=False) script, div = get_chart("/boxplot", boxplot_data, debug=False)
return script, div return script, div
@@ -1802,7 +1800,7 @@ def interactive_flexchart_stacked(id, r, xparam='time',
'metrics': metrics_list, 'metrics': metrics_list,
} }
script, div = get_chart("/stacked", chart_data, debug=True) script, div = get_chart("/stacked", chart_data, debug=False)
return script, div return script, div

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

13
rowers/views/analysisviews.py
View File

@@ -938,17 +938,17 @@ def boxplotdata(workouts, options):
try: try:
datadf = datadf.filter( datadf = datadf.filter(
pl.col("spm")>spmmin, pl.col("spm")>=spmmin,
pl.col("spm")<spmmax, pl.col("spm")<=spmmax,
pl.col("driveenergy")>workmin, pl.col("driveenergy")>=workmin,
pl.col("driveenergy")<workmax, pl.col("driveenergy")<=workmax,
) )
except ColumnNotFoundError: except ColumnNotFoundError:
pass pass
try: try:
datadf = datadf.with_columns((pl.col("workoutid").apply(lambda x: datemapping[x])).alias("date")) datadf = datadf.with_columns((pl.col("workoutid").apply(lambda x: datemapping[x])).alias("date"))
except ComputeError: except ComputeError as e:
return ("","No Valid Data") return ("","No Valid Data")
if userid == 0: # pragma: no cover if userid == 0: # pragma: no cover
@@ -961,6 +961,9 @@ def boxplotdata(workouts, options):
if savedata: # pragma: no cover if savedata: # pragma: no cover
return datadf.to_pandas() return datadf.to_pandas()
script, div = interactive_boxchart(datadf, plotfield, script, div = interactive_boxchart(datadf, plotfield,
extratitle=extratitle, extratitle=extratitle,
spmmin=spmmin, spmmax=spmmax, spmmin=spmmin, spmmax=spmmax,