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

ranking pieces in reverse chronological order on CP view

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-27 16:15:00 +01:00
parent 5709669dc5
commit 8e0de9163f
3 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/middleware.py
View File

@@ -24,14 +24,16 @@ def do_update(user,mode='rower',days=42):
now_date = timezone.now().strftime('%Y-%m-%d') now_date = timezone.now().strftime('%Y-%m-%d')
ms = PowerTimeFitnessMetric.objects.filter( ms = PowerTimeFitnessMetric.objects.filter(
user=user, user=user,
workoutmode=mode) workoutmode=mode).order_by("-date")
if len(ms) == 0: if len(ms) == 0:
max_workout_id = 0 max_workout_id = 0
last_update_date = '1972-01-01' last_update_date = '1972-01-01'
else: else:
max_workout_id = max([m.last_workout for m in ms]) 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])

10
rowers/templatetags/rowerfilters.py
View File

@@ -164,7 +164,11 @@ def team_members(user):
if therower.rowerplan != 'coach': if therower.rowerplan != 'coach':
return [] return []
teams = Team.objects.filter(manager=user) 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] return [rower.user for rower in members]
except TypeError: except TypeError:
return [] return []
@@ -178,7 +182,9 @@ def team_rowers(user):
if therower.rowerplan != 'coach': if therower.rowerplan != 'coach':
return [] return []
teams = Team.objects.filter(manager=user) 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 return members
except TypeError: except TypeError:
return [] return []

16
rowers/views.py
View File

@@ -4170,10 +4170,14 @@ def otwrankings_view(request,theuser=0,
theworkouts = [] theworkouts = []
thesecs = [] thesecs = []
theworkouts = Workout.objects.filter(user=r,rankingpiece=True, theworkouts = Workout.objects.filter(
user=r,rankingpiece=True,
workouttype='water', workouttype='water',
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate) startdatetime__lte=enddate
).order_by(
"-startdatetime"
)
delta,cpvalue,avgpower = dataprep.fetchcp(r,theworkouts) 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) 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 # create interactive plot
if len(powerdf) !=0 : if len(powerdf) !=0 :
res = interactive_otwcpchart(powerdf,promember=promember,rowername=rowername) res = interactive_otwcpchart(powerdf,promember=promember,rowername=rowername)
@@ -4420,14 +4424,16 @@ def oterankings_view(request,theuser=0,
theworkouts = [] theworkouts = []
thesecs = [] thesecs = []
theworkouts = Workout.objects.filter(user=r,rankingpiece=True, theworkouts = Workout.objects.filter(
user=r,rankingpiece=True,
workouttype__in=[ workouttype__in=[
'rower', 'rower',
'dynamic', 'dynamic',
'slides' 'slides'
], ],
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate) startdatetime__lte=enddate
).order_by("-startdatetime")
delta,cpvalue,avgpower = dataprep.fetchcp( delta,cpvalue,avgpower = dataprep.fetchcp(