xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

all working, queries improved, date-ordered.

Browse Source
This commit is contained in:
Philip Sargent
2023-02-27 22:23:24 +00:00
parent 154722f765
commit 5c3927c25d
6 changed files with 56 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
templates/onthisdate.html
View File

@@ -3,7 +3,7 @@
{% if svxothers %}<u>Survex files</u> on this date:<br>
<span style="font-size: 70%; ">
{% for item in svxothers %}
{% if item.isSurvexBlock %}&nbsp;&nbsp;&nbsp;&nbsp;<a href="/survexfile/{{item.survexfile.path}}">{{item.survexfile.path|safe}}</a><br/>{% endif %}
&nbsp;&nbsp;&nbsp;&nbsp;<a href="/survexfile/{{item.path}}">{{item.path|safe}}</a><br/>
{% empty %}
<em>None found for this date.</em><br>
{% endfor %}
@@ -16,11 +16,8 @@
{% for item in wallets %}
&nbsp;&nbsp;&nbsp;&nbsp;<a href="/survey_scans/{{item.walletname|urlencode}}/">{{item.walletname|safe}}</a>
{% if item.name %}
{{item.name|safe}} <br/>
{% else %}
{{item.get_fnames|safe}}
<br/>
{% endif %}
{{item.name|safe}}
{% endif %}{{item.get_fnames|truncatechars:80}}<br/>
{% empty %}
<em>None found for this date.</em><br>
{% endfor %}
@@ -28,7 +25,7 @@
{% else %}
<em>No wallets files found for this date.</em><br>
{% endif %}
{% if trips %}<u>All logbook trips</u> on this date:<br>
{% if trips %}<u>Logbook trips</u> on this date:<br>
<span style="font-size: 70%; ">
{% for item in trips %}
{% if item.isLogbookEntry %}&nbsp;&nbsp;&nbsp;&nbsp;<a href="{{item.get_absolute_url}}">{{item.title|safe}}</a><br/>{% endif %}

7
templates/svxfile.html
View File

@@ -83,16 +83,15 @@ LOGMESSAGES
<span style="font-family: monospace; font-size: 130%; ">
{% for sb in svxblocks %}
{% empty %}
Cannot find any survex blocks in this survex file (not looking at *include files). <br />
Cannot find any <em>dated</em> survex blocks in this survex file (not looking at *include files). <br />
Report this to a nerd if you think this is incorrect.
<hr />
{% endfor %}
{% for key, value in events.items %}
<details {% if forloop.first %} open{% endif %}>
<summary><b><a href="/expedition/{{key|date:"Y"}}">{{key|date:"Y"}}</a>{{key|date:"-m-d"}}</b> </summary>
<br />
{% with trips=value.0 svxfiles=value.1 wallets=value.2 %}
<summary><b><a href="/expedition/{{key|date:"Y"}}">{{key|date:"Y"}}</a>{{key|date:"-m-d"}}</b> {{value.3}}</summary>
{% with trips=value.0 svxothers=value.1 wallets=value.2 %}
{% include 'onthisdate.html' %}
{% endwith %}
</details>

24
templates/walletform.html
View File

@@ -228,6 +228,7 @@
</button>{% endif %}
</form>
</div>
<span style="font-family: monospace; font-size: 150%; ">
{% if trips %}<u>Logbook trips</u> on this date:<br>
@@ -241,17 +242,18 @@
{% else %}
<em>No Logbook trips found for this date.</em><br>
{% endif %}
{% if svxothers %}<u>Other survex files</u> on this date:<br>
<span style="font-size: 70%; ">
{% for item in svxothers %}
{% if item.isSurvexBlock %}&nbsp;&nbsp;&nbsp;&nbsp;<a href="/survexfile/{{item.survexfile.path}}">{{item.survexfile.path|safe}}</a><br/>{% endif %}
{% empty %}
<em>None found for this date, but there should be..</em><br>
{% endfor %}
</span>
{% else %}
<em>No other survex files found for this date.</em><br>
{% endif %}
{% if svxothers %}<u>Survex files</u> on this date:<br>
<span style="font-size: 70%; ">
{% for item in svxothers %}
&nbsp;&nbsp;&nbsp;&nbsp;<a href="/survexfile/{{item.path}}">{{item.path|safe}}</a><br/>
{% empty %}
<em>None found for this date.</em><br>
{% endfor %}
</span>
{% else %}
<em>No survex files found for this date.</em><br>
{% endif %}
{% if metadataurl %}<span style="font-size: 70%; "><details><summary>
JSON <br>