Add survex files,wallets and same-day LBEs to the logbook entry

1 files changed, 22 insertions, 2 deletions

diff --git a/core/views/logbooks.py b/core/views/logbooks.py
index 7f26687..f24653c 100644
--- a/core/views/logbooks.py
+++ b/core/views/logbooks.py
@@ -15,7 +15,7 @@ from django.views.generic.list import ListView
 from troggle.core.models.troggle import Expedition, Person, PersonExpedition
 from troggle.core.utils import TROG
 from troggle.core.models.caves import LogbookEntry, PersonTrip
-from troggle.core.models.survex import SurvexBlock
+from troggle.core.models.survex import SurvexBlock, Wallet
 from .auth import login_required_if_public
 from troggle.parsers.logbooks import LoadLogbookForExpedition
 from troggle.parsers.people import GetPersonExpeditionNameLookup
@@ -192,8 +192,28 @@ def logbookentry(request, date, slug):
         if len(this_logbookentry)>1:
             return render(request, 'object_list.html',{'object_list':this_logbookentry})
         else:
+            trips = LogbookEntry.objects.filter(date=date)
+            wallets = set()
+            refwallets = Wallet.objects.filter(survexblock__date=date)
+            for r in refwallets:
+                wallets.add(r)
+            
+            allwallets = Wallet.objects.all()
+            # Note that w.year() only works for wallets which have a valid JSON file existing
+            for w in allwallets:
+                if w.date() == date:
+                    wallets.add(w)
+                
+            thisexpo = this_expedition = Expedition.objects.get(year=int(date[0:4]))
+            if thisexpo:
+                expeditionday = thisexpo.get_expedition_day(date)
+                svxothers = SurvexBlock.objects.filter(expeditionday=expeditionday)
+            else:
+                svxothers = None
+         
             this_logbookentry=this_logbookentry[0]
-            return render(request, 'logbookentry.html', {'logbookentry': this_logbookentry})
+            return render(request, 'logbookentry.html', 
+                {'logbookentry': this_logbookentry, 'trips': trips, 'svxothers': svxothers, 'wallets': wallets})
     else:
         msg =(f' Logbook entry slug:"{slug}" not found in database on date:"{date}" ')
         print(msg)