expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00
Code Issues 19 Projects 3 Activity

Fixed parsing and rendering of an entrances last visited field

Browse Source
This commit is contained in:
Martin Green 2023-07-26 20:40:30 +01:00
parent 6482aa697f
commit a86f251423
3 changed files with 4 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parsers/caves.py
View File

@ -402,7 +402,7 @@ def read_entrance(filename, ent=None):
DataIssue.objects.create(parser="entrances", message=message, url=f"/cave/{slug}/edit/")
print(message)
lastvisit = getXML(entrancecontents, "last visit date", maxItems=1, minItems=0, context=context)
lastvisit = getXML(entrancecontents, "lastvisit", maxItems=1, minItems=0, context=context)
alt = getXMLmax1("alt")
approach = getXMLmax1("approach")

3
templates/cave.html
View File

@ -151,6 +151,9 @@
{% if ent.entrance.location_description %}
<dt>Location</dt><dd>{{ ent.entrance.location_description|safe }}</dd>
{% endif %}
{% if ent.entrance.lastvisit %}
<dt>Date last visited</dt><dd>{{ ent.entrance.lastvisit|safe }}</dd>
{% endif %}
{% if ent.entrance.approach %}
<dt>Approach</dt><dd>{{ ent.entrance.approach|safe }}</dd>
{% endif %}

74
templates/cave_entrances.html
View File

@ -1,74 +0,0 @@
<div id="entrances">
<p>{% if cave.entrances %}
<h2>Entrances</h2>
<ul>
{% for ent in cave.entrances %}
<li>
{{ ent.entrance_letter|safe }}
{% if ent.entrance.name %}
{{ ent.entrance.name|safe }}
{% endif %}<a href="{% url "editentrance" cave.slug ent.entrance.slug %}">Edit</a>
<dl>
{% if ent.entrance.marking %}
<dt>Marking</dt><dd>{{ ent.entrance.marking_val|safe }}</dd>
{% endif %}
{% if ent.entrance.marking_comment %}
<dt>Marking Comment</dt><dd>{{ ent.entrance.marking_comment|safe }}</dd>
{% endif %}
{% if ent.entrance.findability %}
<dt>Findability</dt><dd>{{ ent.entrance.findability_val|safe }}</dd>
{% endif %}
{% if ent.entrance.findability_comment %}
<dt>Findability Comment</dt><dd>{{ ent.entrance.findability_comment|safe }}</dd>
{% endif %}
{% if ent.entrance.location_description %}
<dt>Location</dt><dd>{{ ent.entrance.location_description|safe }}</dd>
{% endif %}
{% if ent.entrance.lastvisit %}
<dt>Location</dt><dd>{{ ent.entrance.lastvisit|safe }}</dd>
{% endif %}
{% if ent.entrance.approach %}
<dt>Approach</dt><dd>{{ ent.entrance.approach|safe }}</dd>
{% endif %}
{% if ent.entrance.map_description %}
<dt>Map</dt><dd>{{ ent.entrance.map_description|safe }}</dd>
{% endif %}
{% if ent.entrance.underground_description %}
<dt>Underground</dt><dd>{{ ent.entrance.underground_description|safe }}</dd>
{% endif %}
{% if ent.entrance.photo %}
<dt>Photo</dt><dd>{{ ent.entrance.photo|safe }}</dd>
{% endif %}
{% if ent.entrance.entrance_description %}
<dt>Description</dt><dd>{{ ent.entrance.entrance_description|safe }}</dd>
{% endif %}
{% if ent.entrance.explorers %}
<dt>Explorers</dt><dd>{{ ent.entrance.explorers|safe }}</dd>
{% endif %}
{% if ent.entrance.northing %}
<dt>Location</dt><dd>{{ ent.entrance.northing|safe }}, {{ ent.entrance.easting|safe }}, {{ ent.entrance.alt|safe }}m</dd>
{% endif %}
{% if ent.entrance.tag_station %}
<dt>Tag Location</dt><dd>{{ ent.entrance.tag_station }} {{ ent.entrance.tag.y|safe }}, {{ ent.entrance.tag.x|safe }}, {{ ent.entrance.tag.z|safe }}m</dd>
{% endif %}
{% if ent.entrance.bearings %}
<dt>Bearings</dt><dd>{{ ent.entrance.bearings|safe }}</dd>
{% endif %}
{% if ent.entrance.exact_station %}
<dt>Exact Station</dt><dd>{{ ent.entrance.exact_station|safe }} {{ ent.entrance.exact_location.y|safe }}, {{ ent.entrance.exact_location.x|safe }}, {{ ent.entrance.exact_location.z|safe }}m</dd>
{% endif %}
{% if ent.entrance.other_station %}
<dt>Other Station</dt><dd>{{ ent.entrance.other_station|safe }}
{% if ent.entrance.other_description %}
- {{ ent.entrance.other_description|safe }}
{% endif %} {{ ent.entrance.other_location.y|safe }}, {{ ent.entrance.other_location.x|safe }}, {{ ent.entrance.other_location.z|safe }}m
</dd>
{% endif %}
</dl>
</li>
{% endfor %}
</ul>
{% endif %}</p>
<a href="{% url "newentrance" cave.slug %}">New Entrance</a>
</div>