summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-10-09 00:17:53 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-10-09 00:17:53 +0300
commite6ca20b1eda8c6d074dd698c0e1c64b24e86a4c1 (patch)
treeb581d79018883159b1800aa93add869332281006 /core
parentb470ab66e2db18bbad4c9190635a2d8e0ae8eb81 (diff)
downloadtroggle-e6ca20b1eda8c6d074dd698c0e1c64b24e86a4c1.tar.gz
troggle-e6ca20b1eda8c6d074dd698c0e1c64b24e86a4c1.tar.bz2
troggle-e6ca20b1eda8c6d074dd698c0e1c64b24e86a4c1.zip
new report to make aliases visible
Diffstat (limited to 'core')
-rw-r--r--core/models/troggle.py3
-rw-r--r--core/views/statistics.py14
2 files changed, 16 insertions, 1 deletions
diff --git a/core/models/troggle.py b/core/models/troggle.py
index 84f1bc3..947ba21 100644
--- a/core/models/troggle.py
+++ b/core/models/troggle.py
@@ -122,6 +122,7 @@ class Person(TroggleModel):
first_name = models.CharField(max_length=100)
last_name = models.CharField(max_length=100)
fullname = models.CharField(max_length=200)
+ nickname = models.CharField(max_length=200)
is_vfho = models.BooleanField(help_text="VFHO is the Vereines f&uuml;r H&ouml;hlenkunde in Obersteier, a nearby Austrian caving club.", default=False)
mug_shot = models.CharField(max_length=100, blank=True,null=True)
blurb = models.TextField(blank=True,null=True)
@@ -170,7 +171,7 @@ class PersonExpedition(TroggleModel):
"""
expedition = models.ForeignKey(Expedition,on_delete=models.CASCADE)
person = models.ForeignKey(Person,on_delete=models.CASCADE)
- slugfield = models.SlugField(max_length=50,blank=True, null=True)
+ slugfield = models.SlugField(max_length=50,blank=True, null=True) # 2022 to be used in future
is_guest = models.BooleanField(default=False)
COMMITTEE_CHOICES = (
diff --git a/core/views/statistics.py b/core/views/statistics.py
index 15858d3..2e6684f 100644
--- a/core/views/statistics.py
+++ b/core/views/statistics.py
@@ -14,6 +14,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
import troggle.settings as settings
@@ -170,3 +171,16 @@ def eastings(request):
stations = SurvexStation.objects.all()
return render(request,'eastings.html', {'ents': ents, 'stations': stations})
+
+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 = Person.objects.all()
+
+ aliasdict = GetPersonExpeditionNameLookup(expo)
+
+ return render(request,'aliases.html', {'year': year, 'aliasdict': aliasdict,'personexpeditions': personexpeditions, 'persons': persons})