expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-05-20 18:18:50 +01:00
Code Issues 18 Projects 3 Activity

Survex 1624, 1626, 1627 now displayed robustly

Browse Source
This commit is contained in:
Philip Sargent
2021-03-26 02:01:29 +00:00
parent 65c3cb31d7
commit 3487c22da3
6 changed files with 202 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/svxcavesingle404.html
+16 -68
View File
@@ -6,78 +6,26 @@
{% block content %}
<h1>Surveys for cave - Cave not found</h1>
<h1>Cave not found in database</h1>
<h3>Cave number looked for: '{{cave}}'</h3>
<h3>kataster number like this not found</h3>
<h3>unofficial number like this not found</h3>
<ul>
<li>- unofficial number like this not found</li>
<li>- kataster number like this not found</li>
</ul>
<h3>You probably got here because a survex (.svx) file has been stored on the server in the
<a href="/handbook/computing/repos.html"><var>:loser:</var></a> repository
but whoever was
responsible has not yet created the appropriate XML file the
<a href="/handbook/computing/repos.html"><var>:expoweb:</var></a> repository
which registers the cave description and ties together
the survex files with everything else.
</h3>
<p>The process for registering a new cave is documented in
<a href="/handbook/survey/caveentry.html">this part of the survey handbook</a>.
<p>
{% for survexdirectory in cave.survexdirectory_set.all %}
<a href="#T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</a>
{% endfor %}
</p>
{% for survexdirectory in cave.survexdirectory_set.all %}
<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>length</th><th>Titles</th><th>Scans</th></tr>
{% for survexfile in survexdirectory.survexfile_set.all %}
<tr>
{% if survexfile.exists %}
<td rowspan="{{survexfile.survexblock_set.all|length|plusone}}">
{% else %}
<td class="survexnewfile" rowspan="{{survexfile.survexblock_set.all|length|plusone}}">
{% endif %}
{% ifequal survexfile survexdirectory.primarysurvexfile %}
<a href="{% url "svx" survexfile.path %}"><b>{{survexfile.path}}</b></a>
{% else %}
<a href="{% url "svx" survexfile.path %}">{{survexfile.path}}</a>
{% endifequal %}
</td>
</tr>
{% for survexblock in survexfile.survexblock_set.all %}
<tr>
<td style="width:10 em">{{survexblock.name}}</td>
<td style="white-space:nowrap">
{% if survexblock.expedition %}
<a href="{{survexblock.expedition.get_absolute_url}}">{{survexblock.date|date:"D d M Y"}}</a>
{% else %}
<!--{{survexblock.date}}-->
{% endif %}
</td>
<td>
{% for personrole in survexblock.survexpersonrole_set.all %}
{% if personrole.personexpedition %}
<a href="{{personrole.personexpedition.get_absolute_url}}">{{personrole.personname}}</a>
{% else %}
{{personrole.personname}}
{% endif %}
{% endfor %}
</td>
<td style="padding-right: 3px; text-align:right">{{survexblock.legslength|stringformat:".1f"}}</td>
<td style="padding-left: 3px;">
{{survexblock.title}}
</td>
<td>
{% if survexblock.scansfolder %}
<b><a href="{{survexblock.scansfolder.get_absolute_url}}">{{survexblock.scansfolder.walletname}}</a></b>
{% endif %}
</td>
</tr>
{% endfor %}
{% endfor %}
</table>
{% endfor %}
{% endblock %}