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
Download Patch File Download Diff File Expand all files Collapse all files

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>