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

Merge branch 'release/v23.6.14'

Browse Source
This commit is contained in:
Sander Roosendaal
2025-11-14 16:11:49 +01:00
parent dfa112bb04 ee4e5d9ef5
commit eb3f9570eb
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/dataprep.py
View File

@@ -493,7 +493,8 @@ def calculate_goldmedalstandard(rower, workout, recurrance=True):
wcdurations.append(record.duration) wcdurations.append(record.duration)
wcpower.append(record.power) wcpower.append(record.power)
else: else:
getrecords = True pass
# getrecords = True
if getrecords: # pragma: no cover if getrecords: # pragma: no cover
durations = [1, 4, 30, 60] durations = [1, 4, 30, 60]

2
rowers/tasks.py
View File

@@ -2940,7 +2940,7 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename,
hrzones=hrzones) hrzones=hrzones)
try: try:
row = rdata(csvfile=f2, rower=rr) row = rdata(csvfile=f2, rower=rr)
except IOError: # pragma: no cover except: # pragma: no cover
row = rdata(csvfile=f2 + '.gz', rower=rr) row = rdata(csvfile=f2 + '.gz', rower=rr)
try: try:

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

Binary file not shown.

3
rowers/views/analysisviews.py
View File

@@ -772,7 +772,10 @@ def cpdata(workouts, options):
try: try:
tvalue = int(60*(tvalue-minutevalue)) tvalue = int(60*(tvalue-minutevalue))
except TypeError: # pragma: no cover except TypeError: # pragma: no cover
try:
tvalue = int(60*tvalue) tvalue = int(60*tvalue)
except TypeError:
tvalue = 0
if hourvalue >= 24: # pragma: no cover if hourvalue >= 24: # pragma: no cover
hourvalue = 23 hourvalue = 23