Removed unused properties and moving

1 files changed, 8 insertions, 8 deletions

diff --git a/core/models/troggle.py b/core/models/troggle.py
index cc8e469..8fe01f7 100644
--- a/core/models/troggle.py
+++ b/core/models/troggle.py
@@ -154,6 +154,14 @@ class Person(TroggleModel):
     def last(self):
         return self.personexpedition_set.order_by("expedition")[0]
 
+    # moved from personexpedition
+    def name(self):
+        if self.nickname:
+            return f"{self.first_name} ({self.nickname}) {self.last_name}"
+        if self.last_name:
+            return f"{self.first_name} {self.last_name}"
+        return self.first_name
+
 
 class PersonExpedition(TroggleModel):
     """Person's attendance to one Expo"""
@@ -163,7 +171,6 @@ class PersonExpedition(TroggleModel):
     slugfield = models.SlugField(max_length=50, blank=True, null=True)  # 2022 to be used in future
 
     is_guest = models.BooleanField(default=False)
-    nickname = models.CharField(max_length=100, blank=True, null=True)  # removbe this
 
     class Meta:
         ordering = ("-expedition",)
@@ -172,13 +179,6 @@ class PersonExpedition(TroggleModel):
     def __str__(self):
         return f"{self.person}: ({self.expedition})"
 
-    # why is the below a function in personexpedition, rather than in person? - AC 14 Feb 09
-    def name(self):
-        if self.nickname:
-            return f"{self.person.first_name} ({self.nickname}) {self.person.last_name}"
-        if self.person.last_name:
-            return f"{self.person.first_name} {self.person.last_name}"
-        return self.person.first_name
 
     def get_absolute_url(self):
         return urljoin(