SurvexPersonTeam renamed form survexpersonrole

core/admin.py

@@ -9,7 +9,7 @@ from troggle.core.models.survex import (
     SingleScan,
     SurvexBlock,
     SurvexFile,
-    SurvexPersonRole,
+    SurvexPersonTeam,
     SurvexStation,
 )
 from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition
@@ -38,7 +38,7 @@ class TroggleModelAdmin(admin.ModelAdmin):
 
 
 # class RoleInline(admin.TabularInline):
-    # model = SurvexPersonRole
+    # model = SurvexPersonTeam
     # extra = 4
 
 
@@ -118,7 +118,7 @@ admin.site.register(Entrance, EntranceAdmin)
 admin.site.register(DrawingFile, DrawingFileAdmin)
 admin.site.register(Expedition)
 admin.site.register(Person, PersonAdmin)
-admin.site.register(SurvexPersonRole)
+admin.site.register(SurvexPersonTeam)
 admin.site.register(SurvexFile, SurvexFileAdmin)
 admin.site.register(SurvexBlock, SurvexBlockAdmin)
 admin.site.register(SurvexStation, SurvexStationAdmin)

core/models/survex.py

@@ -280,8 +280,8 @@ class SurvexBlock(models.Model):
         return index
 
 
-class SurvexPersonRole(models.Model):
-    """The CASCADE means that if a SurvexBlock or a Person is deleted, then the SurvexPersonRole 
+class SurvexPersonTeam(models.Model):
+    """The CASCADE means that if a SurvexBlock or a Person is deleted, then the SurvexPersonTeam 
     is deleted too
     """
     survexblock = models.ForeignKey("SurvexBlock", on_delete=models.CASCADE, db_index=True)

core/models/troggle.py

@@ -205,5 +205,5 @@ class PersonExpedition(TroggleModel):
 
     def surveyedleglength(self):
         """Survey length for this person on all survex trips on this expedition"""
-        survexblocks = [personrole.survexblock for personrole in self.survexpersonrole_set.all()]
+        survexblocks = [personrole.survexblock for personrole in self.survexpersonteam_set.all()]
         return sum([survexblock.legslength for survexblock in set(survexblocks)])

core/views/logbooks.py

@@ -127,7 +127,7 @@ def expedition(request, expeditionname):
     personexpodays = []
     for personexpedition in expo.personexpedition_set.all().prefetch_related('person'):
         expotrips = allpersonlogentries.filter(personexpedition=personexpedition)  # lazy
-        expoblocks = blocks.filter(survexpersonrole__personexpedition=personexpedition)
+        expoblocks = blocks.filter(survexpersonteam__personexpedition=personexpedition)
 
         prow = []
 
@@ -204,7 +204,7 @@ def get_person_chronology(personexpedition):
         a = res.setdefault(personlogentry.logbook_entry.date, {})
         a.setdefault("personlogentries", []).append(personlogentry)
 
-    for personrole in personexpedition.survexpersonrole_set.all():
+    for personrole in personexpedition.survexpersonteam_set.all():
         if personrole.survexblock.date:  # avoid bad data from another bug
             a = res.setdefault(personrole.survexblock.date, {})
             a.setdefault("personroles", []).append(personrole.survexblock)

core/views/scans.py

@@ -8,7 +8,7 @@ from django.http import HttpResponse
 from django.shortcuts import render
 
 from troggle.core.models.caves import GetCaveLookup
-from troggle.core.models.survex import SingleScan, SurvexBlock, SurvexPersonRole
+from troggle.core.models.survex import SingleScan, SurvexBlock, SurvexPersonTeam
 from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition
 from troggle.core.models.wallets import Wallet
 from troggle.core.utils import DatabaseResetOngoing, current_expo
@@ -198,7 +198,7 @@ def walletslistperson(request, slug):
         manywallets = set()
         
         # Get the persons from the survexblocks on the survexfiles attached to the wallet directly
-        sps = SurvexPersonRole.objects.filter(person=p)
+        sps = SurvexPersonTeam.objects.filter(person=p)
         for sp in sps:
             w = sp.survexblock.scanswallet
             if w:

core/views/statistics.py

@@ -7,7 +7,7 @@ from django.shortcuts import render
 import troggle.settings as settings
 from troggle.core.models.caves import Cave, Entrance
 from troggle.core.models.logbooks import LogbookEntry
-from troggle.core.models.survex import SurvexPersonRole, SurvexStation
+from troggle.core.models.survex import SurvexPersonTeam, SurvexStation
 from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition
 from troggle.core.models.wallets import Wallet
 from troggle.core.utils import current_expo
@@ -72,7 +72,7 @@ def legs_and_lengths(expos):
                     # print(f"  WILD {sb.survexfile} {sb.date}")
                     wildlength += sb.legslength
                     sb.year = f"{expedition}"
-                    people = SurvexPersonRole.objects.filter(survexblock=sb)
+                    people = SurvexPersonTeam.objects.filter(survexblock=sb)
                     team = []
                     for p in people:
                         team.append(p.personname)

core/views/wallets_edit.py

@@ -16,7 +16,7 @@ from django.shortcuts import render
 import settings
 from troggle.core.models.caves import Cave
 from troggle.core.models.logbooks import LogbookEntry  # , PersonLogEntry
-from troggle.core.models.survex import SurvexBlock, SurvexFile, SurvexPersonRole, DrawingFile
+from troggle.core.models.survex import SurvexBlock, SurvexFile, SurvexPersonTeam, DrawingFile
 from troggle.core.models.troggle import DataIssue, Expedition, Person
 from troggle.core.models.wallets import YEAR_RANGE, Wallet, make_valid_date
 from troggle.core.utils import (
@@ -575,7 +575,7 @@ def walletedit(request, path=None):
                         blocknames.append(str(b.name) + "|" + str(b.title))
                     else:
                         blocknames.append(str(b.name))
-                    QSpeople = SurvexPersonRole.objects.filter(survexblock=b)
+                    QSpeople = SurvexPersonTeam.objects.filter(survexblock=b)
                     # print(f" - - {QSpeople=}")
                     for p in QSpeople:
                         # print(f" - - {p.personname} ")