xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

Report format clean-up

Browse Source
This commit is contained in:
Philip Sargent 2023-03-19 19:12:09 +00:00
parent 9489b9209d
commit 4ae79a642e
3 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/cave.html
View File

@ -485,10 +485,11 @@ div#scene {
<h2>Explorers</h2>
{{ cave.explorers|safe }}
{% endif %}
<h2>Survex File(s)</h2>
All <a href="/survexfile/{{cave.kataster_number}}">survexfiles</a> for this cave<br />
{% if cave.survex_file %}
<h2>Survex File</h2>
Primary <a href="/survexfile/{{cave.survex_file}}">survex file</a> for this cave
<p>[<a href="https://aardgoose.github.io/CaveView.js/">CaveView</a> display of the .3d file is temporarily disabled while we fix things (Nov.2021).<br> See <a href="/handbook/computing/todo.rst">/handbook/computing/todo.rst</a>.]<br><br>
Primary <a href="/survexfile/{{cave.survex_file}}">Survex file</a> &nbsp;for this cave
<div id='scene'></div>
{% endif %}

11
templates/cave_qms.html
View File

@ -2,7 +2,7 @@
{% load link %}
{% block title %} QM: {{qm|safe}} {% endblock %}
{% block contentheader %}
<h2>Question marks for <a href="/{{cave.url}}">{{cave.kataster_number}} - {{cave.official_name|safe}}</a> - {{cave.unofficial_number}}</h2>
<h2>Question marks for <a href="/{{cave.url}}">{{cave.kataster_number}} {% if cave.official_name %}- {{cave.official_name|safe}}{% endif %}</a>{% if cave.unofficial_number %} - ({{cave.unofficial_number|safe}}){% endif %}</h2>
<p>Note that QMs loaded for 1623-161, 1623-204 and 1623-234 are imported from CSV files .
@ -24,10 +24,13 @@
<p>For full explanation of the current status of the QM system(s), see <a href="/handbook/troggle/scriptsqms.html">scriptsqms page</a>.
{% endblock %}
{% block content %}
<hr />
{{cave.slug}} - all <a href="/survexfile/{{cave.kataster_number}}">Survexfiles</a><br />
{{cave.slug}} - <a href="/survexfile/{{cave.survex_file}}">Primary survexfile</a>
<h3>Open leads</h3>
<ul>{% for QM in cave.get_open_QMs %}
<li><a href="{{QM.get_absolute_url}}">{{QM}}</a>
{% if QM.nearest_station_name %}&sect;<em>{{QM.nearest_station_name|safe}}</em>&sect;{% endif %}
{% if QM.nearest_station_name %}&sect;<em><span style="font-family: monospace">{{QM.nearest_station_name|safe}}</span></em>&sect;{% endif %}
{{QM.location_description|safe}} <b>{{QM.grade}}</b>
{% if QM.block %} <a href="/survexfile/{{QM.block.survexfile.path}}.svx">{{QM.block}}.svx</a> {{QM.block.date|date:'Y-m-d'}} {% endif %}
{% if QM.comment %}
@ -42,8 +45,8 @@
<h3>Ticked off</h3>
<ul>{% for QM in cave.get_ticked_QMs %}
<li><a href="{{QM.get_absolute_url}}">{{QM}}</a>
{% if QM.nearest_station_name %}&sect;<em>{{QM.nearest_station_name|safe}}</em>&sect;{% endif %}
{% if QM.resolution_station_name %}<b>&star;<em>{{QM.resolution_station_name|safe}}</em>&star;</b>{% endif %}
{% if QM.nearest_station_name %}&sect;<em><span style="font-family: monospace">{{QM.nearest_station_name|safe}}</span></em>&sect;{% endif %}
{% if QM.resolution_station_name %}<b>&star;<em><span style="font-family: monospace">{{QM.resolution_station_name|safe}}</span></em>&star;</b>{% endif %}
{{QM.location_description|safe}} <b>{{QM.grade}}</b>

50
templates/qm.html
View File

