diff options
Diffstat (limited to 'core/models.py')
-rw-r--r-- | core/models.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/core/models.py b/core/models.py index 7ccef54..9900dd4 100644 --- a/core/models.py +++ b/core/models.py @@ -157,10 +157,15 @@ class Person(TroggleModel): for personexpedition in self.personexpedition_set.all(): if not personexpedition.is_guest: - print((personexpedition.expedition.year)) notability += Decimal(1) / (max_expo_val - int(personexpedition.expedition.year)) return notability + def legslength(self): + for personexpedition in self.personexpedition_set.all(): + if not personexpedition.is_guest: + length += personexpedition.legslength + return length + def bisnotable(self): return self.notability() > Decimal(1)/Decimal(3) @@ -178,7 +183,8 @@ 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) - + legslength = models.FloatField(null=True) + is_guest = models.BooleanField(default=False) COMMITTEE_CHOICES = ( ('leader','Expo leader'), @@ -218,7 +224,7 @@ class PersonExpedition(TroggleModel): return urljoin(settings.URL_ROOT, reverse('personexpedition',kwargs={'first_name':self.person.first_name,'last_name':self.person.last_name,'year':self.expedition.year})) def surveyedleglength(self): - survexblocks = [personrole.survexblock for personrole in self.personrole_set.all() ] + survexblocks = [personrole.survexblock for personrole in self.survexpersonrole_set.all() ] return sum([survexblock.legslength for survexblock in set(survexblocks)]) # would prefer to return actual person trips so we could link to first and last ones |