From 45f06293f5917f0da7c85e74ddb1ae09b997705e Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Wed, 12 Oct 2022 23:10:48 +0300 Subject: Add 'foreign friends' to names alias list --- core/views/statistics.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'core/views/statistics.py') diff --git a/core/views/statistics.py b/core/views/statistics.py index 56517d7..c22d1a4 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -15,7 +15,7 @@ from django.utils import timezone from troggle.core.models.troggle import Expedition, Person, PersonExpedition, DataIssue from troggle.core.models.caves import Cave, LogbookEntry, Entrance from troggle.core.models.survex import SurvexBlock, SurvexStation -from troggle.parsers.people import GetPersonExpeditionNameLookup +from troggle.parsers.people import GetPersonExpeditionNameLookup, foreign_friends import troggle.settings as settings @@ -176,12 +176,14 @@ def eastings(request): def aliases(request, year): '''Page which displays a list of all the person aliases in a specific year ''' + if not year: year = 1998 expo = Expedition.objects.filter(year=year)[0] # returns a set, even though we know there is only one personexpeditions = PersonExpedition.objects.filter(expedition=expo) persons = list(Person.objects.all().order_by('last_name')) + aliases = GetPersonExpeditionNameLookup(expo) aliasdict={} @@ -190,4 +192,5 @@ def aliases(request, year): invert ={} - return render(request,'aliases.html', {'year': year, 'aliasdict': aliasdict, 'invert': invert,'personexpeditions': personexpeditions, 'persons': persons}) + return render(request,'aliases.html', {'year': year, 'aliasdict': aliasdict, + 'foreign_friends': foreign_friends, 'invert': invert,'personexpeditions': personexpeditions, 'persons': persons}) -- cgit v1.2.3