1 files changed, 13 insertions, 8 deletions
diff --git a/core/views_logbooks.py b/core/views_logbooks.py
index 17c88fd..1cdffff 100644
--- a/core/views_logbooks.py
+++ b/core/views_logbooks.py
@@ -44,16 +44,21 @@ def personindex(request):
 
 
 def expedition(request, expeditionname):
-    year = int(expeditionname)
-    expedition = Expedition.objects.get(year=year)
-    expedition_next = Expedition.objects.filter(year=year+1) and Expedition.objects.get(year=year+1) or None
-    expedition_prev = Expedition.objects.filter(year=year-1) and Expedition.objects.get(year=year-1) or None
-    message = "No message"
+    expedition = Expedition.objects.get(year=int(expeditionname))
+    expeditions = Expedition.objects.all()
+    personexpeditiondays = [ ]
+    for personexpedition in expedition.personexpedition_set.all():
+        prow = [ ]
+        for expeditionday in expedition.expeditionday_set.all():
+            pcell = { "persontrips":expeditionday.persontrip_set.filter(personexpedition=personexpedition) }
+            pcell["survexblocks"] = set([survexpersonrole.survexblock  for survexpersonrole in expeditionday.survexpersonrole_set.filter(personexpedition=personexpedition)])
+            prow.append(pcell)
+        personexpeditiondays.append({"personexpedition":personexpedition, "personrow":prow})
+        
+    message = ""
     if "reload" in request.GET:
         message = LoadLogbookForExpedition(expedition)
-    #message = str(GetPersonExpeditionNameLookup(expedition).keys())
-    logbookentries = expedition.logbookentry_set.order_by('date')
-    return render_with_context(request,'expedition.html', {'expedition': expedition, 'expedition_next':expedition_next, 'expedition_prev':expedition_prev, 'logbookentries':logbookentries, 'message':message, 'settings':settings })
+    return render_with_context(request,'expedition.html', {'expedition': expedition, 'expeditions':expeditions, 'personexpeditiondays':personexpeditiondays, 'message':message, 'settings':settings })
 
     def get_absolute_url(self):
         return ('expedition', (expedition.year))