From 03a5f5989e74ba50ff63ba599f98cd36dc0fa5d0 Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Fri, 30 Apr 2021 00:24:36 +0100 Subject: chipping away bug in personexpedition, remove role --- core/models/troggle.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'core/models/troggle.py') diff --git a/core/models/troggle.py b/core/models/troggle.py index 10c982c..f9558ff 100644 --- a/core/models/troggle.py +++ b/core/models/troggle.py @@ -184,12 +184,19 @@ class PersonExpedition(TroggleModel): nickname = models.CharField(max_length=100,blank=True, null=True) def GetPersonroles(self): + '''To do: excise the 'role' bit of this while retaining personrole + which is used in some later logic + + But apparently never used !? + + ''' res = [ ] for personrole in self.personrole_set.order_by('survexblock'): - if res and res[-1]['survexpath'] == personrole.survexblock.survexpath: - res[-1]['roles'] += ", " + str(personrole.role) - else: - res.append({'date':personrole.survexblock.date, 'survexpath':personrole.survexblock.survexpath, 'roles':str(personrole.role)}) + res.append({'date':personrole.survexblock.date, 'survexpath':personrole.survexblock.survexpath}) + # if res and res[-1]['survexpath'] == personrole.survexblock.survexpath: + # res[-1]['roles'] += ", " + str(personrole.role) + # else: + # res.append({'date':personrole.survexblock.date, 'survexpath':personrole.survexblock.survexpath, 'roles':str(personrole.role)}) return res class Meta: -- cgit v1.2.3