summaryrefslogtreecommitdiffstats
path: root/expo/views_logbooks.py
diff options
context:
space:
mode:
Diffstat (limited to 'expo/views_logbooks.py')
-rw-r--r--expo/views_logbooks.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py
index 935eebd..7d18ba1 100644
--- a/expo/views_logbooks.py
+++ b/expo/views_logbooks.py
@@ -1,7 +1,10 @@
from django.shortcuts import render_to_response
from troggle.expo.models import Expedition, Person, PersonExpedition, PersonTrip, LogbookEntry
import troggle.settings as settings
+
from troggle.parsers.logbooks import LoadLogbookForExpedition
+from troggle.parsers.people import GetPersonExpeditionNameLookup
+
import search
import re
@@ -17,7 +20,7 @@ def expedition(request, expeditionname):
message = "No message"
if "reload" in request.GET:
message = LoadLogbookForExpedition(expedition)
-
+ #message = str(GetPersonExpeditionNameLookup(expedition).keys())
logbookentries = expedition.logbookentry_set.order_by('date')
return render_to_response('expedition.html', {'expedition': expedition, 'expedition_next':expedition_next, 'expedition_prev':expedition_prev, 'logbookentries':logbookentries, 'message':message, 'settings': settings})