merge exptl & stats, delete millenial & eyecandy

templates/statistics.html

@@ -1,8 +1,26 @@
 {% extends "base.html" %}
 {% load wiki_markup %}
+{% load link %}
 
-{% block title %}Database statistics{% endblock %}
+{% block title %}Expo statistics{% endblock %}
 
 {% block content %}
-Over the course of {{ expoCount }} expeditions, {{ personCount }} people have contributed {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries. 
+<h1>Expo Statistics</h1>
+
+<p>{{ expoCount }} expeditions: {{ personCount }} people have contributed {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries. 
+
+<p>Number of survey legs: {{nsurvexlegs}}, total length: {{totalsurvexlength|stringformat:".3f"}} km</p>
+
+<table>
+<tr><th>Year</th><th>Surveys</th><th>Survey Legs</th><th>Total length<br>(km)</th></tr>
+{% for legs in legsbyexpo %}
+<tr>
+  <td>{{legs.0.year}}</td>
+  <td style="text-align:right">{{legs.0.survexblock_set.all|length}}</td>
+  <td style="text-align:right">{{legs.1.nsurvexlegs|rjust:"10"}}</td>
+  <td style="text-align:right">{{legs.1.survexleglength|stringformat:".3f"}}</td>
+</tr>
+{% endfor %}
+</table>
+
 {% endblock %}