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

unrestricting planned session api

Browse Source
This commit is contained in:
Sander Roosendaal
2025-02-05 18:00:21 +01:00
parent 03f68aa72e
commit 8ab568944d
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprep.py
View File

@@ -458,7 +458,7 @@ def calculate_goldmedalstandard(rower, workout, recurrance=True):
if settings.TESTING: if settings.TESTING:
background = False background = False
if recurrance: if recurrance:
df, delta, cpvalues = setcp(workout, background=background) df, delta, cpvalues, cpvalues_spm = setcp(workout, background=background)
if df.is_empty(): if df.is_empty():
return 0, 0 return 0, 0
else: else:
@@ -466,7 +466,7 @@ def calculate_goldmedalstandard(rower, workout, recurrance=True):
if df.is_empty() and recurrance: # pragma: no cover if df.is_empty() and recurrance: # pragma: no cover
df, delta, cpvalues = setcp(workout, recurrance=False, background=True) df, delta, cpvalues, cpvalues_spm = setcp(workout, recurrance=False, background=True)
if df.is_empty(): if df.is_empty():
return 0, 0 return 0, 0
@@ -818,7 +818,7 @@ def update_rolling_cp(r, types, mode='water', dosend=False):
user=r user=r
) )
delta, cp, avgpower, workoutnames, urls = fetchcp_new(r, workouts) delta, cp, cr, avgpower, workoutnames, urls = fetchcp_new(r, workouts)
powerdf = pl.DataFrame({ powerdf = pl.DataFrame({
'Delta': delta, 'Delta': delta,
@@ -1071,7 +1071,7 @@ def checkbreakthrough(w, r):
ishard = False ishard = False
workouttype = w.workouttype workouttype = w.workouttype
if workouttype in rowtypes: if workouttype in rowtypes:
cpdf, delta, cpvalues = setcp(w) cpdf, delta, cpvalues, cpvalues_spm = setcp(w)
if not cpdf.is_empty(): if not cpdf.is_empty():
if workouttype in otwtypes: if workouttype in otwtypes:
try: try:

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

Binary file not shown.

5
rowers/urls.py
View File

@@ -59,10 +59,7 @@ class PlannedSessionViewSet(viewsets.ModelViewSet):
def get_queryset(self): # pragma: no cover def get_queryset(self): # pragma: no cover
try: try:
r = Rower.objects.get(user=self.request.user) r = Rower.objects.get(user=self.request.user)
if r.rowerplan not in ['basic', 'pro']: return PlannedSession.objects.filter(rower=r).order_by("-preferreddate")
return PlannedSession.objects.filter(rower=r).order_by("-preferreddate")
else:
return []
except TypeError: except TypeError:
return [] return []