[svn] latest hacking for various statistics

templates/base.html

@@ -32,7 +32,7 @@
    </div>
 </div>
 <div class="toolbarlinks">
-    <a href="{% url survexcaveslist %}">Cave Survex</a> | 
+    <a href="{% url survexcaveslist %}">All Cave Survex</a> | 
     <a href="{% url survexcavessingle 161 %}">161</a> | 
     <a href="{% url survexcavessingle 204 %}">204</a> | 
     <a href="{% url survexcavessingle 258 %}">258</a> | 

templates/expedition.html

@@ -52,4 +52,18 @@
 </table>
 </div>
 
+<div>
+<h3 id="surveysdone">Surveys done</h3>
+<table class="survextrip">
+<tr><th>Date</th><th>Name</th><th>Length</th></tr>
+{% for survexblock in expedition.survexblock_set.all %}
+  <tr>
+    <td>{{survexblock.date}}</td>
+    <td><a href="{% url svx survexblock.survexfile.path %}">{{survexblock.name}}</a></td>
+    <td>{{survexblock.totalleglength}}</td>
+  </tr>
+{% endfor %}
+</table>
+</div>
+
 {% endblock %}

templates/experimental.html

@@ -0,0 +1,26 @@
+{% extends "base.html" %}
+{% load wiki_markup %}
+{% load link %}
+
+{% block title %}Experimental{% endblock %}
+
+{% block content %}
+
+<h1>Expo Experimental</h1>
+
+<p>Number of survey legs: {{nsurvexlegs}}, total length: {{totalsurvexlength}}</p>
+
+<table>
+<tr><th>Year</th><th>Surveys</th><th>Survey Legs</th><th>Total length</th></tr>
+{% for legs in legsbyexpo %}
+<tr>
+  <td>{{legs.0.year}}</td>
+  <td>{{legs.0.survexblock_set.all|length}}</td>
+  <td>{{legs.1.nsurvexlegs}}</td>
+  <td>{{legs.1.survexleglength}}</td>
+</tr>
+{% endfor %}
+</table>
+
+{% endblock %}
+

templates/personindex.html

@@ -11,8 +11,8 @@
 {% for person in notablepersons %}
 <tr>
   <td><a href="{{ person.get_absolute_url }}">{{person|wiki_to_html_short}}</a></td>
-  <td><a href="{{ person.personexpedition_set.all.0.get_absolute_url }}">{{ person.personexpedition_set.all.0.expedition.year }}</a></td> 
-  <td><a href="{{ person.personexpedition_set.latest.get_absolute_url }}">{{ person.personexpedition_set.latest.expedition.year }}</a></td> 
+  <td><a href="{{ person.first.get_absolute_url }}">{{ person.first.expedition.year }}</a></td> 
+  <td><a href="{{ person.last.get_absolute_url }}">{{ person.last.expedition.year }}</a></td> 
   <td>{{person.notability}}</td>
 </tr>
 {% endfor %}
@@ -26,12 +26,13 @@
 <td>
 
 <table>
-<tr><th>Person</th><th>First</th><th>Last</th></tr>
+<tr><th>Person</th><th>First</th><th>Last</th><th>Surveyed length</th></tr>
 {% for person in persons %}
 <tr>
   <td><a href="{{ person.get_absolute_url }}">{{person|wiki_to_html_short}}</a></td>
-  <td><a href="{{ person.personexpedition_set.all.0.get_absolute_url }}">{{person.personexpedition_set.all.0.expedition.year}}</a></td> 
-  <td><a href="{{ person.personexpedition_set.latest.get_absolute_url }}">{{person.personexpedition_set.latest.expedition.year}}</a></td> 
+  <td><a href="{{ person.first.get_absolute_url }}">{{person.first.expedition.year}}</a></td> 
+  <td><a href="{{ person.last.get_absolute_url }}">{{person.last.expedition.year}}</a></td> 
+  <td>{{ person.surveyedleglength }}</td>
 </tr>
 {% endfor %}
 </table>

templates/svxcavesingle.html

@@ -18,7 +18,7 @@
 <h3 id="T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</h3>
 
 <table>
-<tr><th>Survex file</th><th>Block</th><th>Date</th><th>Explorers</th><th>Titles</th><th>Scans</th></tr>
+<tr><th>Survex file</th><th>Block</th><th>Date</th><th>Explorers</th><th>length</th><th>Titles</th><th>Scans</th></tr>
 
 {% for survexfile in survexdirectory.survexfile_set.all %}
 <tr>
@@ -57,6 +57,8 @@
   {% endfor %}
   </td>
 
+  <td>{{survexblock.totalleglength}}</td>
+
   <td>
   {% for survextitle in survexblock.survextitle_set.all %}
     {{survextitle.title}}
@@ -65,7 +67,7 @@
 
   <td>
   {% if survexblock.refscandir %}
-    <b>{{survexblock.refscandir}}</b>
+    <b><a href="/survey_scans/{{survexblock.refscandir}}/">scans</a></b>
   {% endif %}
   </td>
 </tr>

templates/svxfilecavelist.html

@@ -7,6 +7,8 @@
 {% block content %}
 <p><a href="#cdir">caves with subdirectories</a> | <a href="#cmult">caves with multiple files</a> | <a href="#csing">caves with single files</a></p>
 
+<h3><a href="/survexfile/all.svx">Link to all.svx for processing</a></h3>
+
 <h2 id="cdir">Caves with subdirectories</h2>
 
 {% for subdircave, cavefiles, subsurvdirs in subdircaves %}