minor improvements plannedsession views

rowers/templates/plannedsessions.html

@@ -63,6 +63,7 @@
         <th>On or Before</th>
         <th>Name</th>
         <th>Type</th>
+        <th>Mode</th>
         <th>Edit</th>
         <th>Planned</th>
         <th>Actual</th>
@@ -96,7 +97,8 @@
              href="/rowers/sessions/{{ ps.id }}">Unnamed Session</a>
           {% endif %}
         </td>
-        <td> {{ ps.sessiontype }} </td>
+        <td> {{ ps.get_sessiontype_display }} </td>
+        <td> {{ ps.get_sessionmode_display }} </td>
         <td>
           {% if ps.manager == request.user %}
           <a class="small"

rowers/templates/plannedsessionscoach.html

@@ -99,10 +99,10 @@
         <td>
           {% if thedict|lookup:'results'|lookup:r.id == 'completed' %}
           <a class="green dot"
-             href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ key }}">&nbsp;</a>
+             href="{% url 'plannedsession_view' id=key rowerid=r.id %}">&nbsp;</a>
           {% elif thedict|lookup:'results'|lookup:r.id == 'partial' %}
           <a class="orange dot"
-             href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ key }}">&nbsp;</a>
+             href="{% url 'plannedsession_view' id=key rowerid=r.id %}">&nbsp;</a>
           {% elif thedict|lookup:'results'|lookup:r.id == 'not done' %}
           <a class="white dot"
              href="/rowers/sessions/manage/{{ timeperiod }}/rower/{{ r.id }}/session/{{ key }}">&nbsp;</a>

rowers/templates/plannedsessionview.html

@@ -64,13 +64,13 @@
 </div>
 <div class="grid_12 alpha">
 <div id="left" class="grid_6 alpha">
-  <h1>Result</h1>
+  <h1>{{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
   <p>Status: {{ status }}</p>
   <p>Percentage complete: {{ ratio }} </p>
 </div>
 <div id="right" class="grid_6 omega">
   <h1>Stats</h1>
-  <table class="listtable shortpadded" width="80%">
+  <table class="listtable shortpadded" width="100%">
     <thead>
       <tr>
         <th>Name</th>
@@ -78,6 +78,8 @@
         <th>Meters</th>
         <th>rScore</th>
         <th>TRIMP</th>
+        <th>Complete Date</th>
+        <th>Status</th>
       </tr>
     </thead>
     <tbody>
@@ -88,6 +90,8 @@
         <td>{{ value|lookup:'distance' }}</td>
         <td>{{ value|lookup:'rscore' }}</td>
         <td>{{ value|lookup:'trimp' }}</td>
+        <td>{{ value|lookup:'completedate' }}</td>
+        <td>{{ value|lookup:'status' }}</td>
       </tr>
       {% endfor %}
     </tbody>