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

Don't manage pools of the second day with the dices of the first day since we consider the scores of the first day

Browse Source 
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
This commit is contained in:
Emmy D'Anello 2023-05-11 17:28:05 +02:00
parent feee5069b1
commit b38302449c
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
draw/consumers.py
View File

@ -430,6 +430,9 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
# This also determines the passage order, in the natural order this time. # This also determines the passage order, in the natural order this time.
# If there is a 5-teams pool, we force the last team to be in the first pool, # If there is a 5-teams pool, we force the last team to be in the first pool,
# which is this specific pool since they are ordered by decreasing size. # which is this specific pool since they are ordered by decreasing size.
# This is not true for the final tournament, which considers the scores of the
# first round.
if not self.tournament.final:
tds_copy = tds.copy() tds_copy = tds.copy()
round2 = await self.tournament.draw.round_set.filter(number=2).aget() round2 = await self.tournament.draw.round_set.filter(number=2).aget()
round2_pools = [p async for p in Pool.objects.filter(round__draw__tournament=self.tournament, round=round2) round2_pools = [p async for p in Pool.objects.filter(round__draw__tournament=self.tournament, round=round2)

2
draw/templates/draw/tournament_content.html
View File

@ -351,7 +351,7 @@
{% trans "Are you sure you want to abort this draw?" %} {% trans "Are you sure you want to abort this draw?" %}
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="submit" class="btn btn-danger" onclick="abortDraw({{ tournament.id }})">{% trans "Abort" %}</button> <button type="submit" class="btn btn-danger" data-bs-dismiss="modal" onclick="abortDraw({{ tournament.id }})">{% trans "Abort" %}</button>
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Close" %}</button> <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{% trans "Close" %}</button>
</div> </div>
</div> </div>