summaryrefslogtreecommitdiffstats
path: root/templates/statistics.html
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2020-07-02 16:24:39 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2020-07-02 16:24:39 +0100
commit6cd660982c236dca3a56a6a2757fa52fbbe1e49c (patch)
tree3ace8f9d432aa8eabc3b20a538329b7db8d0e806 /templates/statistics.html
parentdf434cd39909d177f98dec5a7575f61ea701c102 (diff)
downloadtroggle-6cd660982c236dca3a56a6a2757fa52fbbe1e49c.tar.gz
troggle-6cd660982c236dca3a56a6a2757fa52fbbe1e49c.tar.bz2
troggle-6cd660982c236dca3a56a6a2757fa52fbbe1e49c.zip
More informative html in templates
Diffstat (limited to 'templates/statistics.html')
-rw-r--r--templates/statistics.html23
1 files changed, 16 insertions, 7 deletions
diff --git a/templates/statistics.html b/templates/statistics.html
index 0cbe115..cd9bf4a 100644
--- a/templates/statistics.html
+++ b/templates/statistics.html
@@ -7,24 +7,33 @@
{% block content %}
<h1>Expo Statistics</h1>
-<p>{{ expoCount }} expeditions: {{ personCount }} people have contributed {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries.
+<p>{{ expoCount }} expeditions: {{ personCount }} people, {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries.
<p>Number of survey legs: {{nsurvexlegs}}<br />
Total length: {{totalsurvexlength|stringformat:".1f"}} km added-up on importing survex files.<br />
-Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up all the years below.</p>
+Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total for each year.</p>
-<p>These are raw tape lengths which include pitches, splays and surface-surveys.
+<p>These are raw tape lengths which include pitches, splays and surface-surveys. There is also some doubt that the parsing is
+correct so maybe some long lengths are misinterpeted: compass readings as tape-lengths for example: LoadSurvexDataCmd
+in parsers/survex.py would be a good place to start.
+<p>
+This is work in progress (July 2020).
+
+<p>However the number of survey legs should be correct, and the by-year total <em>should</em> be
+the same as the by-file-import total.<br>Obviously there is still work to do.
<table>
-<tr><th>Year</th><th>Survex<br>Surveys</th><th>Survey Legs</th><th>Total length<br>(m)</th></tr>
+<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:right">{{legs.0.survexblock_set.all|length}}</td>
- <td style="text-align:right">{{legs.1.nsurvexlegs|rjust:"10"}}</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>
</tr>
{% endfor %}
</table>
-
+<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 %} \ No newline at end of file