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

adding preffereddate to session and tooltip on workout

Browse Source
This commit is contained in:
Sander Roosendaal
2018-03-10 15:48:23 +01:00
parent 22bc518bf2
commit 9af1ebc9db
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/plannedsessions.py
View File

@@ -368,13 +368,13 @@ def get_sessions_manager(m,teamid=0,startdate=date.today(),
manager=m,
startdate__lte=enddate,
enddate__gte=startdate,
).order_by("startdate","enddate")
).order_by("startdate","preferreddate","enddate")
else:
sps = PlannedSession.objects.filter(
manager=m,
startdate__lte=enddate,
enddate__gte=startdate,
).order_by("startdate","enddate")
).order_by("startdate","preferreddate","enddate")
return sps
@@ -385,7 +385,7 @@ def get_sessions(r,startdate=date.today(),
rower__in=[r],
startdate__lte=enddate,
enddate__gte=startdate,
).order_by("startdate","enddate")
).order_by("startdate","preferreddate","enddate")
return sps