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

Compare commits

base: ynerant:ca7cf5987ce94dd9830c1bd9e4bf5b3d120c831b
Branches Tags
ynerant:dev
ynerant:main
ynerant:docs
..
compare: ynerant:dfc45dbc93e8cff025040a5b45fc9702816efcec
Branches Tags
ynerant:dev
ynerant:main
ynerant:docs

2 Commits
ca7cf5987c ... dfc45dbc93

Author SHA1 Message Date
Emmy D'Anello
dfc45dbc93
A team can't accept a problem that was previously *accepted* not the last purposed 
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
 2023-04-04 21:21:55 +02:00
Emmy D'Anello
31f5373652
Await the send notifications coroutines 
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
 2023-04-04 21:21:00 +02:00
1 changed files with 19 additions and 19 deletions
Show Stats Expand all files Collapse all files

38
draw/consumers.py
View File

@ -509,9 +509,9 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
{'type': 'draw.box_visibility', 'visible': True}) {'type': 'draw.box_visibility', 'visible': True})
# Notify the team that it can draw a problem # Notify the team that it can draw a problem
self.channel_layer.group_send(f"team-{tds[0].participation.team.trigram}", await self.channel_layer.group_send(f"team-{tds[0].participation.team.trigram}",
{'type': 'draw.notify', 'title': "À votre tour !", {'type': 'draw.notify', 'title': "À votre tour !",
'body': "C'est à vous de tirer un nouveau problème !"}) 'body': "C'est à vous de tirer un nouveau problème !"})
async def select_problem(self, **kwargs): async def select_problem(self, **kwargs):
""" """
@ -541,7 +541,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
if await TeamDraw.objects.filter(participation_id=td.participation_id, if await TeamDraw.objects.filter(participation_id=td.participation_id,
round__draw__tournament=self.tournament, round__draw__tournament=self.tournament,
round__number=1, round__number=1,
purposed=problem).aexists(): accepted=problem).aexists():
continue continue
# Check that the problem is not already chosen once (or twice for a 5-teams pool) # Check that the problem is not already chosen once (or twice for a 5-teams pool)
if await pool.teamdraw_set.filter(accepted=problem).acount() < (2 if pool.size == 5 else 1): if await pool.teamdraw_set.filter(accepted=problem).acount() < (2 if pool.size == 5 else 1):
@ -631,9 +631,9 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
{'type': 'draw.box_visibility', 'visible': True}) {'type': 'draw.box_visibility', 'visible': True})
# Notify the team that it can draw a problem # Notify the team that it can draw a problem
self.channel_layer.group_send(f"team-{new_trigram}", await self.channel_layer.group_send(f"team-{new_trigram}",
{'type': 'draw.notify', 'title': "À votre tour !", {'type': 'draw.notify', 'title': "À votre tour !",
'body': "C'est à vous de tirer un nouveau problème !"}) 'body': "C'est à vous de tirer un nouveau problème !"})
else: else:
# Pool is ended # Pool is ended
if pool.size == 5: if pool.size == 5:
@ -684,9 +684,9 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
await self.channel_layer.group_send(f"team-{td.participation.team.trigram}", await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
{'type': 'draw.dice_visibility', 'visible': True}) {'type': 'draw.dice_visibility', 'visible': True})
# Notify the team that it can draw a dice # Notify the team that it can draw a dice
self.channel_layer.group_send(f"team-{td.participation.team.trigram}", await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
{'type': 'draw.notify', 'title': "À votre tour !", {'type': 'draw.notify', 'title': "À votre tour !",
'body': "C'est à vous de lancer le dé !"}) 'body': "C'est à vous de lancer le dé !"})
await self.channel_layer.group_send(f"tournament-{self.tournament.id}", await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
{'type': 'draw.dice_visibility', 'visible': True}) {'type': 'draw.dice_visibility', 'visible': True})
@ -706,9 +706,9 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
{'type': 'draw.dice', 'team': participation.team.trigram, 'result': None}) {'type': 'draw.dice', 'team': participation.team.trigram, 'result': None})
# Notify the team that it can draw a dice # Notify the team that it can draw a dice
self.channel_layer.group_send(f"team-{participation.team.trigram}", await self.channel_layer.group_send(f"team-{participation.team.trigram}",
{'type': 'draw.notify', 'title': "À votre tour !", {'type': 'draw.notify', 'title': "À votre tour !",
'body': "C'est à vous de lancer le dé !"}) 'body': "C'est à vous de lancer le dé !"})
# Reorder dices # Reorder dices
await self.channel_layer.group_send(f"tournament-{self.tournament.id}", await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
@ -818,9 +818,9 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
{'type': 'draw.set_active', 'draw': self.tournament.draw}) {'type': 'draw.set_active', 'draw': self.tournament.draw})
# Notify the team that it can draw a problem # Notify the team that it can draw a problem
self.channel_layer.group_send(f"team-{new_trigram}", await self.channel_layer.group_send(f"team-{new_trigram}",
{'type': 'draw.notify', 'title': "À votre tour !", {'type': 'draw.notify', 'title': "À votre tour !",
'body': "C'est à vous de tirer un nouveau problème !"}) 'body': "C'est à vous de tirer un nouveau problème !"})
@ensure_orga @ensure_orga
@ -896,9 +896,9 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
{'type': 'draw.dice_visibility', 'visible': True}) {'type': 'draw.dice_visibility', 'visible': True})
# Notify the team that it can draw a problem # Notify the team that it can draw a problem
self.channel_layer.group_send(f"team-{td.participation.team.trigram}", await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
{'type': 'draw.notify', 'title': "À votre tour !", {'type': 'draw.notify', 'title': "À votre tour !",
'body': "C'est à vous de tirer un nouveau problème !"}) 'body': "C'est à vous de tirer un nouveau problème !"})
await self.channel_layer.group_send(f"volunteer-{self.tournament.id}", await self.channel_layer.group_send(f"volunteer-{self.tournament.id}",
{'type': 'draw.dice_visibility', 'visible': True}) {'type': 'draw.dice_visibility', 'visible': True})