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

adding some details about showing commutes to user control

Browse Source
This commit is contained in:
Sander Roosendaal
2025-01-16 08:30:22 +01:00
parent 3b9fdf6611
commit 0b44f02cc6
3 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/views/workoutviews.py
View File

@@ -2145,6 +2145,10 @@ def workouts_view(request, message='', successmessage='',
request.session['referer'] = absolute(request)['PATH']
r = getrequestrower(request, rowerid=rowerid, userid=userid)
show_commutes = request.GET.get('show_commutes', False)
if show_commutes == 'true':
show_commutes = True
# check if access is allowed
startdate = datetime.datetime.combine(startdate, datetime.time())
@@ -2264,9 +2268,13 @@ def workouts_view(request, message='', successmessage='',
g_enddate = timezone.now()
g_startdate = (timezone.now()-timedelta(days=15))
if not r.show_commutes:
nr_commutes = 0
show_commutes = show_commutes or r.show_commutes
if not show_commutes:
nr_commutes = workouts.filter(is_commute=True).count()
workouts = workouts.exclude(is_commute=True)
workoutsnohr = workouts.exclude(averagehr__isnull=False)
for w in workoutsnohr: # pragma: no cover
_ = dataprep.workout_trimp(w)
@@ -2358,6 +2366,8 @@ def workouts_view(request, message='', successmessage='',
'totalmeters': totalmeters,
'totalminutes': totalminutes,
'totalhours': totalhours,
'nr_commutes': nr_commutes,
'show_commutes': show_commutes,
})