diff options
| -rw-r--r-- | core/views/caves.py | 7 | ||||
| -rw-r--r-- | templates/caveindex.html | 21 |
2 files changed, 22 insertions, 6 deletions
diff --git a/core/views/caves.py b/core/views/caves.py index e8db577..cdac66d 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -125,7 +125,12 @@ def getnotablecaves(): def caveindex(request): - + #allcaves = Cave.objects.all() + allcaves = Cave.objects.filter(areacode="1626") # testing with subset + for c in allcaves: + if c.entrances: + pass + caves1623 = list(Cave.objects.filter(areacode="1623")) caves1626 = list(Cave.objects.filter(areacode="1626")) caves1627 = list(Cave.objects.filter(areacode="1627")) diff --git a/templates/caveindex.html b/templates/caveindex.html index 6828159..510e02d 100644 --- a/templates/caveindex.html +++ b/templates/caveindex.html @@ -23,8 +23,10 @@ {% endfor %} </ul> -Red star <span style="color: red">*</span> against a name indicates that no survex file is explicitly associated with the cave (but there might be a *fix somewhere) - +Red star <span style="color: red">*</span> against a name indicates that no survex file is explicitly associated with the cave (but there might be a *fix somewhere)<br /> +Orange triangle <span style="color: orange">▲</span> against a name indicates that the cave has no Entrance.<br /> +<!--Blue triangle <span style="color: blue">▼</span> against a name indicates that the cave has an Entrance, but no entrances have located survey stations.--> + <h3>1623</h3> <div style="column-count: 3;"> <table class="searchable"> @@ -37,7 +39,10 @@ Red star <span style="color: red">*</span> against a name indicates that no surv {% endif %} {% else %} {{cave.unofficial_number }} {{cave.official_name|safe}}</a> - {% endif %}{% if cave.survex_file %}{% else %}<span style="color: red">*</span>{% endif %}</</td></tr> + {% endif %} + {% if cave.survex_file %}{% else %}<span style="color: red">*</span>{% endif %} + {% if cave.entrances %}{% else %}<span style="color: orange">▲</span>{% endif %} + </td></tr> {% endfor %} </table> @@ -52,7 +57,10 @@ Red star <span style="color: red">*</span> against a name indicates that no surv <div style="column-count: 3;"> <table class="searchable"> {% for cave in caves1626 %} - <tr><td><a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} {{cave.official_name|safe}}</a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} {{cave.official_name|safe}}</a> {% endif %}{% if cave.survex_file %}{% else %}<span style="color: red">*</span>{% endif %}</td></tr> + <tr><td><a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} {{cave.official_name|safe}}</a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} {{cave.official_name|safe}}</a> {% endif %} + {% if cave.survex_file %}{% else %}<span style="color: red">*</span>{% endif %} + {% if cave.entrances %}{% else %}<span style="color: orange">▲</span>{% endif %} + </td></tr> {% endfor %} </table> @@ -67,7 +75,10 @@ Red star <span style="color: red">*</span> against a name indicates that no surv <div style="column-count: 3;"> <table class="searchable"> {% for cave in caves1627 %} - <tr><td><a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} {{cave.official_name|safe}}</a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} {{cave.official_name|safe}}</a> {% endif %} {% if cave.survex_file %}{% else %}<span style="color: red">*</span>{% endif %}</</td></tr> + <tr><td><a href="{{ cave.url }}">{% if cave.kataster_number %}{{ cave.kataster_number }} {{cave.official_name|safe}}</a> {% if cave.unofficial_number %}({{cave.unofficial_number }}){% endif %}{% else %}{{cave.unofficial_number }} {{cave.official_name|safe}}</a> {% endif %} + {% if cave.survex_file %}{% else %}<span style="color: red">*</span>{% endif %} + {% if cave.entrances %}{% else %}<span style="color: orange">▲</span>{% endif %} + </td></tr> {% endfor %} </table> |