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

SUrvexDirectory no longer necessary

Browse Source
This commit is contained in:
Philip Sargent
2023-09-06 21:38:45 +03:00
parent 0dc0e27519
commit 1ddb8248df
4 changed files with 74 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
templates/svxcaves.html
View File

@@ -1,4 +1,4 @@
<!-- svxcavesingle.html - this text visible because this template has been included -->
<!-- svxcaves.html - this text visible because this template has been included -->
{% extends "base.html" %}
{% block title %}List of survex files{% endblock %}
{% block content %}
@@ -13,8 +13,9 @@
<p>Wallets: <a href="/cave/scans/{{cave|safe}}">{{cave|safe}}</a>
</p>
<p>
{% for svxdir in cave.sds %}
<a href="#T_{{svxdir.primarysurvexfile.path}}">{{svxdir.path}}</a> &nbsp;
{% for svxprim in cave.sds %}
<a href="#T_{{svxprim}}">{{svxprim}}</a>
&nbsp;
{% empty %}
<p>If you were expecting to see a list of survex files here and a summary table of who did what and when, perhaps
because you followed a link from <a href="/survexfile/caves/">the master caves' survex list</a> page which showed that such survex files clearly existed, and yet there is nothing here but a blank; then this will be because <br>
@@ -39,11 +40,11 @@ to go to a form to correct the online data.
Instructions for filling in this form are in this part
<a href="/handbook/survey/caveentry.html"> of the survey handbook</a>.
</p>
{% for svxdir in cave.sds %}
<h3 id="T_{{svxdir.primarysurvexfile.path}}">{{svxdir.path}}</h3>
{% for svxprim in cave.sds %}
<h3 id="T_{{svxprim.path}}">{{svxprim.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 svxdir.survexfile_set.all %}
{% for survexfile in svxprim.primarysurvex.all %}
<tr>
{% if survexfile.exists %}
<td rowspan="{{survexfile.survexblock_set.all|length|add:"1"}}">
@@ -51,7 +52,7 @@ to go to a form to correct the online data.
<td class="survexnewfile" rowspan="{{survexfile.survexblock_set.all|length|add:"1"}}">
{% endif %}
{% if survexfile == svxdir.primarysurvexfile %}
{% if survexfile == svxprim.primarysurvexfile %}
<a href="{% url "svx" survexfile.path %}"><b>{% url "svx" survexfile.path %}</b></a>
{% else %}
<a href="{% url "svx" survexfile.path %}"><i><small>{% url "svx" survexfile.path %}</small></i></a><!-- would like to extract only the last bit. Some javascript useful ?-->
@@ -98,6 +99,6 @@ to go to a form to correct the online data.
{% endfor %} <!-- survexblock -->
{% endfor %} <!-- survexfile -->
</table>
{% endfor %} <!-- svxdir -->
{% endfor %} <!-- svxprim -->
{% endfor %} <!-- caves -->
{% endblock %}