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

fix more twiddly variations of QMs

Browse Source
This commit is contained in:
Philip Sargent
2023-03-18 03:03:06 +00:00
parent d64948749e
commit 5a90e7b727
5 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
templates/cave_qms.html
View File

@@ -28,8 +28,10 @@
<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 %}
{{QM.location_description}} <b>{{QM.grade}}</b>
{% if QM.block %} <a href="/survexfile/{{QM.block.survexfile.path}}.svx">{{QM.block}}.svx</a> {{QM.block.date}} {% endif %}</li>
{{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 %}
<span style="color:red;">{{QM.comment}}</span>{% endif %}
{% empty %}
<li>No open leads.
{% endfor %}
@@ -43,14 +45,15 @@
{% 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 %}
{{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}} {% endif %}
{% 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.completion_description %}
Completion page: <a href="/{{QM.get_completion_url}}">{{QM.completion_description}}</a>
&vellip;<em>{{QM.completion_description|safe}}</em>&vellip;
{% endif %}
{% if QM.page_ref %}&#9737;<em><a href="/{{QM.cave.url_parent}}/{{QM.page_ref}}">{{QM.page_ref}}</a></em>&#9737;{% endif %}
{% if QM.comment %}
Comment: <a href="/{{QM.get_completion_url}}">{{QM.comment}}</a>
{% endif %}
<span style="color:red;">{{QM.comment}}</span>{% endif %}
{% empty %}
<li>No ticked leads.
{% endfor %}
@@ -58,4 +61,7 @@
</p>
&sect; QM.nearest_station_name<br />
&star; QM.resolution_station_name - when ticked.<br />
&#9737; QM.page_ref<br />
&vellip; QM.completion_description<br />
&nbsp; <span style="color:red;">QM.comment</span><br />
{% endblock %}

11
templates/qm.html
View File

@@ -26,12 +26,11 @@
{% 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}}'</a> <br />
Tick off completion description: '{{qm.completion_description}}' </a> <br />
Tick off url: <a href="/{{qm.get_completion_url}}">{{qm.get_completion_url}}</a> WRONG <br />
Tick off date: '{{qm.completion_date}}' [For survex file ticks. not implemented yet]</a> <br />
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}}'<br>
QM page_ref: '{{qm.page_ref|safe}}'<br>
{% if qm.cave %}
<h3>Cave: {{qm.cave|safe }}</h3>
@@ -50,7 +49,7 @@ Comment: '{{qm.comment}}'</a> <br />
{% if qm.block %}
<h3>Survexfile</h3>
{{qm.block.date}} <a href="/survexfile/{{qm.block.survexfile.path}}.svx">{{qm.block}}.svx</a>
{{qm.block.date|date:'Y-m-d'}} <a href="/survexfile/{{qm.block.survexfile.path}}.svx">{{qm.block}}.svx</a>
{% endif %}