ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-06-24 17:00:34 +02:00
Code Issues Releases Wiki Activity

Use separate fields for the two dices

Browse Source 
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
Emmy D'Anello
2023-03-28 21:56:18 +02:00
parent 7f7d921c53
commit cf8892ee1a
4 changed files with 311 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
draw/models.py
View File

@ -314,11 +314,18 @@ class TeamDraw(models.Model):
verbose_name=_("accepted problem"),
)
last_dice = models.PositiveSmallIntegerField(
passage_dice = models.PositiveSmallIntegerField(
choices=zip(range(1, 101), range(1, 101)),
null=True,
default=None,
verbose_name=_("last dice"),
verbose_name=_("passage dice"),
)
choice_dice = models.PositiveSmallIntegerField(
choices=zip(range(1, 101), range(1, 101)),
null=True,
default=None,
verbose_name=_("choice dice"),
)
purposed = models.PositiveSmallIntegerField(
@ -335,6 +342,10 @@ class TeamDraw(models.Model):
verbose_name=_('rejected problems'),
)
@property
def last_dice(self):
return self.passage_dice if self.round.draw.get_state() == 'DICE_SELECT_POULES' else self.choice_dice
@property
def penalty_int(self):
return max(0, len(self.rejected) - (settings.PROBLEM_COUNT - 5))