expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-08 13:18:15 +00:00
Code Issues 18 Projects 3 Activity

refactoring wallets and expos survey lengths code

Browse Source
This commit is contained in:
Philip Sargent
2025-06-30 12:05:54 +03:00
parent 823ef5b7e7
commit 8d901efdfc
4 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/statistics.html
View File

@@ -5,14 +5,14 @@
<h1>Expedition Statistics</h1>
<p>{{ expoCount }} expeditions: {{ personCount }} people, {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries.
<p>{{ expoCount }} expeditions: {{ personCount }} people, {{ caveCount }} caves, {{ walletsCount }} wallets and {{ logbookEntryCount }} logbook entries.
<p>Number of survey legs: {{nsurvexlegs}} <br />
Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total for each year.</p>
<p>These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys.
<p>
This is work in progress (March 2023): the underground survey length does not match that in e.g.
This is work in progress June 2025): the underground survey length does not match that in e.g.
<a href="/wallets/year/2018">wallets for 2018</a> probably because ARGE surveys are not in any of our wallets.
<p>This includes ARGE and other surveys currently. It will be changed to only include lengths surveyed by valid Expo-attendees.

6
templates/survexfilewild.html
View File

@@ -6,7 +6,7 @@
<h1>'Wild' Survex files {{year}}</h1>
<p>
<p> <a href="/survexfilewild">ALL YEARS</a>
{% for otherexpedition in expeditions %}
| <a <a href="/survexfilewild/{{ otherexpedition.year }}">{{otherexpedition.year}}</a>
{% endfor %}
@@ -14,7 +14,7 @@
<p>These are survex blocks within a survex file which have NO ATTACHED WALLET.
<br />
i.e. they have a survex block (begin..end) with no *REF line which refers to the wallet holding the raw data for that block of data.
<p>These have "; Messteam" or "; Zeichner" in the survex block, so are non expo surveys.
<p>These have "; Messteam", "; Zeichner" or "; "LUSS Dead Mountains" in the survex block, so are non expo surveys.
<table>
<tr><th>survex block with no *ref</th><th>date</th><th>parent block</th><th>within survex file</th><th>surveyed length</th></tr>
{% for sb in svxforeign %}
@@ -28,7 +28,7 @@ i.e. they have a survex block (begin..end) with no *REF line which refers to the
{% endfor %}
</table>
<p>These do not have "; Messteam" or "; Zeichner" in the survex block, so are <em>probably</em> expo surveys; definitely if they have identified team members (or have zero length).
<p>These do not have "; Messteam", "; Zeichner" or "; "LUSS Dead Mountains" in the survex block, so are <em>probably</em> expo surveys; definitely if they have identified team members (or have zero length).
<table>
<tr><th>survex block with no *ref</th><th>date</th><th>parent block</th><th>within survex file</th><th>surveyed length</th><th>team</th></tr>
{% for sb in svxwild %}