2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-02-25 21:05:19 +00:00

more QMs parsed correctly

This commit is contained in:
2023-03-18 00:57:40 +00:00
parent 7345e3a328
commit d64948749e
4 changed files with 36 additions and 25 deletions

View File

@@ -27,7 +27,7 @@
<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}}</em>&sect;{% endif %}
{% 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>
{% empty %}
@@ -36,13 +36,13 @@
</ul>
&sect; QM.nearest_station_name<br />
&star; QM.resolution_station_name<br />
&star; QM.resolution_station_name - when ticked.<br />
<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}}</em>&sect;{% endif %}
{% if QM.resolution_station_name %}&star;<em>{{QM.resolution_station_name}}</em>&star;{% endif %}
{{QM.location_description}} <b>{{QM.grade}}</b>
{% 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.completion_description %}
@@ -57,5 +57,5 @@
</ul>
</p>
&sect; QM.nearest_station_name<br />
&star; QM.resolution_station_name<br />
&star; QM.resolution_station_name - when ticked.<br />
{% endblock %}

View File

@@ -31,17 +31,18 @@ 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 />
{% endif %}
QM page_ref: '{{qm.page_ref}}'<br>
{% if qm.cave %}
<h3>Cave: {{qm.cave|safe }}</h3>
<a href="{% url 'caveQMs' qm.cave|safe %}">All QMs on this cave </a>{{ qm.cave|safe }} <br>
<a href="/{{ qm.cave.url }}"> Cave description </a> {{ qm.cave|safe }}
{{ 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 />
{% endif %}
QM page_ref: '{{qm.page_ref}}'<br>
<h3>QM Number: {{qm.number}} Grade: {{qm.grade}} </h3>