expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-01-19 09:22:32 +00:00
Code Issues 18 Projects 3 Activity

More informative html in templates

Browse Source
This commit is contained in:
Philip Sargent 2020-07-02 16:24:39 +01:00
parent df434cd399
commit 6cd660982c
3 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/controlPanel.html
View File

@ -21,6 +21,8 @@
</div>
{% endif %}
<h2>NONE of this is working currently</h2>
<h2>The code behind this page is under repair</h2>
<form name="reset" method="post" action="">
<h3>Wipe:</h3>

23
templates/statistics.html
View File

@ -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 %}

17
templates/tasks.html
View File

@ -5,19 +5,30 @@
{% block title %}Cambridge Expeditions to Austria{% endblock %}
{% block content %}
<h2>Expo member tasks</h2>
<h2>This is not fully working currently</h2>
<h2>The code behind this page is under repair</h2>
<!--<h2>Expo member tasks</h2>-->
<h3>Expo member tasks</h3>
<h3>Add new data</h3>
<li><a href="">Upload a photo</a></li>
<li><a href="">Record a new trip</a></li>
<li><a href="">Upload a GPS track</a></li>
<li><a href="">Upload a Tunnel or Therion drawing</a></li>
<li><a href="/survexfile/caves-1623/999/999.svx">Upload or type in a Survex file</a></li>
<h3>Unfinished wallets work to do:</h3>
<a href="/expofiles/surveyscans/2016/walletindex.html">2016 wallets</a><br>
<a href="/expofiles/surveyscans/2017/walletindex.html">2017 wallets</a><br>
<a href="/expofiles/surveyscans/2018/walletindex.html">2018 wallets</a><br>
<a href="/expofiles/surveyscans/2019/walletindex.html">2019 wallets</a><br>
{% for survey in surveys_unfinished %}
<li>{{survey|link}}</li>
{% endfor %}
<h3>Caving recommendations</h3>
<h3>Caving QM recommendations</h3>
{% for qm in qms_recommended %}
<li>{{qm|link}}</li>
{% endfor %}