expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 15:21:52 +00:00
Code Issues 19 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
Show Stats 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.troggle import Expedition, Person, PersonExpedition, DataIssue
from troggle.core.models.caves import Cave, LogbookEntry, Entrance from troggle.core.models.caves import Cave, LogbookEntry, Entrance
from troggle.core.models.survex import SurvexBlock, SurvexStation 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 import troggle.settings as settings
@ -176,12 +176,14 @@ def eastings(request):
def aliases(request, year): def aliases(request, year):
'''Page which displays a list of all the person aliases in a specific year '''Page which displays a list of all the person aliases in a specific year
''' '''
if not year: if not year:
year = 1998 year = 1998
expo = Expedition.objects.filter(year=year)[0] # returns a set, even though we know there is only one expo = Expedition.objects.filter(year=year)[0] # returns a set, even though we know there is only one
personexpeditions = PersonExpedition.objects.filter(expedition=expo) personexpeditions = PersonExpedition.objects.filter(expedition=expo)
persons = list(Person.objects.all().order_by('last_name')) persons = list(Person.objects.all().order_by('last_name'))
aliases = GetPersonExpeditionNameLookup(expo) aliases = GetPersonExpeditionNameLookup(expo)
aliasdict={} aliasdict={}
@ -190,4 +192,5 @@ def aliases(request, year):
invert ={} 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})

15
parsers/people.py
View File

@ -134,16 +134,19 @@ def who_is_this(year,possibleid):
else: else:
return None return None
def known_foreigner(id): global foreign_friends
'''If this someone from ARGE or a known Austrian? Name has to be exact, no soft matching foreign_friends = ["P. Jeutter", "K. Jäger", "S. Steinberger", "R. Seebacher",
'''
friends = ["P. Jeutter", "K. Jäger", "S. Steinberger", "R. Seebacher",
"Dominik Jauch", "Fritz Mammel", "Marcus Scheuerman", "Dominik Jauch", "Fritz Mammel", "Marcus Scheuerman",
"Uli Schütz", "Wieland Scheuerle", "Uli Schütz", "Wieland Scheuerle",
"Kai Schwekend", "Regina Kaiser", "Thilo Müller","Wieland Scheuerle", "Kai Schwekend", "Regina Kaiser", "Thilo Müller","Wieland Scheuerle",
"Florian Gruner", "Helmut Stopka-Ebeler", "Aiko", "Mark Morgan"] "Florian Gruner", "Helmut Stopka-Ebeler", "Aiko", "Mark Morgan", "Arndt Karger"]
if id in friends: def known_foreigner(id):
'''If this someone from ARGE or a known Austrian? Name has to be exact, no soft matching
'''
global foreign_friends
if id in foreign_friends:
return True return True
else: else:
return False return False

10
templates/aliases.html
View File

@ -60,6 +60,16 @@ is used in the table above to construct possible unambiguous identifiers.
{% endfor %} {% endfor %}
</table> </table>
<p>And these are people known to us, who appear as survex *team members or in logbook participant lists, but are not expo members
and so are not managed or reported:
{% for p in foreign_friends %}
<tr>
<td><b>{{p}},</b></td>
</tr>
{% endfor %}
</table>
<p>Don't blame me [programmer] for this, it's just what you all have collectively done over the decades by using this absurd variety of short-form <p>Don't blame me [programmer] for this, it's just what you all have collectively done over the decades by using this absurd variety of short-form
name formats when you have entered the cave data. name formats when you have entered the cave data.
<p>The code that does this is in <var>troggle/parsers/people.py</var>. <p>The code that does this is in <var>troggle/parsers/people.py</var>.