1 files changed, 11 insertions, 13 deletions
diff --git a/templates/expedition.html b/templates/expedition.html
index fd78eea..814b77e 100644
--- a/templates/expedition.html
+++ b/templates/expedition.html
@@ -67,22 +67,20 @@ an "S" for a survey trip.  The colours are the same for people on the same trip.
 <form action="" method="GET"><input type="submit" name="reload" value="Reload"></form>
 
 <h3>Logbooks and survey trips per day</h3>
+<a href="{% url newLogBookEntry expeditionyear=expedition.year %}">New logbook entry</a>
 <table class="expeditionlogbooks">
 <tr><th>Date</th><th>Logged trips</th><th>Surveys</th></tr>
-{% for expeditionday in expedition.expeditionday_set.all %} 
+{% regroup dateditems|dictsort:"date" by date as dates %}
+{% for date in dates %}
 <tr>
-  <td>{{expeditionday.date}}</td>
-  <td>
-    {% for logbookentry in expeditionday.logbookentry_set.all %}
-    <a href="{{ logbookentry.get_absolute_url }}">{{logbookentry.title|safe}}</a><br/>
-    {% endfor %}
-  </td>
-  <td>
-    {% for survexblock in expeditionday.survexblock_set.all %}
-    <a href="{% url svx survexblock.survexfile.path %}">{{survexblock.name}}</a>
-    {% endfor %}
-  </td>
-</tr>
+<td>{{date.grouper}}</td>
+<td>{% for item in date.list %}
+        {% if item.isLogbookEntry %}<a href="{{ item.get_absolute_url }}">{{item.title|safe}}</a><br/>{% endif %}
+    {% endfor %}</td>
+<td>{% for item in date.list %}
+        {% if item.isSurvexBlock %}<a href="{% url svx item.survexfile.path %}">{{item.name}}</a><br/>{% endif %}
+    {% endfor %}</td>
+</tr>  
 {% endfor %}
 </table>