merge expeditions and statistics pages

templates/statistics.html

@@ -5,7 +5,8 @@
 {% block title %}Expo statistics{% endblock %}
 
 {% block content %}
-<h1>Expo Statistics</h1>
+
+<h1>Expedition Statistics</h1>
 
 <p>{{ expoCount }} expeditions: {{ personCount }} people,  {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries. 
 
@@ -14,13 +15,13 @@ Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total fo
 
 <p>These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys. 
 <p>
-This is work in progress (July 2020).
+This is work in progress (March 2021).
 
 <table>
 <tr><th>Year</th><th>Survex<br>Survey<br>Blocks</th><th>Survex<br>Survey Legs</th><th>Total length<br>(m)</th></tr>
 {% for legs in legsbyexpo %}
 <tr>
-  <td>{{legs.0.year}}</td>
+  <td style="text-align:center"><a href="{{ legs.0.get_absolute_url }}">{{legs.0}}</a></td>
   <td style="text-align:center">{{legs.0.survexblock_set.all|length}}</td>
   <td style="text-align:center">{{legs.1.nsurvexlegs|rjust:"10"}} </td>
   <td style="text-align:right">{{legs.1.survexleglength}}</td>
@@ -30,4 +31,7 @@ This is work in progress (July 2020).
 <p>One Survex Survey Block is one *begin/*end block of data in a survex file. 
 Some files from other caving clubs may have a convention of using many more blocks per file than we do, e.g. if the 
 file is exported from other software into survex format.
+
+
+
 {% endblock %}