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

32
rowers/views.py
View File

@@ -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(