diff --git a/rowers/middleware.py b/rowers/middleware.py index 1bb56be1..e9c90956 100644 --- a/rowers/middleware.py +++ b/rowers/middleware.py @@ -24,14 +24,16 @@ def do_update(user,mode='rower',days=42): now_date = timezone.now().strftime('%Y-%m-%d') ms = PowerTimeFitnessMetric.objects.filter( user=user, - workoutmode=mode) + workoutmode=mode).order_by("-date") if len(ms) == 0: max_workout_id = 0 last_update_date = '1972-01-01' else: max_workout_id = max([m.last_workout for m in ms]) - last_update_date = max([m.date.strftime('%Y-%m-%d') for m in ms]) + last_update_date = ms[0].date.strftime('%Y-%m-%d') + + #last_update_date = max([m.date.strftime('%Y-%m-%d') for m in ms]) diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index 1adc0f89..fc7509ef 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -164,7 +164,11 @@ def team_members(user): if therower.rowerplan != 'coach': return [] teams = Team.objects.filter(manager=user) - members = Rower.objects.filter(team__in=teams).distinct() + members = Rower.objects.filter( + team__in=teams + ).distinct().order_by( + "user__last_name","user__last_name" + ) return [rower.user for rower in members] except TypeError: return [] @@ -178,7 +182,9 @@ def team_rowers(user): if therower.rowerplan != 'coach': return [] teams = Team.objects.filter(manager=user) - members = Rower.objects.filter(team__in=teams).distinct() + members = Rower.objects.filter(team__in=teams).distinct().order_by( + "user__last_name","user__last_name" + ) return members except TypeError: return [] diff --git a/rowers/views.py b/rowers/views.py index 298d0e3c..7c3dcd14 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -4170,10 +4170,14 @@ def otwrankings_view(request,theuser=0, theworkouts = [] thesecs = [] - theworkouts = Workout.objects.filter(user=r,rankingpiece=True, - workouttype='water', - startdatetime__gte=startdate, - startdatetime__lte=enddate) + theworkouts = Workout.objects.filter( + user=r,rankingpiece=True, + workouttype='water', + startdatetime__gte=startdate, + startdatetime__lte=enddate + ).order_by( + "-startdatetime" + ) delta,cpvalue,avgpower = dataprep.fetchcp(r,theworkouts) @@ -4230,7 +4234,7 @@ def otwrankings_view(request,theuser=0, powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True) - rowername = rower.user.first_name+" "+rower.user.last_name + rowername = r.user.first_name+" "+r.user.last_name # create interactive plot if len(powerdf) !=0 : res = interactive_otwcpchart(powerdf,promember=promember,rowername=rowername) @@ -4420,14 +4424,16 @@ def oterankings_view(request,theuser=0, theworkouts = [] thesecs = [] - theworkouts = Workout.objects.filter(user=r,rankingpiece=True, - workouttype__in=[ - 'rower', - 'dynamic', - 'slides' - ], - startdatetime__gte=startdate, - startdatetime__lte=enddate) + theworkouts = Workout.objects.filter( + user=r,rankingpiece=True, + workouttype__in=[ + 'rower', + 'dynamic', + 'slides' + ], + startdatetime__gte=startdate, + startdatetime__lte=enddate + ).order_by("-startdatetime") delta,cpvalue,avgpower = dataprep.fetchcp(