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

Merge branch 'release/v16.4.1' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2021-05-31 15:45:55 +02:00
parent 0320219acb 8099686ca4
commit 08b831f413
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/interactiveplots.py
View File

@@ -800,12 +800,12 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
df = pd.DataFrame(thedict) df = pd.DataFrame(thedict)
if totaldays>30 and yaxis=='duration': if totaldays>30 and yaxis=='duration': # pragma: no cover
df['duration'] = df['duration']/60 df['duration'] = df['duration']/60
elif yaxis == 'TRIMP': elif yaxis == 'TRIMP':
df.drop('duration',inplace=True,axis='columns') df.drop('duration',inplace=True,axis='columns')
df.drop('rscore',inplace=True,axis='columns') df.drop('rscore',inplace=True,axis='columns')
elif yaxis == 'rScore': elif yaxis == 'rScore': # pragma: no cover
df.drop('duration',inplace=True,axis='columns') df.drop('duration',inplace=True,axis='columns')
df.drop('trimp',inplace=True,axis='columns' ) df.drop('trimp',inplace=True,axis='columns' )
@@ -846,11 +846,11 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l
p.xaxis.axis_label = 'Period' p.xaxis.axis_label = 'Period'
if yaxis == 'duration': if yaxis == 'duration':
p.yaxis.axis_label = 'Duration (min)' p.yaxis.axis_label = 'Duration (min)'
if totaldays>30: if totaldays>30: # pragma: no cover
p.yaxis.axis_label = 'Duration (h)' p.yaxis.axis_label = 'Duration (h)'
elif yaxis == 'TRIMP': elif yaxis == 'TRIMP':
p.yaxis.axis_label = 'TRIMP' p.yaxis.axis_label = 'TRIMP'
else: else: # pragma: no cover
p.yaxis.axis_label = 'rScore' p.yaxis.axis_label = 'rScore'

4
rowers/tasks.py
View File

@@ -3045,7 +3045,7 @@ def df_from_summary(data):
try: try:
splits = data['workout']['splits'] splits = data['workout']['splits']
except KeyError: except KeyError: # pragma: no cover
splits = [0] splits = [0]
time = starttimeunix time = starttimeunix
elapsed_distance = 0 elapsed_distance = 0
@@ -3053,7 +3053,7 @@ def df_from_summary(data):
distances = [0] distances = [0]
try: try:
spms = [splits[0]['stroke_rate']] spms = [splits[0]['stroke_rate']]
except KeyError: except KeyError: # pragma: no cover
spms = [0] spms = [0]
try: try:
hrs = [splits[0]['heart_rate']['average']] hrs = [splits[0]['heart_rate']['average']]