claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced total_result* fields by a total_result property

Browse source
This commit is contained in:
Claude Paroz 2018-02-14 18:41:57 +01:00
parent b46c377919
commit 5ef320455e
4 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
candidats/models.py
View file

@ -109,8 +109,6 @@ class Candidate(models.Model):
examination_result = models.PositiveSmallIntegerField('Points examen', blank=True, null=True)
interview_result = models.PositiveSmallIntegerField('Points entretien prof.', blank=True, null=True)
file_result = models.PositiveSmallIntegerField('Points dossier', blank=True, null=True)
total_result_points = models.PositiveSmallIntegerField('Total points', blank=True, null=True)
total_result_mark = models.PositiveSmallIntegerField('Note finale', blank=True, null=True)
inscr_other_school = models.CharField("Inscr. autre école", max_length=30, blank=True)
certif_of_800_childhood = models.BooleanField("Attest. 800h. enfance", default=False)
@ -152,6 +150,10 @@ class Candidate(models.Model):
else:
return '{0}, option «{1}»'.format(self.get_section_display(), self.get_option_display())
@property
def total_result(self):
return (self.examination_result or 0) + (self.interview_result or 0) + (self.file_result or 0)
def get_ok(self, fieldname):
return 'OK' if getattr(self, fieldname) is True else 'NON'