forked from expo/troggle
samedate for all wallets on wallet edit form
This commit is contained in:
parent
435f3cf00b
commit
6b3cb9f02e
@ -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,
|
||||||
|
@ -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 %} <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 %}
|
|
||||||
|
|
||||||
{% 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 %}
|
||||||
|
Loading…
Reference in New Issue
Block a user