@ -18,60 +18,62 @@
<th id="status"><a class="whitetext" href="{{qm.get_next_by_id.get_absolute_url}}">Next QM</a></th>
</tr>
</table>
<div style="font-size: 120%">
<div style="text-align:center; font-family: sans-serif;font-size: 150%; border:solid">{{qm.location_description|safe}}</div>
{% if qm.ticked %}
<h3>This QM is TICKED</h3>
<h4>This QM is <span style="color:blue; background:lime">TICKED</span></h4>
{% if qm.resolution_station_name %}
The survey station which record the continuation of the cave past this QM is <b>{{qm.resolution_station_name}}</b>.<br />
{%endif %}
Tick off comment: '{{qm.comment|safe}}'</a> <br />
Tick off completion description: '{{qm.completion_description|safe}}' </a> <br />
Tick off date: '{{qm.completion_date|date:'Y-m-d'}}' [For survex file ticks. not implemented yet]</a> <br />
{% endif %}
QM page_ref: '{{qm.page_ref|safe}}'<br>
Tick off comment: '{{qm.comment|safe}}'</a> <br />
{% if qm.cave %}
<h3>Cave: {{qm.cave|safe }}</h3>
{{ qm.cave|safe }}<a href="{% url 'caveQMs' qm.cave|safe %}">All QMs </a> <br>
{{ qm.cave|safe }}<a href="/{{ qm.cave.url }}"> description </a> <br />
{{ qm.cave }} <a href="/survexfile/{{ qm.cave.kataster_number }}"> survexfiles </a> <br />
{% else %}
<h3>This QM is OPEN</h3>
Comment: '{{qm.comment}}'</a> <br />
<h4>This QM is <span style="color:red; background:yellow">OPEN</span></h4>
Comment: '<span style="color:red;">{{qm.comment}}</span>'</a> <br />
{% endif %}
<h3>QM Number: {{qm.number}} Grade: {{qm.grade}} </h3>
<h4>QM Number: {{qm.number}} Grade: {{qm.grade}} </h4>
<p>Explanation of Grade letters: <a href="/handbook/survey/qm.html">Handbook - QM grades</a>
{% if qm.block %}
<h3>Survexfile</h3>
<h4>Survexfile</h4>
{{qm.block.date|date:'Y-m-d'}} <a href="/survexfile/{{qm.block.survexfile.path}}.svx">{{qm.block}}.svx</a>
{% endif %}
<h3>QM original closest survey station</h3>
<h4>QM original closest survey station</h4>
{% if qm.block %}
Survex block: {{qm.blockname}}
<br>
{% endif %}
Nearest station: '{{qm.nearest_station_name}}' {{nearest_station_description}}
<h3>QM original description</h3>
{{qm.location_description}}
QM Nearest station: '{{qm.nearest_station_name}}' {{nearest_station_description}}<br />
QM page_ref: '{{qm.page_ref|safe}}'<br>
<h4>QM original description</h4>
{{qm.location_description|safe}}
{% if qm.found_by %}
<h3>Creation</h3>
<h4>Creation</h4>
Found by <a href="{{qm.found_by.get_absolute_url}}">{{qm.found_by}}</a> on {{qm.found_by.date}}.
{% endif %}
{% if qm.cave %}
<h4>Cave: {{qm.cave|safe }}</h4>
{{ qm.cave|safe }} - <a href="{% url 'caveQMs' qm.cave|safe %}">All QMs </a> <br>
{{ qm.cave|safe }} - <a href="/{{ qm.cave.url }}"> cave description </a> <br />
{{ qm.cave|safe }} - <a href="/survexfile/{{ qm.cave.kataster_number }}"> survexfiles </a> <br />
{{ qm.cave|safe }} - all <a href="/survexfile/{{qm.cave.kataster_number}}">survexfiles</a><br />
{{ qm.cave|safe }} - <a href="/survexfile/{{qm.cave.survex_file}}">primary survexfile</a>
{% endif %}
</div>
<hr />
<h3>QMs available for these caves from CSV import</h3>
<h4>QMs available for these caves from CSV import</h4>
<ul>
<li><a href="{% url 'caveQMs' '1623-161' %}">1623-161 QMs</a> Maybe OUT OF DATE. See <a href="/1623/161/qmdone.htm">the curated list <b>instead</b></a>
<li><a href="{% url 'caveQMs' '1623-204' %}">1623-204 QMs</a> Maybe OUT OF DATE. See <a href=" /1623/204/qm.html">the curated list <b>instead</b></a>