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

samedate for all wallets on wallet edit form

Browse Source
This commit is contained in:
Philip Sargent 2023-03-21 14:56:34 +00:00
parent 435f3cf00b
commit 6b3cb9f02e
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/views/wallets_edit.py
View File

@ -845,6 +845,7 @@ def walletedit(request, path=None):
if samedate: if samedate:
svxothers = SurvexFile.objects.filter(survexblock__date=samedate).distinct() svxothers = SurvexFile.objects.filter(survexblock__date=samedate).distinct()
trips = LogbookEntry.objects.filter(date=samedate) trips = LogbookEntry.objects.filter(date=samedate)
wallets = Wallet.objects.filter(walletdate=samedate)
else: else:
svxothers = None svxothers = None
trips = None trips = None
@ -887,6 +888,7 @@ def walletedit(request, path=None):
"checked": checked, "checked": checked,
"trips": trips, "trips": trips,
"manywallets": [thiswallet], "manywallets": [thiswallet],
"wallets": wallets,
"svxothers": svxothers, "svxothers": svxothers,
"create": create, "create": create,
"metadataurl": metadataurl, "metadataurl": metadataurl,

27
templates/walletform.html
View File

@ -230,31 +230,7 @@
</div> </div>
<span style="font-family: monospace; font-size: 150%; "> <span style="font-family: monospace; font-size: 150%; ">
{% include 'onthisdate.html' %}
{% 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 %}
{% empty %}
<em>None found for this date, bit there should be..</em><br>
{% endfor %}
</span>
{% else %}
<em>No Logbook trips 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> {% if metadataurl %}<span style="font-size: 70%; "><details><summary>
JSON <br> JSON <br>
</summary> </summary>
@ -270,4 +246,5 @@
{% endif %} {% endif %}
{% endif %} <!-- not create --> {% endif %} <!-- not create -->
</span> </span>
{% endblock %} {% endblock %}