Report format clean-up

This commit is contained in:
2023-03-19 19:12:09 +00:00
parent 9489b9209d
commit 4ae79a642e
3 changed files with 36 additions and 30 deletions

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>