diff --git a/core/views/wallets_edit.py b/core/views/wallets_edit.py index 9cb667e..4ce590f 100644 --- a/core/views/wallets_edit.py +++ b/core/views/wallets_edit.py @@ -845,6 +845,7 @@ def walletedit(request, path=None): if samedate: svxothers = SurvexFile.objects.filter(survexblock__date=samedate).distinct() trips = LogbookEntry.objects.filter(date=samedate) + wallets = Wallet.objects.filter(walletdate=samedate) else: svxothers = None trips = None @@ -887,6 +888,7 @@ def walletedit(request, path=None): "checked": checked, "trips": trips, "manywallets": [thiswallet], + "wallets": wallets, "svxothers": svxothers, "create": create, "metadataurl": metadataurl, diff --git a/templates/walletform.html b/templates/walletform.html index 801b5a2..5290933 100644 --- a/templates/walletform.html +++ b/templates/walletform.html @@ -230,31 +230,7 @@ </div> <span style="font-family: monospace; font-size: 150%; "> - - {% if trips %}<u>Logbook trips</u> on this date:<br> - <span style="font-size: 70%; "> - {% for item in trips %} - {% if item.isLogbookEntry %} <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 %} - <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 %} - + {% include 'onthisdate.html' %} {% if metadataurl %}<span style="font-size: 70%; "><details><summary> JSON <br> </summary> @@ -270,4 +246,5 @@ {% endif %} {% endif %} <!-- not create --> </span> + {% endblock %}