diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index d8fdf96b..1ba59a54 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -369,13 +369,13 @@ def get_sessions_manager(m,teamid=0,startdate=date.today(),
manager=m,
startdate__lte=enddate,
enddate__gte=startdate,
- ).order_by("startdate","preferreddate","enddate")
+ ).order_by("preferreddate","startdate","enddate")
else:
sps = PlannedSession.objects.filter(
manager=m,
startdate__lte=enddate,
enddate__gte=startdate,
- ).order_by("startdate","preferreddate","enddate")
+ ).order_by("preferreddate","startdate","enddate")
return sps
diff --git a/rowers/templates/plannedsessionscoach.html b/rowers/templates/plannedsessionscoach.html
index 2217824c..170de818 100644
--- a/rowers/templates/plannedsessionscoach.html
+++ b/rowers/templates/plannedsessionscoach.html
@@ -35,15 +35,15 @@
Last Week
+ href="/rowers/sessions/coach/lastmonth">
Last Month
+ href="/rowers/sessions/coach/nextweek">
Next Week
+ href="/rowers/sessions/coach/nextmonth">
Next Month
@@ -81,6 +81,7 @@
| On or after |
On or before |
+ Preferred date |
Name |
{% for r in rowers %}
@@ -90,7 +91,7 @@
|
- {% for key, thedict in statusdict.items %}
+ {% for thedict in statusdict %}
|
{{ thedict|lookup:'startdate'|date:"Y-m-d" }}
@@ -99,7 +100,10 @@
{{ thedict|lookup:'enddate'|date:"Y-m-d" }}
|
-
+ {{ thedict|lookup:'preferreddate'|date:"Y-m-d" }}
+ |
+
+
{% if thedict|lookup:'name' %}
{{ thedict|lookup:'name' }}
{% else %}
@@ -111,18 +115,18 @@
|
{% if thedict|lookup:'results'|lookup:r.id == 'completed' %}
+ href="{% url 'plannedsession_view' id=thedict|lookup:"id" rowerid=r.id %}">
{% elif thedict|lookup:'results'|lookup:r.id == 'partial' %}
+ href="{% url 'plannedsession_view' id=thedict|lookup:"id" rowerid=r.id %}">
{% elif thedict|lookup:'results'|lookup:r.id == 'not done' %}
+ href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ thedict|lookup:"id" }}">
{% elif thedict|lookup:'results'|lookup:r.id == 'not assigned' %}
{% else %}
+ href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ thedict|lookup:"id" }}">
{% endif %}
|
{% endfor %}
diff --git a/rowers/views.py b/rowers/views.py
index c75f965f..07be1758 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -12554,7 +12554,7 @@ def plannedsessions_coach_view(request,timeperiod='thisweek',
rowers = list(set(rowers))
- statusdict = {}
+ statusdict = []
for ps in sps:
rowerstatus = {}
@@ -12562,12 +12562,14 @@ def plannedsessions_coach_view(request,timeperiod='thisweek',
ratio, status,completiondate = is_session_complete(r,ps)
rowerstatus[r.id] = status
sessiondict = {
+ 'id': ps.id,
'results':rowerstatus,
'name': ps.name,
'startdate': ps.startdate,
+ 'preferreddate': ps.preferreddate,
'enddate': ps.enddate,
}
- statusdict[ps.id] = sessiondict
+ statusdict.append(sessiondict)
unmatchedworkouts = []
for r in rowers: