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

Compare commits

base: ynerant:21d4ac9d8d7689f9ae6898e7a1411176708c164f
Branches Tags
ynerant:dev
ynerant:main
ynerant:docs
...
compare: ynerant:dd45f77a5ed5e0c91be47ccdc80b5b3d661be7dc
Branches Tags
ynerant:dev
ynerant:main
ynerant:docs

2 Commits
21d4ac9d8d ... dd45f77a5e

Author SHA1 Message Date
Emmy D'Anello
dd45f77a5e
Fix draw 
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
 2024-06-07 23:47:05 +02:00
Emmy D'Anello
eacebf1aa6
Fix Texlive packages 
Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
 2024-06-07 23:46:51 +02:00
2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
Dockerfile
View File

@ -3,7 +3,7 @@ FROM python:3.12-alpine
ENV PYTHONUNBUFFERED 1
ENV DJANGO_ALLOW_ASYNC_UNSAFE 1
RUN apk add --no-cache gettext nginx gcc git libc-dev libffi-dev libxml2-dev libxslt-dev npm postgresql-dev libmagic texlive texmf-dist-fontsrecommended texmf-dist-langenglish texmf-dist-latexextra
RUN apk add --no-cache gettext nginx gcc git libc-dev libffi-dev libxml2-dev libxslt-dev npm postgresql-dev libmagic texlive texmf-dist-fontsrecommended texmf-dist-lang texmf-dist-latexextra
RUN apk add --no-cache bash

6
draw/consumers.py
View File

@ -531,8 +531,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
{'tid': self.tournament_id, 'type': 'draw.dice_visibility',
'visible': True})
# First send the second pool to have the good team order
async for r in self.tournament.draw.round_set.filter(number__gte=2).all():
# First send the pools of next rounds to have the good team order
async for next_round in self.tournament.draw.round_set.filter(number__gte=2).all():
await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
{'tid': self.tournament_id, 'type': 'draw.send_poules',
'round': r.number,
@ -541,7 +541,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
'letter': pool.get_letter_display(),
'teams': await pool.atrigrams(),
}
async for pool in r.pool_set.order_by('letter').all()
async for pool in next_round.pool_set.order_by('letter').all()
]})
await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
{'tid': self.tournament_id, 'type': 'draw.send_poules',