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

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2024-06-12 17:52:09 +02:00
parent 09a00f4ac6
commit 37389def6a
8 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/interactiveplots.py
View File

@@ -17,6 +17,7 @@ import rowers.c2stuff as c2stuff
import rowers.metrics as metrics
import rowers.dataprep as dataprep
from rowers.dataprep import rdata
from rowers.dataroutines import remove_nulls_pl
import rowers.utils as utils
import polars as pl
import pytz
@@ -1205,6 +1206,7 @@ def forcecurve_multi_interactive_chart(selected): # pragma: no cover
rowdata = dataprep.read_data(columns, ids=workoutids,
workstrokesonly=False)
rowdata = remove_nulls_pl(rowdata)
rowdata = rowdata.fill_nan(None).drop_nulls()
if rowdata.is_empty():
@@ -1225,7 +1227,7 @@ def forcecurve_multi_interactive_chart(selected): # pragma: no cover
'forcecurve_analyses': selected_dict,
}
script, div = get_chart("/forcecurve_compare", chart_data)
script, div = get_chart("/forcecurve_compare", chart_data, debug=False)
return script, div
@@ -2224,11 +2226,11 @@ def get_zones_report_pl(rower, startdate, enddate, trainingzones='hr', date_agg=
pw_tr = rower.pw_tr
pw_an = rower.pw_an
if iswater:
pw_ut2 = pw_ut2*rower.otwslack/100.
pw_ut1 = pw_ut1*rower.otwslack/100.
pw_at = pw_at*rower.otwslack/100.
pw_tr = pw_tr*rower.otwslack/100.
pw_an = pw_an*rower.otwslack/100.
pw_ut2 = pw_ut2*(100.-rower.otwslack)/100.
pw_ut1 = pw_ut1*(100.-rower.otwslack)/100.
pw_at = pw_at*(100.-rower.otwslack)/100.
pw_tr = pw_tr*(100.-rower.otwslack)/100.
pw_an = pw_an*(100.-rower.otwslack)/100.
# 1
time_ut2 = df.filter(