expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-18 04:57:11 +00:00
Code Issues 18 Projects 3 Activity

Add 'foreign friends' to names alias list

Browse Source
This commit is contained in:
Philip Sargent
2022-10-12 23:10:48 +03:00
parent 004a3e2db1
commit 45f06293f5
3 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/views/statistics.py
View File

@@ -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})