diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/cave_qms.html | 43 | ||||
| -rw-r--r-- | templates/core/QMs_json_list.html | 12 | ||||
| -rw-r--r-- | templates/qm.html | 99 |
3 files changed, 70 insertions, 84 deletions
diff --git a/templates/cave_qms.html b/templates/cave_qms.html index 8b042d3..f55ce9b 100644 --- a/templates/cave_qms.html +++ b/templates/cave_qms.html @@ -20,39 +20,42 @@ <li><a href="{% url 'caveQMs' '1626-359' %}">1626-359 QMs</a> Homecoming </ul> + <p>For how to set up your own QMs, see <a href="/handbook/survey/qmentry.html">Adding QMs </a>. <p>For full explanation of the current status of the QM system(s), see <a href="/handbook/troggle/scriptsqms.html">scriptsqms page</a>. {% endblock %} {% block content %} - <h3>Extant</h3> - <p>{% if cave.get_QMs %} - <ul> - {% for QM in cave.get_QMs %} - {% if QM.ticked %} - {% else %} + <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_description %}⋮<em>{{QM.nearest_station_description}}</em>⋮{% endif %} {{QM.location_description}} <b>{{QM.grade}}</b> + {% if QM.nearest_station_name %}§<em>{{QM.nearest_station_name}}</em>§{% 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> - {% endif %} + {% empty %} + <li>No open leads. {% endfor %} </ul> + +§ QM.nearest_station_name<br /> +☆ QM.resolution_station_name<br /> <h3>Ticked off</h3> - <ul> - {% for QM in cave.get_QMs %} - {% if QM.ticked %} + <ul>{% for QM in cave.get_ticked_QMs %} <li><a href="{{QM.get_absolute_url}}">{{QM}}</a> - {% if QM.nearest_station %}⋮<em>{{QM.nearest_station}}</em>⋮{% endif %} - {% if QM.nearest_station_name %}⋮<em>{{QM.nearest_station_name}}</em>⋮{% endif %} - {% if QM.nearest_station_description %}⋮<em>{{QM.nearest_station_description}}</em>⋮{% endif %} {{QM.location_description}} <b>{{QM.grade}}</b> + {% if QM.nearest_station_name %}§<em>{{QM.nearest_station_name}}</em>§{% endif %} + {% if QM.resolution_station_name %}☆<em>{{QM.resolution_station_name}}</em>☆{% 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 %} {% if QM.completion_description %} Completion page: <a href="/{{QM.get_completion_url}}">{{QM.completion_description}}</a> - {% endif %} - {% endif %} - - - + {% endif %} + {% if QM.comment %} + Comment: <a href="/{{QM.get_completion_url}}">{{QM.comment}}</a> + {% endif %} + {% empty %} + <li>No ticked leads. {% endfor %} </ul> -{% endif %}</p> +</p> +§ QM.nearest_station_name<br /> +☆ QM.resolution_station_name<br /> {% endblock %}
\ No newline at end of file diff --git a/templates/core/QMs_json_list.html b/templates/core/QMs_json_list.html index 70ed97b..6a52105 100644 --- a/templates/core/QMs_json_list.html +++ b/templates/core/QMs_json_list.html @@ -18,16 +18,4 @@ Hacked up list of caves with grade "?" {% endfor %} } <br /><br /> ------------------------------------------------------<br /> -Hacked up list of caves with grade "V" -<br /><br /> - -{% for qm in object_list %} -{% if qm.grade == "V" %}<br /> -"{{qm.id}}": ["{{qm.expoyear}}","{{qm.cave}}",{% if qm.ticked %}"TICKed",{% else %}"OPEN",{% endif %} -"{{qm.blockname}}","QM{{qm.number}}","{{qm.grade}}","{{qm.nearest_station_name}}","{{qm.resolution_station_name}}", -<a href="{{qm.get_absolute_url}}">"{{qm.get_absolute_url}}"</a> -]{% if not forloop.last %},{% endif %} -{% endif %} -{% endfor %} } -{% endblock %} diff --git a/templates/qm.html b/templates/qm.html index 69ada72..1afaa15 100644 --- a/templates/qm.html +++ b/templates/qm.html @@ -2,23 +2,15 @@ {% load link %} {% block title %} QM: {{qm|safe}} {% endblock %} {% block contentheader %} -<h3>QMs available for these caves from CSV import</h3> - <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> - <li><a href="{% url 'caveQMs' '1623-234' %}">1623-234 QMs</a> - </ul> - <p>QMs are also loaded directly from the survex files, e.g. see - <ul> - <li><a href="{% url 'caveQMs' '1623-264' %}">1623-264 QMs</a> Balkon - <li><a href="{% url 'caveQMs' '1623-258' %}">1623-258 QMs</a> Tunnocks - <li><a href="{% url 'caveQMs' '1623-290' %}">1623-290 QMs</a> Fischgesicht - <li><a href="{% url 'caveQMs' '1623-291' %}">1623-291 QMs</a> Happy Butterfly - <li><a href="{% url 'caveQMs' '1626-359' %}">1626-359 QMs</a> Homecoming - </ul> - <p>For full explanation of the current status of the QM system(s), see <a href="/handbook/troggle/scriptsqms.html">scriptsqms page</a>. + +{% endblock %} + +{% block related %} +{% endblock %} + +{% block content %} <table id="cavepage"> <tr> <th id="kat_no"><a class="whitetext" href="{{qm.get_previous_by_id.get_absolute_url}}">Previous QM</a></th> @@ -26,27 +18,33 @@ <th id="status"><a class="whitetext" href="{{qm.get_next_by_id.get_absolute_url}}">Next QM</a></th> </tr> </table> -{% endblock %} -{% block related %} -{% endblock %} +{% if qm.ticked %} +<h3>This QM is TICKED</h3> + + +{% 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 /> +{% endif %} -{% block content %} -<h3>Cave</h3> {% if qm.cave %} -<a href="{% url 'caveQMs' qm.cave|safe %}">{{ qm.cave|safe }} QMs</a> <br> +<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 }} {% else %} - {% if qm.cave %} - <a href="{% url 'caveQMs' qm.cave|safe %}">{{ qm.cave|safe }} QMs</a> <br> - {% endif %} +<h3>This QM is OPEN</h3> +Comment: '{{qm.comment}}'</a> <br /> {% endif %} -<a href="/{{ qm.cave.url }}">{{ qm.cave|safe }} cave description</a> -<h3>QM Number</h3> -{{qm.number}} +QM page_ref: '{{qm.page_ref}}'<br> + +<h3>QM Number: {{qm.number}} Grade: {{qm.grade}} </h3> -<h3>Grade</h3> -{{qm.grade}} <p>Explanation of Grade letters: <a href="/handbook/survey/qm.html">Handbook - QM grades</a> {% if qm.block %} @@ -54,24 +52,17 @@ {{qm.block.date}} <a href="/survexfile/{{qm.block.survexfile.path}}.svx">{{qm.block}}.svx</a> {% endif %} -{% if qm.ticked %} -<h3>Ticked</h3> -This QM is TICKED -{% endif %} -{% if qm.resolution_station_name %} -<h3>resolution_station_name</h3> -{{qm.resolution_station_name}} -{% endif %} -<h3>Location</h3> + +<h3>QM original closest survey station</h3> {% if qm.block %} Survex block: {{qm.blockname}} <br> {% endif %} Nearest station: '{{qm.nearest_station_name}}' {{nearest_station_description}} -<h3>QM Description</h3> +<h3>QM original description</h3> {{qm.location_description}} {% if qm.found_by %} @@ -79,18 +70,22 @@ Nearest station: '{{qm.nearest_station_name}}' {{nearest_station_description}} Found by <a href="{{qm.found_by.get_absolute_url}}">{{qm.found_by}}</a> on {{qm.found_by.date}}. {% endif %} -<h3>Completion</h3> -{% if qm.ticked %} -Ticked off log entry: <a href="{{qm.ticked_off_by.get_absolute_url}}">{{qm.ticked_off_by}}</a><br /> -Ticked off date: <a href="/{{qm.get_completion_url}}">{{qm.get_completion_url}}</a> WRONG <br /> -Tick off date: [For survex file ticks. not implemented yet, needs model change]</a> <br /> -Tick off completion description: {{qm.completion_description}}</a> -{% else %} -No completion description yet- STILL EXTANT. - -{% endif %} - -<h3>Comment</h3> -{{qm.comment}} +<hr /> +<h3>QMs available for these caves from CSV import</h3> + <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> + <li><a href="{% url 'caveQMs' '1623-234' %}">1623-234 QMs</a> + </ul> + <p>QMs are also loaded directly from the survex files, e.g. see + <ul> + <li><a href="{% url 'caveQMs' '1623-264' %}">1623-264 QMs</a> Balkon + <li><a href="{% url 'caveQMs' '1623-258' %}">1623-258 QMs</a> Tunnocks + <li><a href="{% url 'caveQMs' '1623-290' %}">1623-290 QMs</a> Fischgesicht + <li><a href="{% url 'caveQMs' '1623-291' %}">1623-291 QMs</a> Happy Butterfly + <li><a href="{% url 'caveQMs' '1626-359' %}">1626-359 QMs</a> Homecoming + </ul> + <p>For full explanation of the current status of the QM system(s), see <a href="/handbook/troggle/scriptsqms.html">scriptsqms page</a>. + <hr /> {% endblock %} |