1
0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-06-24 18:20:33 +02:00

Update ODS note sheets

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
Emmy D'Anello
2024-03-24 20:05:07 +01:00
parent 3465da4c36
commit b6d54d27cd
3 changed files with 41 additions and 23 deletions

View File

@ -680,7 +680,7 @@ class Passage(models.Model):
@property
def average_defender(self) -> float:
return self.average_defender_writing + (2 - 0.5 * self.defender_penalties) * self.average_defender_oral
return self.average_defender_writing + (1.6 - 0.4 * self.defender_penalties) * self.average_defender_oral
@property
def average_opponent_writing(self) -> float:
@ -692,7 +692,7 @@ class Passage(models.Model):
@property
def average_opponent(self) -> float:
return self.average_opponent_writing + 2 * self.average_opponent_oral
return 0.9 * self.average_opponent_writing + 2 * self.average_opponent_oral
@property
def average_reporter_writing(self) -> float:
@ -704,7 +704,7 @@ class Passage(models.Model):
@property
def average_reporter(self) -> float:
return self.average_reporter_writing + self.average_reporter_oral
return 0.9 * self.average_reporter_writing + self.average_reporter_oral
@property
def average_observer(self) -> float: