Removed unused properties and moving

core/fixtures/expo_exped.json

@@ -5,8 +5,8 @@
 {"model": "core.personexpedition", "pk": 681, "fields": 
     {"new_since_parsing": false, "non_public": false, 
     "expedition": 44, 
-    "person": 250, "slugfield": null, "is_guest": false,  
-    "nickname": "Mike"}}, 
+    "person": 250, "slugfield": null, "is_guest": false 
+    }}, 
     
 {"model": "core.person", "pk": 250, "fields": 
     {"new_since_parsing": false, "non_public": false, 

core/models/survex.py

@@ -126,7 +126,6 @@ class SurvexBlock(models.Model):
     name = models.CharField(max_length=100)
     title = models.CharField(max_length=200)
     parent = models.ForeignKey("SurvexBlock", blank=True, null=True, on_delete=models.SET_NULL)
-    cave = models.ForeignKey("Cave", blank=True, null=True, on_delete=models.SET_NULL)
 
     date = models.DateField(blank=True, null=True)
     expedition = models.ForeignKey("Expedition", blank=True, null=True, on_delete=models.SET_NULL)
@@ -169,9 +168,8 @@ class SurvexPersonRole(models.Model):
     survexblock = models.ForeignKey("SurvexBlock", on_delete=models.CASCADE)
     # increasing levels of precision, Surely we only need survexblock and person now that we have no link to a logbook entry?
     personname = models.CharField(max_length=100)
-    person = models.ForeignKey("Person", blank=True, null=True, on_delete=models.SET_NULL)
+    person = models.ForeignKey("Person", blank=True, null=True, on_delete=models.SET_NULL) # not needed
     personexpedition = models.ForeignKey("PersonExpedition", blank=True, null=True, on_delete=models.SET_NULL)
-    # expeditionday       = models.ForeignKey("ExpeditionDay", null=True,on_delete=models.SET_NULL)
 
     def __str__(self):
         return str(self.personname) + " - " + str(self.survexblock)

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(