mirror of
https://gitlab.com/animath/si/plateforme.git
synced 2024-12-25 07:42:22 +00:00
Fix information display for participants in 5-teams pools
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
parent
adc4634f3e
commit
3e24e10780
@ -822,10 +822,9 @@ class Participation(models.Model):
|
|||||||
'content': content,
|
'content': content,
|
||||||
})
|
})
|
||||||
elif timezone.now() <= tournament.syntheses_first_phase_limit + timedelta(hours=2):
|
elif timezone.now() <= tournament.syntheses_first_phase_limit + timedelta(hours=2):
|
||||||
pool = self.pools.get(round=1, tournament=self.tournament)
|
defender_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=1, defender=self)
|
||||||
defender_passage = pool.passages.get(defender=self)
|
opponent_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=1, opponent=self)
|
||||||
opponent_passage = pool.passages.get(opponent=self)
|
reporter_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=1, reporter=self)
|
||||||
reporter_passage = pool.passages.get(reporter=self)
|
|
||||||
|
|
||||||
defender_text = _("<p>The solutions draw is ended. You can check the result on "
|
defender_text = _("<p>The solutions draw is ended. You can check the result on "
|
||||||
"<a href='{draw_url}'>this page</a>.</p>"
|
"<a href='{draw_url}'>this page</a>.</p>"
|
||||||
@ -868,9 +867,9 @@ class Participation(models.Model):
|
|||||||
})
|
})
|
||||||
elif timezone.now() <= tournament.syntheses_second_phase_limit + timedelta(hours=2):
|
elif timezone.now() <= tournament.syntheses_second_phase_limit + timedelta(hours=2):
|
||||||
pool = self.pools.get(round=2, tournament=tournament)
|
pool = self.pools.get(round=2, tournament=tournament)
|
||||||
defender_passage = pool.passages.get(defender=self)
|
defender_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=2, defender=self)
|
||||||
opponent_passage = pool.passages.get(opponent=self)
|
opponent_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=2, opponent=self)
|
||||||
reporter_passage = pool.passages.get(reporter=self)
|
reporter_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=2, reporter=self)
|
||||||
|
|
||||||
defender_text = _("<p>For the second round, you will defend "
|
defender_text = _("<p>For the second round, you will defend "
|
||||||
"<a href='{solution_url}'>your solution of the problem {problem}</a>.</p>")
|
"<a href='{solution_url}'>your solution of the problem {problem}</a>.</p>")
|
||||||
|
Loading…
Reference in New Issue
Block a user