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

Merge branch 'release/v18.8.14'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-11-27 10:40:25 +01:00
parent 1916963f7a 090450abcf
commit 37167b9353
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/views/workoutviews.py
View File

@@ -1934,6 +1934,7 @@ def workouts_setrpe_view(request):
workouts = Workout.objects.filter( workouts = Workout.objects.filter(
user=r,rpe=0, user=r,rpe=0,
duplicate=False,
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate startdatetime__lte=enddate
).order_by("-date", "-starttime") ).order_by("-date", "-starttime")
@@ -1963,6 +1964,7 @@ def workouts_setrpe_view(request):
workout.save() workout.save()
workouts = Workout.objects.filter( workouts = Workout.objects.filter(
user=r,rpe=0, user=r,rpe=0,
duplicate=False,
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate startdatetime__lte=enddate
).order_by("-date", "-starttime") ).order_by("-date", "-starttime")
@@ -2205,7 +2207,7 @@ def workouts_view(request, message='', successmessage='',
timeperiod = startdate.strftime( timeperiod = startdate.strftime(
'%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d') '%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
norpecount = len([w for w in workouts if w.rpe==0]) norpecount = len([w for w in workouts if w.rpe==0 and not w.duplicate])
if norpecount and r.get_rpe_warnings: if norpecount and r.get_rpe_warnings:
messages.info(request,'You have workouts with no RPE value set. \ messages.info(request,'You have workouts with no RPE value set. \
Click <a href="/rowers/workouts/setrpe">here</a> to update them. \ Click <a href="/rowers/workouts/setrpe">here</a> to update them. \