ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-07-03 18:02:50 +02:00
Code Issues Releases Wiki Activity

Display notes

Browse Source
This commit is contained in:
Yohann D'ANELLO
2021-01-14 18:43:53 +01:00
parent ef785a5eb8
commit a97541064e
5 changed files with 88 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/participation/models.py
View File

@ -383,39 +383,39 @@ class Passage(models.Model):
return sum(items) / len(items) if items else 0
@property
def average_defender_writing(self):
def average_defender_writing(self) -> int:
return self.avg(note.defender_writing for note in self.notes.all())
@property
def average_defender_oral(self):
def average_defender_oral(self) -> int:
return self.avg(note.defender_oral for note in self.notes.all())
@property
def average_defender(self):
return 2 * self.average_defender_writing + self.average_defender_oral
def average_defender(self) -> int:
return self.average_defender_writing + 2 * self.average_defender_oral
@property
def average_opponent_writing(self):
def average_opponent_writing(self) -> int:
return self.avg(note.opponent_writing for note in self.notes.all())
@property
def average_opponent_oral(self):
def average_opponent_oral(self) -> int:
return self.avg(note.opponent_oral for note in self.notes.all())
@property
def average_opponent(self):
return 2 * self.average_opponent_writing + self.average_opponent_oral
def average_opponent(self) -> int:
return self.average_opponent_writing + 2 * self.average_opponent_oral
@property
def average_reporter_writing(self):
def average_reporter_writing(self) -> int:
return self.avg(note.reporter_writing for note in self.notes.all())
@property
def average_reporter_oral(self):
def average_reporter_oral(self) -> int:
return self.avg(note.reporter_oral for note in self.notes.all())
@property
def average_reporter(self):
def average_reporter(self) -> int:
return self.average_reporter_writing + self.average_reporter_oral
def average(self, participation):
@ -588,6 +588,10 @@ class Note(models.Model):
def __str__(self):
return _("Notes of {jury} for {passage}").format(jury=self.jury, passage=self.passage)
def __bool__(self):
return any((self.defender_writing, self.defender_oral, self.opponent_writing, self.opponent_oral,
self.reporter_writing, self.reporter_oral))
class Meta:
verbose_name = _("note")
verbose_name_plural = _("notes")