Manage channels permissions

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>

.gitlab-ci.yml

@@ -2,24 +2,24 @@ stages:
   - test
   - quality-assurance
 
+py311:
+  stage: test
+  image: python:3.11-alpine
+  before_script:
+    - apk add --no-cache libmagic
+    - apk add --no-cache gettext git  # Useful for django-haystack, remove when the newer versions are in PyPI
+    - pip install tox --no-cache-dir
+  script: tox -e py311
+
 py312:
   stage: test
   image: python:3.12-alpine
   before_script:
     - apk add --no-cache libmagic
-    - apk add --no-cache gettext
+    - apk add --no-cache gettext git  # Useful for django-haystack, remove when the newer versions are in PyPI
     - pip install tox --no-cache-dir
   script: tox -e py312
 
-py313:
-  stage: test
-  image: python:3.13-alpine
-  before_script:
-    - apk add --no-cache libmagic
-    - apk add --no-cache gettext
-    - pip install tox --no-cache-dir
-  script: tox -e py313
-
 linters:
   stage: quality-assurance
   image: python:3-alpine

Dockerfile

@@ -1,15 +1,12 @@
-FROM python:3.13-alpine
+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 libpq-dev libxml2-dev libxslt-dev \
-    npm libmagic texlive texmf-dist-fontsrecommended texmf-dist-lang texmf-dist-latexextra
+RUN apk add --no-cache gettext nginx gcc git libc-dev libffi-dev libxml2-dev libxslt-dev postgresql-dev libmagic texlive texmf-dist-latexextra
 
 RUN apk add --no-cache bash
 
-RUN npm install -g yuglify
-
 RUN mkdir /code /code/docs
 WORKDIR /code
 COPY requirements.txt /code/requirements.txt

chat/admin.py

@@ -8,21 +8,15 @@ from .models import Channel, Message
 
 @admin.register(Channel)
 class ChannelAdmin(admin.ModelAdmin):
-    """
-    Modèle d'administration des canaux de chat.
-    """
-    list_display = ('name', 'category', 'read_access', 'write_access', 'tournament', 'private',)
-    list_filter = ('category', 'read_access', 'write_access', 'tournament', 'private',)
+    list_display = ('name', 'read_access', 'write_access', 'tournament', 'pool', 'team', 'private',)
+    list_filter = ('read_access', 'write_access', 'tournament', 'private',)
     search_fields = ('name', 'tournament__name', 'team__name', 'team__trigram',)
     autocomplete_fields = ('tournament', 'pool', 'team', 'invited', )
 
 
 @admin.register(Message)
 class MessageAdmin(admin.ModelAdmin):
-    """
-    Modèle d'administration des messages de chat.
-    """
     list_display = ('channel', 'author', 'created_at', 'updated_at', 'content',)
     list_filter = ('channel', 'created_at', 'updated_at',)
     search_fields = ('author__username', 'author__first_name', 'author__last_name', 'content',)
-    autocomplete_fields = ('channel', 'author', 'users_read',)
+    autocomplete_fields = ('channel', 'author',)

chat/apps.py

@@ -2,15 +2,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.apps import AppConfig
-from django.db.models.signals import post_save
 
 
 class ChatConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
     name = "chat"
-
-    def ready(self):
-        from chat import signals
-        post_save.connect(signals.create_tournament_channels, "participation.Tournament")
-        post_save.connect(signals.create_pool_channels, "participation.Pool")
-        post_save.connect(signals.create_team_channel, "participation.Participation")

chat/consumers.py

@@ -3,368 +3,73 @@
 
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 from django.contrib.auth.models import User
-from django.db.models import Count, F, Q
 from registration.models import Registration
 
-from .models import Channel, Message
+from .models import Channel
 
 
 class ChatConsumer(AsyncJsonWebsocketConsumer):
     """
-    Ce consommateur gère les connexions WebSocket pour le chat.
+    This consumer manages the websocket of the chat interface.
     """
     async def connect(self) -> None:
         """
-        Cette fonction est appelée lorsqu'un nouveau websocket tente de se connecter au serveur.
-        On n'accept que si c'est un⋅e utilisateur⋅rice connecté⋅e.
+        This function is called when a new websocket is trying to connect to the server.
+        We accept only if this is a user of a team of the associated tournament, or a volunteer
+        of the tournament.
         """
         if '_fake_user_id' in self.scope['session']:
-            # Dans le cas d'une impersonification, on charge l'utilisateur⋅rice concerné
             self.scope['user'] = await User.objects.aget(pk=self.scope['session']['_fake_user_id'])
 
-        # Récupération de l'utilisateur⋅rice courant⋅e
+        # Fetch the registration of the current user
         user = self.scope['user']
         if user.is_anonymous:
-            # L'utilisateur⋅rice n'est pas connecté⋅e
+            # User is not authenticated
             await self.close()
             return
 
         reg = await Registration.objects.aget(user_id=user.id)
         self.registration = reg
 
-        # Acceptation de la connexion
+        # Accept the connection
         await self.accept()
 
-        # Récupération des canaux accessibles en lecture et/ou en écriture
-        self.read_channels = await Channel.get_accessible_channels(user, 'read')
-        self.write_channels = await Channel.get_accessible_channels(user, 'write')
-
-        # Abonnement aux canaux de diffusion Websocket pour les différents canaux de chat
-        async for channel in self.read_channels.all():
-            await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name)
-        # Abonnement à un canal de diffusion Websocket personnel, utile pour s'adresser à une unique personne
-        await self.channel_layer.group_add(f"user-{user.id}", self.channel_name)
-
-    async def disconnect(self, close_code: int) -> None:
+    async def disconnect(self, close_code) -> None:
         """
-        Cette fonction est appelée lorsqu'un websocket se déconnecte du serveur.
-        :param close_code: Le code d'erreur.
+        Called when the websocket got disconnected, for any reason.
+        :param close_code: The error code.
         """
         if self.scope['user'].is_anonymous:
-            # L'utilisateur⋅rice n'était pas connecté⋅e, on ne fait rien
+            # User is not authenticated
             return
 
-        async for channel in self.read_channels.all():
-            # Désabonnement des canaux de diffusion Websocket liés aux canaux de chat
-            await self.channel_layer.group_discard(f"chat-{channel.id}", self.channel_name)
-        # Désabonnement du canal de diffusion Websocket personnel
-        await self.channel_layer.group_discard(f"user-{self.scope['user'].id}", self.channel_name)
-
-    async def receive_json(self, content: dict, **kwargs) -> None:
+    async def receive_json(self, content, **kwargs):
         """
-        Appelée lorsque le client nous envoie des données, décodées depuis du JSON.
-        :param content: Les données envoyées par le client, décodées depuis du JSON. Doit contenir un champ 'type'.
+        Called when the client sends us some data, parsed as JSON.
+        :param content: The sent data, decoded from JSON text. Must content a `type` field.
         """
         match content['type']:
             case 'fetch_channels':
-                # Demande de récupération des canaux disponibles
                 await self.fetch_channels()
-            case 'send_message':
-                # Envoi d'un message dans un canal
-                await self.receive_message(**content)
-            case 'edit_message':
-                # Modification d'un message
-                await self.edit_message(**content)
-            case 'delete_message':
-                # Suppression d'un message
-                await self.delete_message(**content)
-            case 'fetch_messages':
-                # Récupération des messages d'un canal (ou d'une partie)
-                await self.fetch_messages(**content)
-            case 'mark_read':
-                # Marquage de messages comme lus
-                await self.mark_read(**content)
-            case 'start_private_chat':
-                # Démarrage d'une conversation privée avec un⋅e autre utilisateur⋅rice
-                await self.start_private_chat(**content)
             case unknown:
-                # Type inconnu, on soulève une erreur
-                raise ValueError(f"Unknown message type: {unknown}")
+                print("Unknown message type:", unknown)
 
     async def fetch_channels(self) -> None:
-        """
-        L'utilisateur⋅rice demande à récupérer la liste des canaux disponibles.
-        On lui renvoie alors la liste des canaux qui lui sont accessibles en lecture,
-        en fournissant nom, catégorie, permission de lecture et nombre de messages non lus.
-        """
         user = self.scope['user']
 
-        # Récupération des canaux accessibles en lecture, avec le nombre de messages non lus
-        channels = self.read_channels.prefetch_related('invited') \
-            .annotate(total_messages=Count('messages', distinct=True)) \
-            .annotate(read_messages=Count('messages', filter=Q(messages__users_read=user), distinct=True)) \
-            .annotate(unread_messages=F('total_messages') - F('read_messages')).all()
-
-        # Envoi de la liste des canaux
+        read_channels = await Channel.get_accessible_channels(user, 'read')
+        write_channels = await Channel.get_accessible_channels(user, 'write')
+        print([channel async for channel in write_channels.all()])
         message = {
             'type': 'fetch_channels',
             'channels': [
                 {
                     'id': channel.id,
-                    'name': channel.get_visible_name(user),
-                    'category': channel.category,
+                    'name': channel.name,
                     'read_access': True,
-                    'write_access': await self.write_channels.acontains(channel),
-                    'unread_messages': channel.unread_messages,
+                    'write_access': await write_channels.acontains(channel),
                 }
-                async for channel in channels
+                async for channel in read_channels.all()
             ]
         }
         await self.send_json(message)
-
-    async def receive_message(self, channel_id: int, content: str, **kwargs) -> None:
-        """
-        L'utilisateur⋅ice a envoyé un message dans un canal.
-        On vérifie d'abord la permission d'écriture, puis on crée le message et on l'envoie à tou⋅tes les
-        utilisateur⋅ices abonné⋅es au canal.
-
-        :param channel_id: Identifiant du canal où envoyer le message.
-        :param content: Contenu du message.
-        """
-        user = self.scope['user']
-
-        # Récupération du canal
-        channel = await Channel.objects.prefetch_related('tournament__pools__juries', 'pool', 'team', 'invited') \
-            .aget(id=channel_id)
-        if not await self.write_channels.acontains(channel):
-            # L'utilisateur⋅ice n'a pas la permission d'écrire dans ce canal, on abandonne
-            return
-
-        # Création du message
-        message = await Message.objects.acreate(
-            author=user,
-            channel=channel,
-            content=content,
-        )
-
-        # Envoi du message à toutes les personnes connectées sur le canal
-        await self.channel_layer.group_send(f'chat-{channel.id}', {
-            'type': 'chat.send_message',
-            'id': message.id,
-            'channel_id': channel.id,
-            'timestamp': message.created_at.isoformat(),
-            'author_id': message.author_id,
-            'author': await message.aget_author_name(),
-            'content': message.content,
-        })
-
-    async def edit_message(self, message_id: int, content: str, **kwargs) -> None:
-        """
-        L'utilisateur⋅ice a modifié un message.
-        On vérifie d'abord que l'utilisateur⋅ice a le droit de modifier le message, puis on modifie le message
-        et on envoie la modification à tou⋅tes les utilisateur⋅ices abonné⋅es au canal.
-
-        :param message_id: Identifiant du message à modifier.
-        :param content: Nouveau contenu du message.
-        """
-        user = self.scope['user']
-
-        # Récupération du message
-        message = await Message.objects.aget(id=message_id)
-        if user.id != message.author_id and not user.is_superuser:
-            # Seul⋅e l'auteur⋅ice du message ou un⋅e admin peut modifier un message
-            return
-
-        # Modification du contenu du message
-        message.content = content
-        await message.asave()
-
-        # Envoi de la modification à tou⋅tes les personnes connectées sur le canal
-        await self.channel_layer.group_send(f'chat-{message.channel_id}', {
-            'type': 'chat.edit_message',
-            'id': message_id,
-            'channel_id': message.channel_id,
-            'content': content,
-        })
-
-    async def delete_message(self, message_id: int, **kwargs) -> None:
-        """
-        L'utilisateur⋅ice a supprimé un message.
-        On vérifie d'abord que l'utilisateur⋅ice a le droit de supprimer le message, puis on supprime le message
-        et on envoie la suppression à tou⋅tes les utilisateur⋅ices abonné⋅es au canal.
-
-        :param message_id: Identifiant du message à supprimer.
-        """
-        user = self.scope['user']
-
-        # Récupération du message
-        message = await Message.objects.aget(id=message_id)
-        if user.id != message.author_id and not user.is_superuser:
-            return
-
-        # Suppression effective du message
-        await message.adelete()
-
-        # Envoi de la suppression à tou⋅tes les personnes connectées sur le canal
-        await self.channel_layer.group_send(f'chat-{message.channel_id}', {
-            'type': 'chat.delete_message',
-            'id': message_id,
-            'channel_id': message.channel_id,
-        })
-
-    async def fetch_messages(self, channel_id: int, offset: int = 0, limit: int = 50, **_kwargs) -> None:
-        """
-        L'utilisateur⋅ice demande à récupérer les messages d'un canal.
-        On vérifie la permission de lecture, puis on renvoie les messages demandés.
-
-        :param channel_id: Identifiant du canal où récupérer les messages.
-        :param offset: Décalage pour la pagination, à partir du dernier message.
-                       Par défaut : 0, on commence au dernier message.
-        :param limit: Nombre de messages à récupérer. Par défaut, on récupère 50 messages.
-        """
-        # Récupération du canal
-        channel = await Channel.objects.aget(id=channel_id)
-        if not await self.read_channels.acontains(channel):
-            # L'utilisateur⋅rice n'a pas la permission de lire ce canal, on abandonne
-            return
-
-        limit = min(limit, 200)  # On limite le nombre de messages à 200 maximum
-
-        # Récupération des messages, avec un indicateur de lecture pour l'utilisateur⋅ice courant⋅e
-        messages = Message.objects \
-            .filter(channel=channel) \
-            .annotate(read=Count('users_read', filter=Q(users_read=self.scope['user']))) \
-            .order_by('-created_at')[offset:offset + limit].all()
-
-        # Envoi de la liste des messages, en les renvoyant dans l'ordre chronologique
-        await self.send_json({
-            'type': 'fetch_messages',
-            'channel_id': channel_id,
-            'messages': list(reversed([
-                {
-                    'id': message.id,
-                    'timestamp': message.created_at.isoformat(),
-                    'author_id': message.author_id,
-                    'author': await message.aget_author_name(),
-                    'content': message.content,
-                    'read': message.read > 0,
-                }
-                async for message in messages
-            ]))
-        })
-
-    async def mark_read(self, message_ids: list[int], **_kwargs) -> None:
-        """
-        L'utilisateur⋅ice marque des messages comme lus, après les avoir affichés à l'écran.
-
-        :param message_ids: Liste des identifiants des messages qu'il faut marquer comme lus.
-        """
-        # Récupération des messages à marquer comme lus
-        messages = Message.objects.filter(id__in=message_ids)
-        async for message in messages.all():
-            # Ajout de l'utilisateur⋅ice courant⋅e à la liste des personnes ayant lu le message
-            await message.users_read.aadd(self.scope['user'])
-
-        # Actualisation du nombre de messages non lus par canal
-        unread_messages_by_channel = Message.objects.exclude(users_read=self.scope['user']).values('channel_id') \
-            .annotate(unread_messages=Count('channel_id'))
-
-        # Envoi des identifiants des messages non lus et du nombre de messages non lus par canal, actualisés
-        await self.send_json({
-            'type': 'mark_read',
-            'messages': [{'id': message.id, 'channel_id': message.channel_id} async for message in messages.all()],
-            'unread_messages': {group['channel_id']: group['unread_messages']
-                                async for group in unread_messages_by_channel.all()},
-        })
-
-    async def start_private_chat(self, user_id: int, **kwargs) -> None:
-        """
-        L'utilisateur⋅ice souhaite démarrer une conversation privée avec un⋅e autre utilisateur⋅ice.
-        Pour cela, on récupère le salon privé s'il existe, sinon on en crée un.
-        Dans le cas d'une création, les deux personnes sont transférées immédiatement dans ce nouveau canal.
-
-        :param user_id: L'utilisateur⋅rice avec qui démarrer la conversation privée.
-        """
-        user = self.scope['user']
-        # Récupération de l'autre utilisateur⋅ice avec qui démarrer la conversation
-        other_user = await User.objects.aget(id=user_id)
-
-        # Vérification de l'existence d'un salon privé entre les deux personnes
-        channel_qs = Channel.objects.filter(private=True).filter(invited=user).filter(invited=other_user)
-        if not await channel_qs.aexists():
-            # Le salon privé n'existe pas, on le crée alors
-            channel = await Channel.objects.acreate(
-                name=f"{user.first_name} {user.last_name}, {other_user.first_name} {other_user.last_name}",
-                category=Channel.ChannelCategory.PRIVATE,
-                private=True,
-            )
-            await channel.invited.aset([user, other_user])
-
-            # On s'ajoute au salon privé
-            await self.channel_layer.group_add(f"chat-{channel.id}", self.channel_name)
-
-            if user != other_user:
-                # On transfère l'autre utilisateur⋅ice dans le salon privé
-                await self.channel_layer.group_send(f"user-{other_user.id}", {
-                    'type': 'chat.start_private_chat',
-                    'channel': {
-                        'id': channel.id,
-                        'name': f"{user.first_name} {user.last_name}",
-                        'category': channel.category,
-                        'read_access': True,
-                        'write_access': True,
-                    }
-                })
-        else:
-            # Récupération dudit salon privé
-            channel = await channel_qs.afirst()
-
-        # Invitation de l'autre utilisateur⋅rice à rejoindre le salon privé
-        await self.channel_layer.group_send(f"user-{user.id}", {
-            'type': 'chat.start_private_chat',
-            'channel': {
-                'id': channel.id,
-                'name': f"{other_user.first_name} {other_user.last_name}",
-                'category': channel.category,
-                'read_access': True,
-                'write_access': True,
-            }
-        })
-
-    async def chat_send_message(self, message) -> None:
-        """
-        Envoi d'un message à tou⋅tes les personnes connectées sur un canal.
-        :param message: Dictionnaire contenant les informations du message à envoyer,
-                contenant l'identifiant du message "id", l'identifiant du canal "channel_id",
-                l'heure de création "timestamp", l'identifiant de l'auteur "author_id",
-                le nom de l'auteur "author" et le contenu du message "content".
-        """
-        await self.send_json({'type': 'send_message', 'id': message['id'], 'channel_id': message['channel_id'],
-                              'timestamp': message['timestamp'], 'author': message['author'],
-                              'content': message['content']})
-
-    async def chat_edit_message(self, message) -> None:
-        """
-        Envoi d'une modification de message à tou⋅tes les personnes connectées sur un canal.
-        :param message: Dictionnaire contenant les informations du message à modifier,
-                contenant l'identifiant du message "id", l'identifiant du canal "channel_id"
-                et le nouveau contenu "content".
-        """
-        await self.send_json({'type': 'edit_message', 'id': message['id'], 'channel_id': message['channel_id'],
-                              'content': message['content']})
-
-    async def chat_delete_message(self, message) -> None:
-        """
-        Envoi d'une suppression de message à tou⋅tes les personnes connectées sur un canal.
-        :param message: Dictionnaire contenant les informations du message à supprimer,
-                contenant l'identifiant du message "id" et l'identifiant du canal "channel_id".
-        """
-        await self.send_json({'type': 'delete_message', 'id': message['id'], 'channel_id': message['channel_id']})
-
-    async def chat_start_private_chat(self, message) -> None:
-        """
-        Envoi d'un message pour démarrer une conversation privée à une personne connectée.
-        :param message: Dictionnaire contenant les informations du nouveau canal privé.
-        """
-        await self.channel_layer.group_add(f"chat-{message['channel']['id']}", self.channel_name)
-        await self.send_json({'type': 'start_private_chat', 'channel': message['channel']})

chat/management/commands/create_chat_channels.py

@@ -1,167 +0,0 @@
-# Copyright (C) 2024 by Animath
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.conf import settings
-from django.core.management import BaseCommand
-from django.utils.translation import activate
-from participation.models import Team, Tournament
-from tfjm.permissions import PermissionType
-
-from ...models import Channel
-
-
-class Command(BaseCommand):
-    """
-    Cette commande permet de créer les canaux de chat pour les tournois et les équipes.
-    Différents canaux sont créés pour chaque tournoi, puis pour chaque poule.
-    Enfin, un canal de communication par équipe est créé.
-    """
-    help = "Create chat channels for tournaments and teams."
-
-    def handle(self, *args, **kwargs):
-        activate(settings.PREFERRED_LANGUAGE_CODE)
-
-        # Création de canaux généraux, d'annonces, d'aide jurys et orgas, etc.
-        # Le canal d'annonces est accessibles à tous⋅tes, mais seul⋅es les admins peuvent y écrire.
-        Channel.objects.update_or_create(
-            name="Annonces",
-            defaults=dict(
-                category=Channel.ChannelCategory.GENERAL,
-                read_access=PermissionType.AUTHENTICATED,
-                write_access=PermissionType.ADMIN,
-            ),
-        )
-
-        # Un canal d'aide pour les bénévoles est dédié.
-        Channel.objects.update_or_create(
-            name="Aide jurys et orgas",
-            defaults=dict(
-                category=Channel.ChannelCategory.GENERAL,
-                read_access=PermissionType.VOLUNTEER,
-                write_access=PermissionType.VOLUNTEER,
-            ),
-        )
-
-        # Un canal de discussion générale en lien avec le tournoi est accessible librement.
-        Channel.objects.update_or_create(
-            name="Général",
-            defaults=dict(
-                category=Channel.ChannelCategory.GENERAL,
-                read_access=PermissionType.AUTHENTICATED,
-                write_access=PermissionType.AUTHENTICATED,
-            ),
-        )
-
-        # Un canal de discussion entre participant⋅es est accessible à tous⋅tes,
-        # dont l'objectif est de faciliter la mise en relation entre élèves afin de constituer une équipe.
-        Channel.objects.update_or_create(
-            name="Je cherche une équipe",
-            defaults=dict(
-                category=Channel.ChannelCategory.GENERAL,
-                read_access=PermissionType.AUTHENTICATED,
-                write_access=PermissionType.AUTHENTICATED,
-            ),
-        )
-
-        # Un canal de discussion libre est accessible pour tous⋅tes.
-        Channel.objects.update_or_create(
-            name="Détente",
-            defaults=dict(
-                category=Channel.ChannelCategory.GENERAL,
-                read_access=PermissionType.AUTHENTICATED,
-                write_access=PermissionType.AUTHENTICATED,
-            ),
-        )
-
-        for tournament in Tournament.objects.all():
-            # Pour chaque tournoi, on crée un canal d'annonces, un canal général et un de détente,
-            # qui sont comme les canaux généraux du même nom mais réservés aux membres du tournoi concerné.
-            # Les membres d'un tournoi sont les organisateur⋅rices, les juré⋅es d'une poule du tournoi
-            # ainsi que les membres d'une équipe inscrite au tournoi et qui est validée.
-            Channel.objects.update_or_create(
-                name=f"{tournament.name} - Annonces",
-                defaults=dict(
-                    category=Channel.ChannelCategory.TOURNAMENT,
-                    read_access=PermissionType.TOURNAMENT_MEMBER,
-                    write_access=PermissionType.TOURNAMENT_ORGANIZER,
-                    tournament=tournament,
-                ),
-            )
-
-            Channel.objects.update_or_create(
-                name=f"{tournament.name} - Général",
-                defaults=dict(
-                    category=Channel.ChannelCategory.TOURNAMENT,
-                    read_access=PermissionType.TOURNAMENT_MEMBER,
-                    write_access=PermissionType.TOURNAMENT_MEMBER,
-                    tournament=tournament,
-                ),
-            )
-
-            Channel.objects.update_or_create(
-                name=f"{tournament.name} - Détente",
-                defaults=dict(
-                    category=Channel.ChannelCategory.TOURNAMENT,
-                    read_access=PermissionType.TOURNAMENT_MEMBER,
-                    write_access=PermissionType.TOURNAMENT_MEMBER,
-                    tournament=tournament,
-                ),
-            )
-
-            # Un canal réservé à tous⋅tes les juré⋅es du tournoi est créé.
-            Channel.objects.update_or_create(
-                name=f"{tournament.name} - Juré⋅es",
-                defaults=dict(
-                    category=Channel.ChannelCategory.TOURNAMENT,
-                    read_access=PermissionType.JURY_MEMBER,
-                    write_access=PermissionType.JURY_MEMBER,
-                    tournament=tournament,
-                ),
-            )
-
-            if tournament.remote:
-                # Dans le cadre d'un tournoi distanciel, un canal pour les président⋅es de jury est créé.
-                Channel.objects.update_or_create(
-                    name=f"{tournament.name} - Président⋅es de jury",
-                    defaults=dict(
-                        category=Channel.ChannelCategory.TOURNAMENT,
-                        read_access=PermissionType.TOURNAMENT_JURY_PRESIDENT,
-                        write_access=PermissionType.TOURNAMENT_JURY_PRESIDENT,
-                        tournament=tournament,
-                    ),
-                )
-
-                for pool in tournament.pools.all():
-                    # Pour chaque poule d'un tournoi distanciel, on crée un canal pour les membres de la poule
-                    # (équipes et juré⋅es), et un pour les juré⋅es uniquement.
-                    Channel.objects.update_or_create(
-                        name=f"{tournament.name} - Poule {pool.short_name}",
-                        defaults=dict(
-                            category=Channel.ChannelCategory.TOURNAMENT,
-                            read_access=PermissionType.POOL_MEMBER,
-                            write_access=PermissionType.POOL_MEMBER,
-                            pool=pool,
-                        ),
-                    )
-
-                    Channel.objects.update_or_create(
-                        name=f"{tournament.name} - Poule {pool.short_name} - Jury",
-                        defaults=dict(
-                            category=Channel.ChannelCategory.TOURNAMENT,
-                            read_access=PermissionType.JURY_MEMBER,
-                            write_access=PermissionType.JURY_MEMBER,
-                            pool=pool,
-                        ),
-                    )
-
-        for team in Team.objects.filter(participation__valid=True).all():
-            # Chaque équipe validée a le droit à son canal de communication.
-            Channel.objects.update_or_create(
-                name=f"Équipe {team.trigram}",
-                defaults=dict(
-                    category=Channel.ChannelCategory.TEAM,
-                    read_access=PermissionType.TEAM_MEMBER,
-                    write_access=PermissionType.TEAM_MEMBER,
-                    team=team,
-                ),
-            )

chat/migrations/0002_alter_channel_options_channel_category.py

@@ -1,36 +0,0 @@
-# Generated by Django 5.0.3 on 2024-04-28 11:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("chat", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="channel",
-            options={
-                "ordering": ("category", "name"),
-                "verbose_name": "channel",
-                "verbose_name_plural": "channels",
-            },
-        ),
-        migrations.AddField(
-            model_name="channel",
-            name="category",
-            field=models.CharField(
-                choices=[
-                    ("general", "General channels"),
-                    ("tournament", "Tournament channels"),
-                    ("team", "Team channels"),
-                    ("private", "Private channels"),
-                ],
-                default="general",
-                max_length=255,
-                verbose_name="category",
-            ),
-        ),
-    ]

chat/migrations/0003_message_users_read.py

@@ -1,26 +0,0 @@
-# Generated by Django 5.0.3 on 2024-04-28 18:52
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("chat", "0002_alter_channel_options_channel_category"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="message",
-            name="users_read",
-            field=models.ManyToManyField(
-                blank=True,
-                help_text="Users who have read the message.",
-                related_name="+",
-                to=settings.AUTH_USER_MODEL,
-                verbose_name="users read",
-            ),
-        ),
-    ]

chat/migrations/0004_alter_channel_category_alter_channel_name_and_more.py

@@ -1,94 +0,0 @@
-# Generated by Django 5.0.6 on 2024-05-26 20:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("chat", "0003_message_users_read"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="channel",
-            name="category",
-            field=models.CharField(
-                choices=[
-                    ("general", "General channels"),
-                    ("tournament", "Tournament channels"),
-                    ("team", "Team channels"),
-                    ("private", "Private channels"),
-                ],
-                default="general",
-                help_text="Category of the channel, between general channels, tournament-specific channels, team channels or private channels. Will be used to sort channels in the channel list.",
-                max_length=255,
-                verbose_name="category",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="channel",
-            name="name",
-            field=models.CharField(
-                help_text="Visible name of the channel.",
-                max_length=255,
-                verbose_name="name",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="channel",
-            name="read_access",
-            field=models.CharField(
-                choices=[
-                    ("anonymous", "Everyone, including anonymous users"),
-                    ("authenticated", "Authenticated users"),
-                    ("volunteer", "All volunteers"),
-                    ("tournament", "All members of a given tournament"),
-                    ("organizer", "Tournament organizers only"),
-                    (
-                        "jury_president",
-                        "Tournament organizers and jury presidents of the tournament",
-                    ),
-                    ("jury", "Jury members of the pool"),
-                    ("pool", "Jury members and participants of the pool"),
-                    (
-                        "team",
-                        "Members of the team and organizers of concerned tournaments",
-                    ),
-                    ("private", "Private, reserved to explicit authorized users"),
-                    ("admin", "Admin users"),
-                ],
-                help_text="Permission type that is required to read the messages of the channels.",
-                max_length=16,
-                verbose_name="read permission",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="channel",
-            name="write_access",
-            field=models.CharField(
-                choices=[
-                    ("anonymous", "Everyone, including anonymous users"),
-                    ("authenticated", "Authenticated users"),
-                    ("volunteer", "All volunteers"),
-                    ("tournament", "All members of a given tournament"),
-                    ("organizer", "Tournament organizers only"),
-                    (
-                        "jury_president",
-                        "Tournament organizers and jury presidents of the tournament",
-                    ),
-                    ("jury", "Jury members of the pool"),
-                    ("pool", "Jury members and participants of the pool"),
-                    (
-                        "team",
-                        "Members of the team and organizers of concerned tournaments",
-                    ),
-                    ("private", "Private, reserved to explicit authorized users"),
-                    ("admin", "Admin users"),
-                ],
-                help_text="Permission type that is required to write a message to a channel.",
-                max_length=16,
-                verbose_name="write permission",
-            ),
-        ),
-    ]

chat/models.py

@@ -1,56 +1,32 @@
 # Copyright (C) 2024 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from asgiref.sync import sync_to_async
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models import Q, QuerySet
 from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy as _
-from participation.models import Pool, Team, Tournament
+from participation.models import Tournament
 from registration.models import ParticipantRegistration, Registration, VolunteerRegistration
 from tfjm.permissions import PermissionType
 
 
 class Channel(models.Model):
-    """
-    Ce modèle représente un canal de chat, défini par son nom, sa catégorie, les permissions de lecture et d'écriture
-    requises pour accéder au canal, et éventuellement un tournoi, une poule ou une équipe associée.
-    """
-
-    class ChannelCategory(models.TextChoices):
-        GENERAL = 'general', _("General channels")
-        TOURNAMENT = 'tournament', _("Tournament channels")
-        TEAM = 'team', _("Team channels")
-        PRIVATE = 'private', _("Private channels")
-
     name = models.CharField(
         max_length=255,
         verbose_name=_("name"),
-        help_text=_("Visible name of the channel."),
-    )
-
-    category = models.CharField(
-        max_length=255,
-        verbose_name=_("category"),
-        choices=ChannelCategory,
-        default=ChannelCategory.GENERAL,
-        help_text=_("Category of the channel, between general channels, tournament-specific channels, team channels "
-                    "or private channels. Will be used to sort channels in the channel list."),
     )
 
     read_access = models.CharField(
         max_length=16,
         verbose_name=_("read permission"),
         choices=PermissionType,
-        help_text=_("Permission type that is required to read the messages of the channels."),
     )
 
     write_access = models.CharField(
         max_length=16,
         verbose_name=_("write permission"),
         choices=PermissionType,
-        help_text=_("Permission type that is required to write a message to a channel."),
     )
 
     tournament = models.ForeignKey(
@@ -101,99 +77,44 @@ class Channel(models.Model):
                     "in addition to the permitted group of the channel."),
     )
 
-    def get_visible_name(self, user: User) -> str:
-        """
-        Renvoie le nom du channel tel qu'il est visible pour l'utilisateur⋅rice donné.
-        Dans le cas d'un canal classique, renvoie directement le nom.
-        Dans le cas d'un canal privé, renvoie la liste des personnes membres du canal,
-        à l'exception de la personne connectée, afin de ne pas afficher son propre nom.
-        Dans le cas d'un chat avec uniquement soi-même, on affiche que notre propre nom.
-        """
-        if self.private:
-            # Le canal est privé, on renvoie la liste des personnes membres du canal
-            # à l'exception de soi-même (sauf si on est la seule personne dans le canal)
-            users = [f"{u.first_name} {u.last_name}" for u in self.invited.all() if u != user] \
-                    or [f"{user.first_name} {user.last_name}"]
-            return ", ".join(users)
-        # Le canal est public, on renvoie directement le nom
-        return self.name
-
     def __str__(self):
         return str(format_lazy(_("Channel {name}"), name=self.name))
 
     @staticmethod
     async def get_accessible_channels(user: User, permission_type: str = 'read') -> QuerySet["Channel"]:
-        """
-        Renvoie les canaux auxquels l'utilisateur⋅rice donné a accès, en lecture ou en écriture.
-
-        Types de permissions :
-        ANONYMOUS : Tout le monde, y compris les utilisateur⋅rices non connecté⋅es
-        AUTHENTICATED : Toustes les utilisateur⋅rices connecté⋅es
-        VOLUNTEER : Toustes les bénévoles
-        TOURNAMENT_MEMBER : Toustes les membres d'un tournoi donné (orgas, juré⋅es, participant⋅es)
-        TOURNAMENT_ORGANIZER : Les organisateur⋅rices d'un tournoi donné
-        TOURNAMENT_JURY_PRESIDENT : Les organisateur⋅rices et les président⋅es de jury d'un tournoi donné
-        JURY_MEMBER : Les membres du jury d'une poule donnée, ou les organisateur⋅rices du tournoi
-        POOL_MEMBER : Les membres du jury et les participant⋅es d'une poule donnée, ou les organisateur⋅rices du tournoi
-        TEAM_MEMBER : Les membres d'une équipe donnée
-        PRIVATE : Les utilisateur⋅rices explicitement invité⋅es
-        ADMIN : Les utilisateur⋅rices administrateur⋅rices (qui ont accès à tout)
-
-        Les canaux privés sont utilisés pour les messages privés, et ne sont pas affichés aux admins.
-
-        :param user: L'utilisateur⋅rice dont on veut récupérer la liste des canaux.
-        :param permission_type: Le type de permission concerné (read ou write).
-        :return: Le Queryset des canaux autorisés.
-        """
         permission_type = 'write_access' if 'write' in permission_type.lower() else 'read_access'
 
         qs = Channel.objects.none()
         if user.is_anonymous:
-            # Les utilisateur⋅rices non connecté⋅es ont accès aux canaux publics pour toustes
             return Channel.objects.filter(**{permission_type: PermissionType.ANONYMOUS})
 
-        # Les utilisateur⋅rices connecté⋅es ont accès aux canaux publics pour les personnes connectées
         qs |= Channel.objects.filter(**{permission_type: PermissionType.AUTHENTICATED})
-        registration = await Registration.objects.prefetch_related('user').aget(user_id=user.id)
+        registration = await Registration.objects.aget(user_id=user.id)
 
         if registration.is_admin:
-            # Les administrateur⋅rices ont accès à tous les canaux, sauf les canaux privés sont iels ne sont pas membres
-            return Channel.objects.prefetch_related('invited').exclude(~Q(invited=user) & Q(private=True)).all()
+            return Channel.objects.all()
 
         if registration.is_volunteer:
             registration = await VolunteerRegistration.objects \
                 .prefetch_related('jury_in__tournament', 'organized_tournaments').aget(user_id=user.id)
 
-            # Les bénévoles ont accès aux canaux pour bénévoles
             qs |= Channel.objects.filter(**{permission_type: PermissionType.VOLUNTEER})
 
-            # Iels ont accès aux tournois dont iels sont organisateur⋅rices ou juré⋅es
-            # pour la permission TOURNAMENT_MEMBER
             qs |= Channel.objects.filter(Q(tournament__in=registration.interesting_tournaments),
                                          **{permission_type: PermissionType.TOURNAMENT_MEMBER})
 
-            # Iels ont accès aux canaux pour les organisateur⋅rices des tournois dont iels sont organisateur⋅rices
-            # pour la permission TOURNAMENT_ORGANIZER
             qs |= Channel.objects.filter(Q(tournament__in=registration.organized_tournaments.all()),
                                          **{permission_type: PermissionType.TOURNAMENT_ORGANIZER})
 
-            # Iels ont accès aux canaux pour les organisateur⋅rices et président⋅es de jury des tournois dont iels sont
-            # organisateur⋅rices ou juré⋅es pour la permission TOURNAMENT_JURY_PRESIDENT
             qs |= Channel.objects.filter(Q(tournament__pools__in=registration.pools_presided.all())
                                          | Q(tournament__in=registration.organized_tournaments.all()),
                                          **{permission_type: PermissionType.TOURNAMENT_JURY_PRESIDENT})
 
-            # Iels ont accès aux canaux pour les juré⋅es des poules dont iels sont juré⋅es
-            # ou les organisateur⋅rices des tournois dont iels sont organisateur⋅rices
-            # pour la permission JURY_MEMBER
             qs |= Channel.objects.filter(Q(pool__in=registration.jury_in.all())
                                          | Q(pool__tournament__in=registration.organized_tournaments.all())
                                          | Q(pool__tournament__pools__in=registration.pools_presided.all()),
                                          **{permission_type: PermissionType.JURY_MEMBER})
 
-            # Iels ont accès aux canaux pour les juré⋅es et participant⋅es des poules dont iels sont juré⋅es
-            # ou les organisateur⋅rices des tournois dont iels sont organisateur⋅rices
-            # pour la permission POOL_MEMBER
             qs |= Channel.objects.filter(Q(pool__in=registration.jury_in.all())
                                          | Q(pool__tournament__in=registration.organized_tournaments.all())
                                          | Q(pool__tournament__pools__in=registration.pools_presided.all()),
@@ -209,37 +130,29 @@ class Channel(models.Model):
             if team.participation.final:
                 tournaments.append(await Tournament.objects.aget(final=True))
 
-            # Les participant⋅es ont accès aux canaux généraux pour le tournoi dont iels sont membres
-            # Cela comprend la finale s'iels sont finalistes
             qs |= Channel.objects.filter(Q(tournament__in=tournaments),
                                          **{permission_type: PermissionType.TOURNAMENT_MEMBER})
 
-            # Iels ont accès aux canaux généraux pour les poules dont iels sont participant⋅es
             qs |= Channel.objects.filter(Q(pool__in=team.participation.pools.all()),
                                          **{permission_type: PermissionType.POOL_MEMBER})
 
-            # Iels ont accès aux canaux propres à leur équipe
             qs |= Channel.objects.filter(Q(team=team),
                                          **{permission_type: PermissionType.TEAM_MEMBER})
 
-        # Les utilisateur⋅rices ont de plus accès aux messages privés qui leur sont adressés
-        qs |= Channel.objects.filter(invited=user).prefetch_related('invited')
+        qs |= Channel.objects.filter(invited=user)
+
+        print(user)
+        print(qs.query)
 
         return qs
 
     class Meta:
         verbose_name = _("channel")
         verbose_name_plural = _("channels")
-        ordering = ('category', 'name',)
+        ordering = ('name',)
 
 
 class Message(models.Model):
-    """
-    Ce modèle représente un message de chat.
-    Un message appartient à un canal, et est défini par son contenu, son auteur⋅rice, sa date de création et sa date
-    de dernière modification.
-    De plus, on garde en mémoire les utilisateur⋅rices qui ont lu le message.
-    """
     channel = models.ForeignKey(
         Channel,
         on_delete=models.CASCADE,
@@ -269,96 +182,6 @@ class Message(models.Model):
         verbose_name=_("content"),
     )
 
-    users_read = models.ManyToManyField(
-        'auth.User',
-        verbose_name=_("users read"),
-        related_name='+',
-        blank=True,
-        help_text=_("Users who have read the message."),
-    )
-
-    def get_author_name(self) -> str:
-        """
-        Renvoie le nom de l'auteur⋅rice du message, en fonction de son rôle dans l'organisation
-        dans le cadre d'un⋅e bénévole, ou de son équipe dans le cadre d'un⋅e participant⋅e.
-        """
-        registration = self.author.registration
-
-        author_name = f"{self.author.first_name} {self.author.last_name}"
-        if registration.is_volunteer:
-            if registration.is_admin:
-                # Les administrateur⋅rices ont le suffixe (CNO)
-                author_name += " (CNO)"
-
-            if self.channel.pool:
-                if registration == self.channel.pool.jury_president:
-                    # Læ président⋅e de jury de la poule a le suffixe (P. jury)
-                    author_name += " (P. jury)"
-                elif registration in self.channel.pool.juries.all():
-                    # Les juré⋅es de la poule ont le suffixe (Juré⋅e)
-                    author_name += " (Juré⋅e)"
-                elif registration in self.channel.pool.tournament.organizers.all():
-                    # Les organisateur⋅rices du tournoi ont le suffixe (CRO)
-                    author_name += " (CRO)"
-                else:
-                    # Les éventuel⋅les autres bénévoles ont le suffixe (Bénévole)
-                    author_name += " (Bénévole)"
-            elif self.channel.tournament:
-                if registration in self.channel.tournament.organizers.all():
-                    # Les organisateur⋅rices du tournoi ont le suffixe (CRO)
-                    author_name += " (CRO)"
-                elif any([registration.id == pool.jury_president
-                          for pool in self.channel.tournament.pools.all()]):
-                    # Les président⋅es de jury des poules ont le suffixe (P. jury)
-                    # mentionnant l'ensemble des poules qu'iels président
-                    pools = ", ".join([pool.short_name
-                                       for pool in self.channel.tournament.pools.all()
-                                       if pool.jury_president == registration])
-                    author_name += f" (P. jury {pools})"
-                elif any([pool.juries.contains(registration)
-                          for pool in self.channel.tournament.pools.all()]):
-                    # Les juré⋅es des poules ont le suffixe (Juré⋅e)
-                    # mentionnant l'ensemble des poules auxquelles iels participent
-                    pools = ", ".join([pool.short_name
-                                       for pool in self.channel.tournament.pools.all()
-                                       if pool.juries.acontains(registration)])
-                    author_name += f" (Juré⋅e {pools})"
-                else:
-                    # Les éventuel⋅les autres bénévoles ont le suffixe (Bénévole)
-                    author_name += " (Bénévole)"
-            else:
-                if registration.organized_tournaments.exists():
-                    # Les organisateur⋅rices de tournois ont le suffixe (CRO) mentionnant les tournois organisés
-                    tournaments = ", ".join([tournament.name
-                                             for tournament in registration.organized_tournaments.all()])
-                    author_name += f" (CRO {tournaments})"
-                if Pool.objects.filter(jury_president=registration).exists():
-                    # Les président⋅es de jury ont le suffixe (P. jury) mentionnant les tournois présidés
-                    tournaments = Tournament.objects.filter(pools__jury_president=registration).distinct()
-                    tournaments = ", ".join([tournament.name for tournament in tournaments])
-                    author_name += f" (P. jury {tournaments})"
-                elif registration.jury_in.exists():
-                    # Les juré⋅es ont le suffixe (Juré⋅e) mentionnant les tournois auxquels iels participent
-                    tournaments = Tournament.objects.filter(pools__juries=registration).distinct()
-                    tournaments = ", ".join([tournament.name for tournament in tournaments])
-                    author_name += f" (Juré⋅e {tournaments})"
-        else:
-            if registration.team_id:
-                # Le trigramme de l'équipe de læ participant⋅e est ajouté en suffixe
-                team = Team.objects.get(id=registration.team_id)
-                author_name += f" ({team.trigram})"
-            else:
-                author_name += " (sans équipe)"
-
-        return author_name
-
-    async def aget_author_name(self) -> str:
-        """
-        Fonction asynchrone pour récupérer le nom de l'auteur⋅rice du message.
-        Voir `get_author_name` pour plus de détails.
-        """
-        return await sync_to_async(self.get_author_name)()
-
     class Meta:
         verbose_name = _("message")
         verbose_name_plural = _("messages")

chat/signals.py

@@ -1,120 +0,0 @@
-# Copyright (C) 2024 by Animath
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from chat.models import Channel
-from participation.models import Participation, Pool, Tournament
-from tfjm.permissions import PermissionType
-
-
-def create_tournament_channels(instance: Tournament, **_kwargs):
-    """
-    Lorsqu'un tournoi est créé, on crée les canaux de chat associés.
-    On crée notamment un canal d'annonces (accessible en écriture uniquement aux orgas),
-    un canal général, un de détente, un pour les juré⋅es et un pour les président⋅es de jury.
-    """
-    tournament = instance
-
-    # Création du canal « Tournoi - Annonces »
-    Channel.objects.update_or_create(
-        name=f"{tournament.name} - Annonces",
-        defaults=dict(
-            category=Channel.ChannelCategory.TOURNAMENT,
-            read_access=PermissionType.TOURNAMENT_MEMBER,
-            write_access=PermissionType.TOURNAMENT_ORGANIZER,
-            tournament=tournament,
-        ),
-    )
-
-    # Création du canal « Tournoi - Général »
-    Channel.objects.update_or_create(
-        name=f"{tournament.name} - Général",
-        defaults=dict(
-            category=Channel.ChannelCategory.TOURNAMENT,
-            read_access=PermissionType.TOURNAMENT_MEMBER,
-            write_access=PermissionType.TOURNAMENT_MEMBER,
-            tournament=tournament,
-        ),
-    )
-
-    # Création du canal « Tournoi - Détente »
-    Channel.objects.update_or_create(
-        name=f"{tournament.name} - Détente",
-        defaults=dict(
-            category=Channel.ChannelCategory.TOURNAMENT,
-            read_access=PermissionType.TOURNAMENT_MEMBER,
-            write_access=PermissionType.TOURNAMENT_MEMBER,
-            tournament=tournament,
-        ),
-    )
-
-    # Création du canal « Tournoi - Juré⋅es »
-    Channel.objects.update_or_create(
-        name=f"{tournament.name} - Juré⋅es",
-        defaults=dict(
-            category=Channel.ChannelCategory.TOURNAMENT,
-            read_access=PermissionType.JURY_MEMBER,
-            write_access=PermissionType.JURY_MEMBER,
-            tournament=tournament,
-        ),
-    )
-
-    if tournament.remote:
-        # Création du canal « Tournoi - Président⋅es de jury » dans le cas d'un tournoi distanciel
-        Channel.objects.update_or_create(
-            name=f"{tournament.name} - Président⋅es de jury",
-            defaults=dict(
-                category=Channel.ChannelCategory.TOURNAMENT,
-                read_access=PermissionType.TOURNAMENT_JURY_PRESIDENT,
-                write_access=PermissionType.TOURNAMENT_JURY_PRESIDENT,
-                tournament=tournament,
-            ),
-        )
-
-
-def create_pool_channels(instance: Pool, **_kwargs):
-    """
-    Lorsqu'une poule est créée, on crée les canaux de chat associés.
-    On crée notamment un canal pour les membres de la poule et un pour les juré⋅es.
-    Cela ne concerne que les tournois distanciels.
-    """
-    pool = instance
-    tournament = pool.tournament
-
-    if tournament.remote:
-        # Dans le cadre d'un tournoi distanciel, on crée un canal pour les membres de la poule
-        # et un pour les juré⋅es de la poule.
-        Channel.objects.update_or_create(
-            name=f"{tournament.name} - Poule {pool.short_name}",
-            defaults=dict(
-                category=Channel.ChannelCategory.TOURNAMENT,
-                read_access=PermissionType.POOL_MEMBER,
-                write_access=PermissionType.POOL_MEMBER,
-                pool=pool,
-            ),
-        )
-
-        Channel.objects.update_or_create(
-            name=f"{tournament.name} - Poule {pool.short_name} - Jury",
-            defaults=dict(
-                category=Channel.ChannelCategory.TOURNAMENT,
-                read_access=PermissionType.JURY_MEMBER,
-                write_access=PermissionType.JURY_MEMBER,
-                pool=pool,
-            ),
-        )
-
-
-def create_team_channel(instance: Participation, **_kwargs):
-    """
-    Lorsqu'une équipe est validée, on crée un canal de chat associé.
-    """
-    if instance.valid:
-        Channel.objects.update_or_create(
-            name=f"Équipe {instance.team.trigram}",
-            defaults=dict(
-                category=Channel.ChannelCategory.TEAM,
-                read_access=PermissionType.TEAM_MEMBER,
-                write_access=PermissionType.TEAM_MEMBER,
-                team=instance.team,
-            ),
-        )

chat/static/chat.js

@@ -0,0 +1,59 @@
+(async () => {
+    // check notification permission
+    // This is useful to alert people that they should do something
+    await Notification.requestPermission()
+})()
+
+/**
+ * Display a new notification with the given title and the given body.
+ * @param title The title of the notification
+ * @param body The body of the notification
+ * @param timeout The time (in milliseconds) after that the notification automatically closes. 0 to make indefinite. Default to 5000 ms.
+ * @return Notification
+ */
+function showNotification(title, body, timeout = 5000) {
+    let notif = new Notification(title, {'body': body, 'icon': "/static/tfjm.svg"})
+    if (timeout)
+        setTimeout(() => notif.close(), timeout)
+    return notif
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+    /**
+     * Process the received data from the server.
+     * @param data The received message
+     */
+    function processMessage(data) {
+        // TODO Implement chat protocol
+        console.log(data)
+    }
+
+    function setupSocket(nextDelay = 1000) {
+        // Open a global websocket
+        socket = new WebSocket(
+            (document.location.protocol === 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/ws/chat/'
+        )
+
+        // Listen on websockets and process messages from the server
+        socket.addEventListener('message', e => {
+            // Parse received data as JSON
+            const data = JSON.parse(e.data)
+
+            processMessage(data)
+        })
+
+        // Manage errors
+        socket.addEventListener('close', e => {
+            console.error('Chat socket closed unexpectedly, restarting…')
+            setTimeout(() => setupSocket(2 * nextDelay), nextDelay)
+        })
+
+        socket.addEventListener('open', e => {
+            socket.send(JSON.stringify({
+                'type': 'fetch_channels',
+            }))
+        })
+    }
+
+    setupSocket()
+})

chat/static/tfjm/chat_eteam.webmanifest

@@ -1,17 +0,0 @@
-{
-    "background_color": "white",
-    "description": "Chat for ETEAM",
-    "display": "standalone",
-    "icons": [
-        {
-            "src": "/static/tfjm/img/eteam.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "maskable"
-        }
-    ],
-    "name": "ETEAM Chat",
-    "short_name": "ETEAM Chat",
-    "start_url": "/chat/fullscreen",
-    "theme_color": "black"
-}

chat/static/tfjm/chat_tfjm.webmanifest

@@ -1,29 +0,0 @@
-{
-    "background_color": "white",
-    "description": "Chat pour le TFJM²",
-    "display": "standalone",
-    "icons": [
-        {
-            "src": "/static/tfjm/img/tfjm-square.svg",
-            "sizes": "any",
-            "type": "image/svg+xml",
-            "purpose": "maskable"
-        },
-        {
-            "src": "/static/tfjm/img/tfjm-512.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "maskable"
-        },
-        {
-            "src": "/static/tfjm/img/tfjm-192.png",
-            "sizes": "192x192",
-            "type": "image/png",
-            "purpose": "maskable"
-        }
-    ],
-    "name": "Chat TFJM²",
-    "short_name": "Chat TFJM²",
-    "start_url": "/chat/fullscreen",
-    "theme_color": "black"
-}

chat/static/tfjm/js/chat.js

@@ -1,912 +0,0 @@
-(async () => {
-    // Vérification de la permission pour envoyer des notifications
-    // C'est utile pour prévenir les utilisateur⋅rices de l'arrivée de nouveaux messages les mentionnant
-    await Notification.requestPermission()
-})()
-
-const MAX_MESSAGES = 50  // Nombre maximal de messages à charger à la fois
-
-const channel_categories = ['general', 'tournament', 'team', 'private']  // Liste des catégories de canaux
-let channels = {}  // Liste des canaux disponibles
-let messages = {}  // Liste des messages reçus par canal
-let selected_channel_id = null  // Canal courant
-
-/**
- * Affiche une nouvelle notification avec le titre donné et le contenu donné.
- * @param title Le titre de la notification
- * @param body Le contenu de la notification
- * @param timeout La durée (en millisecondes) après laquelle la notification se ferme automatiquement.
- *                Définir à 0 (défaut) pour la rendre infinie.
- * @return Notification
- */
-function showNotification(title, body, timeout = 0) {
-    Notification.requestPermission().then((status) => {
-        if (status === 'granted') {
-            // On envoie la notification que si la permission a été donnée
-            let notif = new Notification(title, {'body': body, 'icon': "/static/tfjm-192.png"})
-            if (timeout > 0)
-                setTimeout(() => notif.close(), timeout)
-            return notif
-        }
-    })
-}
-
-/**
- * Sélectionne le canal courant à afficher sur l'interface de chat.
- * Va alors définir le canal courant et mettre à jour les messages affichés.
- * @param channel_id L'identifiant du canal à afficher.
- */
-function selectChannel(channel_id) {
-    let channel = channels[channel_id]
-    if (!channel) {
-        // Le canal n'existe pas
-        console.error('Channel not found:', channel_id)
-        return
-    }
-
-    selected_channel_id = channel_id
-    // On stocke dans le stockage local l'identifiant du canal
-    // pour pouvoir rouvrir le dernier canal ouvert dans le futur
-    localStorage.setItem('chat.last-channel-id', channel_id)
-
-    // Définition du titre du contenu
-    let channelTitle = document.getElementById('channel-title')
-    channelTitle.innerText = channel.name
-
-    // Si on a pas le droit d'écrire dans le canal, on désactive l'input de message
-    // On l'active sinon
-    let messageInput = document.getElementById('input-message')
-    messageInput.disabled = !channel.write_access
-
-    // On redessine la liste des messages à partir des messages stockés
-    redrawMessages()
-}
-
-/**
- * On récupère le message écrit par l'utilisateur⋅rice dans le champ de texte idoine,
- * et on le transmet ensuite au serveur.
- * Il ne s'affiche pas instantanément sur l'interface,
- * mais seulement une fois que le serveur aura validé et retransmis le message.
- */
-function sendMessage() {
-    // Récupération du message à envoyer
-    let messageInput = document.getElementById('input-message')
-    let message = messageInput.value
-    // On efface le champ de texte après avoir récupéré le message
-    messageInput.value = ''
-
-    if (!message) {
-        return
-    }
-
-    // Envoi du message au serveur
-    socket.send(JSON.stringify({
-        'type': 'send_message',
-        'channel_id': selected_channel_id,
-        'content': message,
-    }))
-}
-
-/**
- * Met à jour la liste des canaux disponibles, à partir de la liste récupérée du serveur.
- * @param new_channels La liste des canaux à afficher.
- *                     Chaque canal doit être un objet avec les clés `id`, `name`, `category`
- *                     `read_access`, `write_access` et `unread_messages`, correspondant à l'identifiant du canal,
- *                     son nom, sa catégorie, la permission de lecture, d'écriture et le nombre de messages non lus.
- */
-function setChannels(new_channels) {
-    channels = {}
-    for (let category of channel_categories) {
-        // On commence par vider la liste des canaux sélectionnables
-        let categoryList = document.getElementById(`nav-${category}-channels-tab`)
-        categoryList.innerHTML = ''
-        categoryList.parentElement.classList.add('d-none')
-    }
-
-    for (let channel of new_channels)
-        // On ajoute chaque canal à la liste des canaux
-        addChannel(channel)
-
-    if (new_channels && (!selected_channel_id || !channels[selected_channel_id])) {
-        // Si aucun canal n'a encore été sélectionné et qu'il y a des canaux disponibles,
-        // on commence par vérifier si on a stocké un canal précédemment sélectionné et on l'affiche si c'est le cas
-        // Sinon, on affiche le premier canal disponible
-        let last_channel_id = parseInt(localStorage.getItem('chat.last-channel-id'))
-        if (last_channel_id && channels[last_channel_id])
-            selectChannel(last_channel_id)
-        else
-            selectChannel(Object.keys(channels)[0])
-    }
-}
-
-/**
- * Ajoute un canal à la liste des canaux disponibles.
- * @param channel Le canal à ajouter. Doit être un objet avec les clés `id`, `name`, `category`,
- *               `read_access`, `write_access` et `unread_messages`, correspondant à l'identifiant du canal,
- *               son nom, sa catégorie, la permission de lecture, d'écriture et le nombre de messages non lus.
- */
-async function addChannel(channel) {
-    channels[channel.id] = channel
-    if (!messages[channel.id])
-        messages[channel.id] = new Map()
-
-    // On récupère la liste des canaux de la catégorie concernée
-    let categoryList = document.getElementById(`nav-${channel.category}-channels-tab`)
-    // On la rend visible si elle ne l'était pas déjà
-    categoryList.parentElement.classList.remove('d-none')
-
-    // On crée un nouvel élément de liste pour la catégorie concernant le canal
-    let navItem = document.createElement('li')
-    navItem.classList.add('list-group-item', 'tab-channel')
-    navItem.id = `tab-channel-${channel.id}`
-    navItem.setAttribute('data-bs-dismiss', 'offcanvas')
-    navItem.onclick = () => selectChannel(channel.id)
-    categoryList.appendChild(navItem)
-
-    // L'élément est cliquable afin de sélectionner le canal
-    let channelButton = document.createElement('button')
-    channelButton.classList.add('nav-link')
-    channelButton.type = 'button'
-    channelButton.innerText = channel.name
-    navItem.appendChild(channelButton)
-
-    // Affichage du nombre de messages non lus
-    let unreadBadge = document.createElement('span')
-    unreadBadge.classList.add('badge', 'rounded-pill', 'text-bg-light', 'ms-2')
-    unreadBadge.id = `unread-messages-${channel.id}`
-    unreadBadge.innerText = channel.unread_messages || 0
-    if (!channel.unread_messages)
-        unreadBadge.classList.add('d-none')
-    channelButton.appendChild(unreadBadge)
-
-    // Si on veut trier les canaux par nombre décroissant de messages non lus,
-    // on définit l'ordre de l'élément (propriété CSS) en fonction du nombre de messages non lus
-    if (document.getElementById('sort-by-unread-switch').checked)
-        navItem.style.order = `${-channel.unread_messages}`
-
-    // On demande enfin à récupérer les derniers messages du canal en question afin de les stocker / afficher
-    fetchMessages(channel.id)
-}
-
-/**
- * Un⋅e utilisateur⋅rice a envoyé un message, qui a été retransmis par le serveur.
- * On le stocke alors et on l'affiche sur l'interface si nécessaire.
- * On affiche également une notification si le message contient une mention pour tout le monde.
- * @param message Le message qui a été transmis. Doit être un objet avec
- *                les clés `id`, `channel_id`, `author`, `author_id`, `content` et `timestamp`,
- *                correspondant à l'identifiant du message, du canal, le nom de l'auteur⋅rice et l'heure d'envoi.
- */
-function receiveMessage(message) {
-    // On vérifie si la barre de défilement est tout en bas
-    let scrollableContent = document.getElementById('chat-messages')
-    let isScrolledToBottom = scrollableContent.scrollHeight - scrollableContent.clientHeight <= scrollableContent.scrollTop + 1
-
-    // On stocke le message dans la liste des messages du canal concerné
-    // et on redessine les messages affichés si on est dans le canal concerné
-    messages[message.channel_id].set(message.id, message)
-    if (message.channel_id === selected_channel_id)
-        redrawMessages()
-
-    // Si la barre de défilement était tout en bas, alors on la remet tout en bas après avoir redessiné les messages
-    if (isScrolledToBottom)
-        scrollableContent.scrollTop = scrollableContent.scrollHeight - scrollableContent.clientHeight
-
-    // On ajoute un à la liste des messages non lus du canal (il pourra être lu plus tard)
-    updateUnreadBadge(message.channel_id, channels[message.channel_id].unread_messages + 1)
-
-    // Si le message contient une mention à @everyone, alors on envoie une notification (si la permission est donnée)
-    if (message.content.includes("@everyone"))
-        showNotification(channels[message.channel_id].name, `${message.author} : ${message.content}`)
-
-    // On envoie un événement personnalisé pour indiquer que les messages ont été mis à jour
-    // Permettant entre autres de marquer le message comme lu si c'est le cas
-    document.getElementById('message-list').dispatchEvent(new CustomEvent('updatemessages'))
-}
-
-/**
- * Un message a été modifié, et le serveur nous a transmis les nouvelles informations.
- * @param data Le nouveau message qui a été modifié.
- */
-function editMessage(data) {
-    // On met à jour le contenu du message
-    messages[data.channel_id].get(data.id).content = data.content
-    // Si le message appartient au canal courant, on redessine les messages
-    if (data.channel_id === selected_channel_id)
-        redrawMessages()
-}
-
-/**
- * Un message a été supprimé, et le serveur nous a transmis les informations.
- * @param data Le message qui a été supprimé.
- */
-function deleteMessage(data) {
-    // On supprime le message de la liste des messages du canal concerné
-    messages[data.channel_id].delete(data.id)
-    // Si le message appartient au canal courant, on redessine les messages
-    if (data.channel_id === selected_channel_id)
-        redrawMessages()
-}
-
-/**
- * Demande au serveur de récupérer les messages du canal donné.
- * @param channel_id L'identifiant du canal dont on veut récupérer les messages.
- * @param offset Le décalage à partir duquel on veut récupérer les messages,
- *               correspond au nombre de messages en mémoire.
- * @param limit Le nombre maximal de messages à récupérer.
- */
-function fetchMessages(channel_id, offset = 0, limit = MAX_MESSAGES) {
-    // Envoi de la requête au serveur avec les différents paramètres
-    socket.send(JSON.stringify({
-        'type': 'fetch_messages',
-        'channel_id': channel_id,
-        'offset': offset,
-        'limit': limit,
-    }))
-}
-
-/**
- * Demande au serveur de récupérer les messages précédents du canal courant.
- * Par défaut, on récupère `MAX_MESSAGES` messages avant tous ceux qui ont été reçus sur ce canal.
- */
-function fetchPreviousMessages() {
-    let channel_id = selected_channel_id
-    let offset = messages[channel_id].size
-    fetchMessages(channel_id, offset, MAX_MESSAGES)
-}
-
-/**
- * L'utilisateur⋅rice a demandé à récupérer une partie des messages d'un canal.
- * Cette fonction est alors appelée lors du retour du serveur.
- * @param data Dictionnaire contenant l'identifiant du canal concerné, et la liste des messages récupérés.
- */
-function receiveFetchedMessages(data) {
-    // Récupération du canal concerné ainsi que des nouveaux messages à mémoriser
-    let channel_id = data.channel_id
-    let new_messages = data.messages
-
-    if (!messages[channel_id])
-        messages[channel_id] = new Map()
-
-    // Ajout des nouveaux messages à la liste des messages du canal
-    for (let message of new_messages)
-        messages[channel_id].set(message.id, message)
-
-    // On trie les messages reçus par date et heure d'envoi
-    messages[channel_id] = new Map([...messages[channel_id].values()]
-      .sort((a, b) => new Date(a.timestamp) - new Date(b.timestamp))
-      .map(message => [message.id, message]))
-
-    // Enfin, si le canal concerné est le canal courant, on redessine les messages
-    if (channel_id === selected_channel_id)
-        redrawMessages()
-}
-
-/**
- * L'utilisateur⋅rice a indiqué au serveur que des messages ont été lus.
- * Cette fonction est appelée en retour, pour confirmer, et stocke quels messages ont été lus
- * et combien de messages sont non lus par canal.
- * @param data Dictionnaire contenant une clé `read`, contenant la liste des identifiants des messages
- *             marqués comme lus avec leur canal respectif, et une clé `unread_messages` contenant le nombre
- *             de messages non lus par canal.
- */
-function markMessageAsRead(data) {
-    for (let message of data.messages) {
-        // Récupération du message à marquer comme lu
-        let stored_message = messages[message.channel_id].get(message.id)
-        // Marquage du message comme lu
-        if (stored_message)
-            stored_message.read = true
-    }
-    // Actualisation des badges contenant le nombre de messages non lus par canal
-    updateUnreadBadges(data.unread_messages)
-}
-
-/**
- * Mise à jour des badges contenant le nombre de messages non lus par canal.
- * @param unreadMessages Dictionnaire des nombres de messages non lus par canal (identifiés par leurs identifiants)
- */
-function updateUnreadBadges(unreadMessages) {
-    for (let channel of Object.values(channels)) {
-        // Récupération du nombre de messages non lus pour le canal en question et mise à jour du badge pour ce canal
-        updateUnreadBadge(channel.id, unreadMessages[channel.id] || 0)
-    }
-}
-
-/**
- * Mise à jour du badge du nombre de messages non lus d'un canal.
- * Actualise sa visibilité.
- * @param channel_id Identifiant du canal concerné.
- * @param unreadMessagesCount Nombre de messages non lus du canal.
- */
-function updateUnreadBadge(channel_id, unreadMessagesCount = 0) {
-    // Vaut true si on veut trier les canaux par nombre de messages non lus ou non
-    const sortByUnread = document.getElementById('sort-by-unread-switch').checked
-
-    // Récupération du canal concerné
-    let channel = channels[channel_id]
-
-    // Récupération du nombre de messages non lus pour le canal en question, que l'on stocke
-    channel.unread_messages = unreadMessagesCount
-
-    // On met à jour le badge du canal contenant le nombre de messages non lus
-    let unreadBadge = document.getElementById(`unread-messages-${channel.id}`)
-    unreadBadge.innerText = unreadMessagesCount.toString()
-
-    // Le badge est visible si et seulement si il y a au moins un message non lu
-    if (unreadMessagesCount)
-        unreadBadge.classList.remove('d-none')
-    else
-        unreadBadge.classList.add('d-none')
-
-    // S'il faut trier les canaux par nombre de messages non lus, on ajoute la propriété CSS correspondante
-    if (sortByUnread)
-        document.getElementById(`tab-channel-${channel.id}`).style.order = `${-unreadMessagesCount}`
-}
-
-/**
- * La création d'un canal privé entre deux personnes a été demandée.
- * Cette fonction est appelée en réponse du serveur.
- * Le canal est ajouté à la liste s'il est nouveau, et automatiquement sélectionné.
- * @param data Dictionnaire contenant une unique clé `channel` correspondant aux informations du canal privé.
- */
-function startPrivateChat(data) {
-    // Récupération du canal
-    let channel = data.channel
-    if (!channel) {
-        console.error('Private chat not found:', data)
-        return
-    }
-
-    if (!channels[channel.id]) {
-        // Si le canal n'est pas récupéré, on l'ajoute à la liste
-        channels[channel.id] = channel
-        messages[channel.id] = new Map()
-        addChannel(channel)
-    }
-
-    // Sélection immédiate du canal privé
-    selectChannel(channel.id)
-}
-
-/**
- * Met à jour le composant correspondant à la liste des messages du canal sélectionné.
- * Le conteneur est d'abord réinitialisé, puis les messages sont affichés un à un à partir de ceux stockés.
- */
-function redrawMessages() {
-    // Récupération du composant HTML <ul> correspondant à la liste des messages affichés
-    let messageList = document.getElementById('message-list')
-    // On commence par le vider
-    messageList.innerHTML = ''
-
-    let lastMessage = null
-    let lastContentDiv = null
-
-    for (let message of messages[selected_channel_id].values()) {
-        if (lastMessage && lastMessage.author === message.author) {
-            // Si le message est écrit par læ même auteur⋅rice que le message précédent,
-            // alors on les groupe ensemble
-            let lastTimestamp = new Date(lastMessage.timestamp)
-            let newTimestamp = new Date(message.timestamp)
-            if ((newTimestamp - lastTimestamp) / 1000 < 60 * 10) {
-                // Les messages sont groupés uniquement s'il y a une différence maximale de 10 minutes
-                // entre le premier message du groupe et celui en étude
-                // On ajoute alors le contenu du message en cours dans le dernier div de message
-                let messageContentDiv = document.createElement('div')
-                messageContentDiv.classList.add('message')
-                messageContentDiv.setAttribute('data-message-id', message.id)
-                lastContentDiv.appendChild(messageContentDiv)
-                let messageContentSpan = document.createElement('span')
-                messageContentSpan.innerHTML = markdownToHTML(message.content)
-                messageContentDiv.appendChild(messageContentSpan)
-
-                // Enregistrement du menu contextuel pour le message permettant la modification, la suppression
-                // et l'envoi de messages privés
-                registerMessageContextMenu(message, messageContentDiv, messageContentSpan)
-                continue
-            }
-        }
-
-        // Création de l'élément <li> pour le bloc de messages
-        let messageElement = document.createElement('li')
-        messageElement.classList.add('list-group-item')
-        messageList.appendChild(messageElement)
-
-        // Ajout d'un div contenant le nom de l'auteur⋅rice du message ainsi que la date et heure d'envoi
-        let authorDiv = document.createElement('div')
-        messageElement.appendChild(authorDiv)
-
-        // Ajout du nom de l'auteur⋅rice du message
-        let authorSpan = document.createElement('span')
-        authorSpan.classList.add('text-muted', 'fw-bold')
-        authorSpan.innerText = message.author
-        authorDiv.appendChild(authorSpan)
-
-        // Ajout de la date du message
-        let dateSpan = document.createElement('span')
-        dateSpan.classList.add('text-muted', 'float-end')
-        dateSpan.innerText = new Date(message.timestamp).toLocaleString()
-        authorDiv.appendChild(dateSpan)
-
-        // Enregistrement du menu contextuel pour le message permettant l'envoi de messages privés à l'auteur⋅rice
-        registerSendPrivateMessageContextMenu(message, authorDiv, authorSpan)
-
-        let contentDiv = document.createElement('div')
-        messageElement.appendChild(contentDiv)
-
-        // Ajout du contenu du message
-        // Le contenu est mis dans un span lui-même inclus dans un div,
-        let messageContentDiv = document.createElement('div')
-        messageContentDiv.classList.add('message')
-        messageContentDiv.setAttribute('data-message-id', message.id)
-        contentDiv.appendChild(messageContentDiv)
-        let messageContentSpan = document.createElement('span')
-        messageContentSpan.innerHTML = markdownToHTML(message.content)
-        messageContentDiv.appendChild(messageContentSpan)
-
-        // Enregistrement du menu contextuel pour le message permettant la modification, la suppression
-        // et l'envoi de messages privés
-        registerMessageContextMenu(message, messageContentDiv, messageContentSpan)
-
-        lastMessage = message
-        lastContentDiv = contentDiv
-    }
-
-    // Le bouton « Afficher les messages précédents » est affiché si et seulement si
-    // il y a des messages à récupérer (c'est-à-dire si le nombre de messages récupérés est un multiple de MAX_MESSAGES)
-    let fetchMoreButton = document.getElementById('fetch-previous-messages')
-    if (!messages[selected_channel_id].size || messages[selected_channel_id].size % MAX_MESSAGES !== 0)
-        fetchMoreButton.classList.add('d-none')
-    else
-        fetchMoreButton.classList.remove('d-none')
-
-    // On envoie un événement personnalisé pour indiquer que les messages ont été mis à jour
-    // Permettant entre autres de marquer les messages visibles comme lus si c'est le cas
-    messageList.dispatchEvent(new CustomEvent('updatemessages'))
-}
-
-/**
- * Convertit un texte écrit en Markdown en HTML.
- * Les balises Markdown suivantes sont supportées :
- * - Souligné : `_texte_`
- * - Gras : `**texte**`
- * - Italique : `*texte*`
- * - Code : `` `texte` ``
- * - Les liens sont automatiquement convertis
- * - Les esperluettes, guillemets et chevrons sont échappés.
- * @param text Le texte écrit en Markdown.
- * @return {string} Le texte converti en HTML.
- */
-function markdownToHTML(text) {
-    // On échape certains caractères spéciaux (esperluettes, chevrons, guillemets)
-    let safeText = text.replace(/&/g, "&amp;")
-         .replace(/</g, "&lt;")
-         .replace(/>/g, "&gt;")
-         .replace(/"/g, "&quot;")
-         .replace(/'/g, "&#039;")
-    let lines = safeText.split('\n')
-    let htmlLines = []
-    for (let line of lines) {
-        // Pour chaque ligne, on remplace le Markdown par un équivalent HTML (pour ce qui est supporté)
-        let htmlLine = line
-            .replaceAll(/_(.*)_/gim, '<span class="text-decoration-underline">$1</span>')  // Souligné
-            .replaceAll(/\*\*(.*)\*\*/gim, '<span class="fw-bold">$1</span>')  // Gras
-            .replaceAll(/\*(.*)\*/gim, '<span class="fst-italic">$1</span>')  // Italique
-            .replaceAll(/`(.*)`/gim, '<pre>$1</pre>')  // Code
-            .replaceAll(/(https?:\/\/\S+)/g, '<a href="$1" target="_blank">$1</a>')  // Liens
-        htmlLines.push(htmlLine)
-    }
-    // On joint enfin toutes les lignes par des balises de saut de ligne
-    return htmlLines.join('<br>')
-}
-
-/**
- * Ferme toutes les popovers ouvertes.
- */
-function removeAllPopovers() {
-    for (let popover of document.querySelectorAll('*[aria-describedby*="popover"]')) {
-        let instance = bootstrap.Popover.getInstance(popover)
-        if (instance)
-            instance.dispose()
-    }
-}
-
-/**
- * Enregistrement du menu contextuel pour un⋅e auteur⋅rice de message,
- * donnant la possibilité d'envoyer un message privé.
- * @param message Le message écrit par l'auteur⋅rice du bloc en question.
- * @param div Le bloc contenant le nom de l'auteur⋅rice et de la date d'envoi du message.
- *            Un clic droit sur lui affichera le menu contextuel.
- * @param span Le span contenant le nom de l'auteur⋅rice.
- *             Il désignera l'emplacement d'affichage du popover.
- */
-function registerSendPrivateMessageContextMenu(message, div, span) {
-    // Enregistrement de l'écouteur d'événement pour le clic droit
-    div.addEventListener('contextmenu', (menu_event) => {
-        // On empêche le menu traditionnel de s'afficher
-        menu_event.preventDefault()
-        // On retire toutes les popovers déjà ouvertes
-        removeAllPopovers()
-
-        // On crée le popover contenant le lien pour envoyer un message privé, puis on l'affiche
-        const popover = bootstrap.Popover.getOrCreateInstance(span, {
-            'title': message.author,
-            'content': `<a id="send-private-message-link-${message.id}" class="nav-link" href="#" tabindex="0">Envoyer un message privé</a>`,
-            'html': true,
-        })
-        popover.show()
-
-        // Lorsqu'on clique sur le lien, on ferme le popover
-        // et on demande à ouvrir le canal privé avec l'auteur⋅rice du message
-        document.getElementById('send-private-message-link-' + message.id).addEventListener('click', event => {
-            event.preventDefault()
-            popover.dispose()
-            socket.send(JSON.stringify({
-                'type': 'start_private_chat',
-                'user_id': message.author_id,
-            }))
-        })
-    })
-}
-
-/**
- * Enregistrement du menu contextuel pour un message,
- * donnant la possibilité de modifier ou de supprimer le message, ou d'envoyer un message privé à l'auteur⋅rice.
- * @param message Le message en question.
- * @param div Le bloc contenant le contenu du message.
- *            Un clic droit sur lui affichera le menu contextuel.
- * @param span Le span contenant le contenu du message.
- *             Il désignera l'emplacement d'affichage du popover.
- */
-function registerMessageContextMenu(message, div, span) {
-    // Enregistrement de l'écouteur d'événement pour le clic droit
-    div.addEventListener('contextmenu', (menu_event) => {
-        // On empêche le menu traditionnel de s'afficher
-        menu_event.preventDefault()
-        // On retire toutes les popovers déjà ouvertes
-        removeAllPopovers()
-
-        // On crée le popover contenant les liens pour modifier, supprimer le message ou envoyer un message privé.
-        let content = `<a id="send-private-message-link-msg-${message.id}" class="nav-link" href="#" tabindex="0">Envoyer un message privé</a>`
-
-        // On ne peut modifier ou supprimer un message que si on est l'auteur⋅rice ou que l'on est administrateur⋅rice.
-        let has_right_to_edit = message.author_id === USER_ID || IS_ADMIN
-        if (has_right_to_edit) {
-            content += `<hr class="my-1">`
-            content += `<a id="edit-message-${message.id}" class="nav-link" href="#" tabindex="0">Modifier</a>`
-            content += `<a id="delete-message-${message.id}" class="nav-link" href="#" tabindex="0">Supprimer</a>`
-        }
-
-        const popover = bootstrap.Popover.getOrCreateInstance(span, {
-            'content': content,
-            'html': true,
-            'placement': 'bottom',
-        })
-        popover.show()
-
-        // Lorsqu'on clique sur le lien d'envoi de message privé, on ferme le popover
-        // et on demande à ouvrir le canal privé avec l'auteur⋅rice du message
-        document.getElementById('send-private-message-link-msg-' + message.id).addEventListener('click', event => {
-            event.preventDefault()
-            popover.dispose()
-            socket.send(JSON.stringify({
-                'type': 'start_private_chat',
-                'user_id': message.author_id,
-            }))
-        })
-
-        if (has_right_to_edit) {
-            // Si on a le droit de modifier ou supprimer le message, on enregistre les écouteurs d'événements
-            // Le bouton de modification de message ouvre une boîte de dialogue pour modifier le message
-            document.getElementById('edit-message-' + message.id).addEventListener('click', event => {
-                event.preventDefault()
-                // Fermeture du popover
-                popover.dispose()
-
-                // Ouverture d'une boîte de diaologue afin de modifier le message
-                let new_message = prompt("Modifier le message", message.content)
-                if (new_message) {
-                    // Si le message a été modifié, on envoie la demande de modification au serveur
-                    socket.send(JSON.stringify({
-                        'type': 'edit_message',
-                        'message_id': message.id,
-                        'content': new_message,
-                    }))
-                }
-            })
-
-            // Le bouton de suppression de message demande une confirmation avant de supprimer le message
-            document.getElementById('delete-message-' + message.id).addEventListener('click', event => {
-                event.preventDefault()
-                // Fermeture du popover
-                popover.dispose()
-
-                // Demande de confirmation avant de supprimer le message
-                if (confirm(`Supprimer le message ?\n${message.content}`)) {
-                    socket.send(JSON.stringify({
-                        'type': 'delete_message',
-                        'message_id': message.id,
-                    }))
-                }
-            })
-        }
-    })
-}
-
-/**
- * Passe le chat en version plein écran, ou l'inverse si c'est déjà le cas.
- */
-function toggleFullscreen() {
-    let chatContainer = document.getElementById('chat-container')
-    if (!chatContainer.getAttribute('data-fullscreen')) {
-        // Le chat n'est pas en plein écran.
-        // On le passe en plein écran en le plaçant en avant plan en position absolue
-        // prenant toute la hauteur et toute la largeur
-        chatContainer.setAttribute('data-fullscreen', 'true')
-        chatContainer.classList.add('position-absolute', 'top-0', 'start-0', 'vh-100', 'z-3')
-        window.history.replaceState({}, null, `?fullscreen=1`)
-    }
-    else {
-        // Le chat est déjà en plein écran. On retire les tags CSS correspondant au plein écran.
-        chatContainer.removeAttribute('data-fullscreen')
-        chatContainer.classList.remove('position-absolute', 'top-0', 'start-0', 'vh-100', 'z-3')
-        window.history.replaceState({}, null, `?fullscreen=0`)
-    }
-}
-
-document.addEventListener('DOMContentLoaded', () => {
-    // Lorsqu'on effectue le moindre clic, on ferme les éventuelles popovers ouvertes
-    document.addEventListener('click', removeAllPopovers)
-
-    // Lorsqu'on change entre le tri des canaux par ordre alphabétique et par nombre de messages non lus,
-    // on met à jour l'ordre des canaux
-    document.getElementById('sort-by-unread-switch').addEventListener('change', event => {
-        const sortByUnread = event.target.checked
-        for (let channel of Object.values(channels)) {
-            let item = document.getElementById(`tab-channel-${channel.id}`)
-            if (sortByUnread)
-                // Si on trie par nombre de messages non lus,
-                // on définit l'ordre de l'élément en fonction du nombre de messages non lus
-                // à l'aide d'une propriété CSS
-                item.style.order = `${-channel.unread_messages}`
-            else
-                // Sinon, les canaux sont de base triés par ordre alphabétique
-                item.style.removeProperty('order')
-        }
-
-        // On stocke le mode de tri dans le stockage local
-        localStorage.setItem('chat.sort-by-unread', sortByUnread)
-    })
-
-    // On récupère le mode de tri des canaux depuis le stockage local
-    if (localStorage.getItem('chat.sort-by-unread') === 'true') {
-        document.getElementById('sort-by-unread-switch').checked = true
-        document.getElementById('sort-by-unread-switch').dispatchEvent(new Event('change'))
-    }
-
-    /**
-     * Des données sont reçues depuis le serveur. Elles sont traitées dans cette fonction,
-     * qui a pour but de trier et de répartir dans d'autres sous-fonctions.
-     * @param data Le message reçu.
-     */
-    function processMessage(data) {
-        // On traite le message en fonction de son type
-        switch (data.type) {
-            case 'fetch_channels':
-                setChannels(data.channels)
-                break
-            case 'send_message':
-                receiveMessage(data)
-                break
-            case 'edit_message':
-                editMessage(data)
-                break
-            case 'delete_message':
-                deleteMessage(data)
-                break
-            case 'fetch_messages':
-                receiveFetchedMessages(data)
-                break
-            case 'mark_read':
-                markMessageAsRead(data)
-                break
-            case 'start_private_chat':
-                startPrivateChat(data)
-                break
-            default:
-                // Le type de message est inconnu. On affiche une erreur dans la console.
-                console.log(data)
-                console.error('Unknown message type:', data.type)
-                break
-        }
-    }
-
-    /**
-     * Configuration du socket de chat, permettant de communiquer avec le serveur.
-     * @param nextDelay Correspond au délai de reconnexion en cas d'erreur.
-     *                  Augmente exponentiellement en cas d'erreurs répétées,
-     *                  et se réinitialise à 1s en cas de connexion réussie.
-     */
-    function setupSocket(nextDelay = 1000) {
-        // Ouverture du socket
-        socket = new WebSocket(
-            (document.location.protocol === 'https:' ? 'wss' : 'ws') + '://' + window.location.host + '/ws/chat/'
-        )
-        let socketOpen = false
-
-        // Écoute des messages reçus depuis le serveur
-        socket.addEventListener('message', e => {
-            // Analyse du message reçu en tant que JSON
-            const data = JSON.parse(e.data)
-
-            // Traite le message reçu
-            processMessage(data)
-        })
-
-        // En cas d'erreur, on affiche un message et on réessaie de se connecter après un certain délai
-        // Ce délai double après chaque erreur répétée, jusqu'à un maximum de 2 minutes
-        socket.addEventListener('close', e => {
-            console.error('Chat socket closed unexpectedly, restarting…')
-            setTimeout(() => setupSocket(Math.max(socketOpen ? 1000 : 2 * nextDelay, 120000)), nextDelay)
-        })
-
-        // En cas de connexion réussie, on demande au serveur les derniers messages pour chaque canal
-        socket.addEventListener('open', e => {
-            socketOpen = true
-            socket.send(JSON.stringify({
-                'type': 'fetch_channels',
-            }))
-        })
-    }
-
-    /**
-     * Configuration du swipe pour ouvrir et fermer le sélecteur de canaux.
-     * Fonctionne a priori uniquement sur les écrans tactiles.
-     * Lorsqu'on swipe de la gauche vers la droite, depuis le côté gauche de l'écran, on ouvre le sélecteur de canaux.
-     * Quand on swipe de la droite vers la gauche, on ferme le sélecteur de canaux.
-     */
-    function setupSwipeOffscreen() {
-        // Récupération du sélecteur de canaux
-        const offcanvas = new bootstrap.Offcanvas(document.getElementById('channelSelector'))
-
-        // L'écran a été touché. On récupère la coordonnée X de l'emplacement touché.
-        let lastX = null
-        document.addEventListener('touchstart', (event) => {
-            if (event.touches.length === 1)
-                lastX = event.touches[0].clientX
-        })
-
-        // Le doigt a été déplacé. Selon le nouvel emplacement du doigt, on ouvre ou on ferme le sélecteur de canaux.
-        document.addEventListener('touchmove', (event) => {
-            if (event.touches.length === 1 && lastX !== null) {
-                // L'écran a été touché à un seul doigt, et on a déjà récupéré la coordonnée X touchée.
-                const diff = event.touches[0].clientX - lastX
-                if (diff > window.innerWidth / 10 && lastX < window.innerWidth / 4) {
-                    // Si le déplacement correspond à au moins 10 % de la largeur de l'écran vers la droite
-                    // et que le point de départ se trouve dans le quart gauche de l'écran, alors on ouvre le sélecteur
-                    offcanvas.show()
-                    lastX = null
-                }
-                else if (diff < -window.innerWidth / 10) {
-                    // Si le déplacement correspond à au moins 10 % de la largeur de l'écran vers la gauche,
-                    // alors on ferme le sélecteur
-                    offcanvas.hide()
-                    lastX = null
-                }
-            }
-        })
-
-        // Le doigt a été relâché. On réinitialise la coordonnée X touchée.
-        document.addEventListener('touchend', () => {
-            lastX = null
-        })
-    }
-
-    /**
-     * Configuration du suivi de lecture des messages.
-     * Lorsque l'utilisateur⋅rice scrolle dans la fenêtre de chat, on vérifie quels sont les messages qui sont
-     * visibles à l'écran, et on les marque comme lus.
-     */
-    function setupReadTracker() {
-        // Récupération du conteneur de messages
-        const scrollableContent = document.getElementById('chat-messages')
-        const messagesList = document.getElementById('message-list')
-        let markReadBuffer = []
-        let markReadTimeout = null
-
-        // Lorsqu'on scrolle, on récupère les anciens messages si on est tout en haut,
-        // et on marque les messages visibles comme lus
-        scrollableContent.addEventListener('scroll', () => {
-            if (scrollableContent.clientHeight - scrollableContent.scrollTop === scrollableContent.scrollHeight
-                && !document.getElementById('fetch-previous-messages').classList.contains('d-none')) {
-                // Si l'utilisateur⋅rice est en haut du chat, on récupère la liste des anciens messages
-                fetchPreviousMessages()}
-
-            // On marque les messages visibles comme lus
-            markVisibleMessagesAsRead()
-        })
-
-        // Lorsque les messages stockés sont mis à jour, on vérifie quels sont les messages visibles à marquer comme lus
-        messagesList.addEventListener('updatemessages', () => markVisibleMessagesAsRead())
-
-        /**
-         * Marque les messages visibles à l'écran comme lus.
-         * On récupère pour cela les coordonnées du conteneur de messages ainsi que les coordonnées de chaque message
-         * et on vérifie si le message est visible à l'écran. Si c'est le cas, on le marque comme lu.
-         * Après 3 secondes d'attente après qu'aucun message n'ait été lu,
-         * on envoie la liste des messages lus au serveur.
-         */
-        function markVisibleMessagesAsRead() {
-            // Récupération des coordonnées visibles du conteneur de messages
-            let viewport = scrollableContent.getBoundingClientRect()
-
-            for (let item of messagesList.querySelectorAll('.message')) {
-                let message = messages[selected_channel_id].get(parseInt(item.getAttribute('data-message-id')))
-                if (!message.read) {
-                    // Si le message n'a pas déjà été lu, on récupère ses coordonnées
-                    let rect = item.getBoundingClientRect()
-                    if (rect.top >= viewport.top && rect.bottom <= viewport.bottom) {
-                        // Si les coordonnées sont entièrement incluses dans le rectangle visible, on le marque comme lu
-                        // et comme étant à envoyer au serveur
-                        message.read = true
-                        markReadBuffer.push(message.id)
-                        if (markReadTimeout)
-                            clearTimeout(markReadTimeout)
-                        // 3 secondes après qu'aucun nouveau message n'ait été rajouté, on envoie la liste des messages
-                        // lus au serveur
-                        markReadTimeout = setTimeout(() => {
-                            socket.send(JSON.stringify({
-                                'type': 'mark_read',
-                                'message_ids': markReadBuffer,
-                            }))
-                            markReadBuffer = []
-                            markReadTimeout = null
-                        }, 3000)
-                    }
-                }
-            }
-        }
-
-        // On considère les messages d'ores-et-déjà visibles comme lus
-        markVisibleMessagesAsRead()
-    }
-
-    /**
-     * Configuration de la demande d'installation de l'application en tant qu'application web progressive (PWA).
-     * Lorsque l'utilisateur⋅rice arrive sur la page, on lui propose de télécharger l'application
-     * pour l'ajouter à son écran d'accueil.
-     * Fonctionne uniquement sur les navigateurs compatibles.
-     */
-    function setupPWAPrompt() {
-        let deferredPrompt = null
-
-        window.addEventListener("beforeinstallprompt", (e) => {
-            // Une demande d'installation a été faite. On commence par empêcher l'action par défaut.
-            e.preventDefault()
-            deferredPrompt = e
-
-            // L'installation est possible, on rend visible le bouton de téléchargement
-            // ainsi que le message qui indique c'est possible.
-            let btn = document.getElementById('install-app-home-screen')
-            let alert = document.getElementById('alert-download-chat-app')
-            btn.classList.remove('d-none')
-            alert.classList.remove('d-none')
-            btn.onclick = function () {
-                // Lorsque le bouton de téléchargement est cliqué, on lance l'installation du PWA.
-                deferredPrompt.prompt()
-                deferredPrompt.userChoice.then((choiceResult) => {
-                    if (choiceResult.outcome === 'accepted') {
-                        // Si l'installation a été acceptée, on masque le bouton de téléchargement.
-                        deferredPrompt = null
-                        btn.classList.add('d-none')
-                        alert.classList.add('d-none')
-                    }
-                })
-            }
-        })
-    }
-
-    setupSocket()  // Configuration du Websocket
-    setupSwipeOffscreen()  // Configuration du swipe sur les écrans tactiles pour le sélecteur de canaux
-    setupReadTracker()  // Configuration du suivi de lecture des messages
-    setupPWAPrompt()  // Configuration de l'installateur d'application en tant qu'application web progressive
-})

chat/templates/chat/chat.html

@@ -2,24 +2,11 @@
 
 {% load static %}
 {% load i18n %}
-{% load pipeline %}
-
-{% block extracss %}
-    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
-    {% if TFJM.APP == "TFJM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_tfjm.webmanifest" %}">
-    {% elif TFJM.APP == "ETEAM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_eteam.webmanifest" %}">
-    {% endif %}
-{% endblock %}
-
-{% block content-title %}{% endblock %}
 
 {% block content %}
-    {% include "chat/content.html" %}
 {% endblock %}
 
 {% block extrajavascript %}
-    {# Ce script contient toutes les données pour la gestion du chat. #}
-    {% javascript 'chat' %}
+    {# This script contains all data for the chat management #}
+    <script src="{% static 'chat.js' %}"></script>
 {% endblock %}

chat/templates/chat/content.html

@@ -1,126 +0,0 @@
-{% load i18n %}
-
-<noscript>
-    {# Le chat fonctionne à l'aide d'un script JavaScript, sans JavaScript activé il n'est pas possible d'utiliser le chat. #}
-    {% trans "JavaScript must be enabled on your browser to access chat." %}
-</noscript>
-<div class="offcanvas offcanvas-start" tabindex="-1" id="channelSelector" aria-labelledby="offcanvasTitle">
-    <div class="offcanvas-header">
-        {# Titre du sélecteur de canaux #}
-        <h3 class="offcanvas-title" id="offcanvasTitle">{% trans "Chat channels" %}</h3>
-        <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-    </div>
-    <div class="offcanvas-body">
-        {# Contenu du sélecteur de canaux #}
-        <div class="form-switch form-switch">
-            <input class="form-check-input" type="checkbox" role="switch" id="sort-by-unread-switch">
-            <label class="form-check-label" for="sort-by-unread-switch">{% trans "Sort by unread messages" %}</label>
-        </div>
-        <ul class="list-group list-group-flush" id="nav-channels-tab">
-            {# Liste des différentes catégories, avec les canaux par catégorie #}
-            <li class="list-group-item d-none">
-                {# Canaux généraux #}
-                <h4>{% trans "General channels" %}</h4>
-                <ul class="list-group list-group-flush" id="nav-general-channels-tab"></ul>
-            </li>
-            <li class="list-group-item d-none">
-                {# Canaux liés à un tournoi #}
-                <h4>{% trans "Tournament channels" %}</h4>
-                <ul class="list-group list-group-flush" id="nav-tournament-channels-tab"></ul>
-            </li>
-            <li class="list-group-item d-none">
-                {# Canaux d'équipes #}
-                <h4>{% trans "Team channels" %}</h4>
-                <ul class="list-group list-group-flush" id="nav-team-channels-tab"></ul>
-            </li>
-            <li class="list-group-item d-none">
-                {# Échanges privés #}
-                <h4>{% trans "Private channels" %}</h4>
-                <ul class="list-group list-group-flush" id="nav-private-channels-tab"></ul>
-            </li>
-        </ul>
-    </div>
-</div>
-
-<div class="alert alert-info d-none" id="alert-download-chat-app">
-    {# Lorsque l'application du chat est installable (par exemple sur un Chrome sur Android), on affiche le message qui indique que c'est bien possible. #}
-    {% trans "You can install a shortcut to the chat on your home screen using the download button on the header." %}
-</div>
-
-{# Conteneur principal du chat. #}
-{# Lorsque le chat est en plein écran, on le place en coordonnées absolues, occupant tout l'espace de l'écran. #}
-<div class="card tab-content w-100 mh-100{% if request.GET.fullscreen == '1' or fullscreen %} position-absolute top-0 start-0 vh-100 z-3{% endif %}"
-     style="height: 95vh" id="chat-container">
-    <div class="card-header">
-        <h3>
-        {% if fullscreen %}
-            {# Lorsque le chat est en plein écran, on affiche le bouton de déconnexion. #}
-            {# Le bouton de déconnexion doit être présent dans un formulaire. Le formulaire doit inclure toute la ligne. #}
-            <form action="{% url 'chat:logout' %}" method="post">
-                {% csrf_token %}
-        {% endif %}
-            {# Bouton qui permet d'ouvrir le sélecteur de canaux #}
-            <button class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#channelSelector"
-                    aria-controls="channelSelector" aria-expanded="false" aria-label="Toggle channel selector">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-
-            <span id="channel-title"></span> {# Titre du canal sélectionné #}
-            {% if not fullscreen %}
-                {# Dans le cas où on est pas uniquement en plein écran (cas de l'application), on affiche les boutons pour passer en ou quitter le mode plein écran. #}
-                <button class="btn float-end" type="button" onclick="toggleFullscreen()" title="{% trans "Toggle fullscreen mode" %}">
-                    <i class="fas fa-expand"></i>
-                </button>
-            {% else %}
-                {# Le bouton de déconnexion n'est affiché que sur l'application. #}
-                <button class="btn float-end" title="{% trans "Log out" %}">
-                    <i class="fas fa-sign-out-alt"></i>
-                </button>
-            {% endif %}
-            {# On affiche le bouton d'installation uniquement dans le cas où l'application est installable sur l'écran d'accueil. #}
-            <button class="btn float-end d-none" type="button" id="install-app-home-screen" title="{% trans "Install app on home screen" %}">
-                <i class="fas fa-download"></i>
-            </button>
-            {% if fullscreen %}
-                </form>
-            {% endif %}
-        </h3>
-    </div>
-
-    {# Contenu de la carte, contenant la liste des messages. La liste des messages est affichée à l'envers pour avoir un scroll plus cohérent. #}
-    <div class="card-body d-flex flex-column-reverse flex-grow-0 overflow-y-scroll" id="chat-messages">
-        {# Correspond à la liste des messages à afficher. #}
-        <ul class="list-group list-group-flush" id="message-list"></ul>
-        {# S'il y a des messages à récupérer, on affiche un lien qui permet de récupérer les anciens messages. #}
-        <div class="text-center d-none" id="fetch-previous-messages">
-            <a href="#" class="nav-link" onclick="event.preventDefault(); fetchPreviousMessages()">
-                {% trans "Fetch previous messages…" %}
-            </a>
-            <hr>
-        </div>
-    </div>
-    
-    {# Pied de la carte, contenant le formulaire pour envoyer un message. #}
-    <div class="card-footer mt-auto">
-        {# Lorsqu'on souhaite envoyer un message, on empêche le formulaire de s'envoyer et on envoie le message par websocket. #}
-        <form onsubmit="event.preventDefault(); sendMessage()">
-            <div class="input-group">
-                <label for="input-message" class="input-group-text">
-                    <i class="fas fa-comment"></i>
-                </label>
-                {# Affichage du contrôleur de texte pour rédiger le message à envoyer. #}
-                <input type="text" class="form-control" id="input-message" placeholder="{% trans "Send message…" %}" autofocus autocomplete="off">
-                <button class="input-group-text btn btn-success" type="submit">
-                    <i class="fas fa-paper-plane"></i>
-                </button>
-            </div>
-        </form>
-    </div>
-</div>
-
-<script>
-    {# Récupération de l'utilisateur⋅rice courant⋅e afin de pouvoir effectuer des tests plus tard. #}
-    const USER_ID = {{ request.user.id }}
-    {# Récupération du statut administrateur⋅rice de l'utilisateur⋅rice connecté⋅e afin de pouvoir effectuer des tests plus tard. #}
-    const IS_ADMIN = {{ request.user.registration.is_admin|yesno:"true,false" }}
-</script>

chat/templates/chat/fullscreen.html

@@ -1,47 +0,0 @@
-{% load i18n pipeline static %}
-
-<!DOCTYPE html>
-{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
-<html lang="{{ LANGUAGE_CODE|default:"fr" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    {% if TFJM.APP == "TFJM" %}
-        <title>{% trans "TFJM² Chat" %}</title>
-        <meta name="description" content="{% trans "TFJM² Chat" %}">
-    {% elif TFJM.APP == "ETEAM" %}
-        <title>{% trans "ETEAM Chat" %}</title>
-        <meta name="description" content="{% trans "ETEAM Chat" %}">
-    {% endif %}
-
-    {# Favicon #}
-    <link rel="shortcut icon" href="{% static "favicon.ico" %}">
-    <meta name="theme-color" content="#ffffff">
-
-    {# Bootstrap CSS #}
-    <link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" type="text/css">
-    {# Fontawesome CSS #}
-    <link href="{% static "fontawesome/css/all.min.css" %}" rel="stylesheet" type="text/css">
-    <link href="{% static "fontawesome/css/v4-shims.css" %}">
-    {# bootstrap-select CSS #}
-    <link href="{% static "bootstrap-select/css/bootstrap-select.min.css" %}" rel="stylesheet" type="text/css">
-
-    {# Bootstrap JavaScript #}
-    <script type="application/javascript" src="{% static "bootstrap/js/bootstrap.bundle.min.js" %}" charset="utf-8"></script>
-
-    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
-    {% if TFJM.APP == "TFJM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_tfjm.webmanifest" %}">
-    {% elif TFJM.APP == "ETEAM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_eteam.webmanifest" %}">
-    {% endif %}
-</head>
-<body class="d-flex w-100 h-100 flex-column">
-{% include "chat/content.html" with fullscreen=True %}
-
-{# Inclusion du script permettant de gérer le thème sombre et le thème clair #}
-{% javascript 'theme' %}
-{# Inclusion du script gérant le chat #}
-{% javascript 'chat' %}
-</body>
-</html>

chat/templates/chat/login.html

@@ -1,43 +0,0 @@
-{% load i18n pipeline static %}
-
-<!DOCTYPE html>
-{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
-<html lang="{{ LANGUAGE_CODE|default:"fr" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <title>
-        {% trans "Chat" %} - {% trans "Log in" %}
-    </title>
-    <meta name="description" content="{% trans "Chat" %}">
-
-    {# Favicon #}
-    <link rel="shortcut icon" href="{% static "favicon.ico" %}">
-    <meta name="theme-color" content="#ffffff">
-
-    {# Bootstrap CSS #}
-    <link href="{% static "bootstrap/css/bootstrap.min.css" %}" rel="stylesheet" type="text/css">
-    {# Fontawesome CSS #}
-    <link href="{% static "fontawesome/css/all.min.css" %}" rel="stylesheet" type="text/css">
-    <link href="{% static "fontawesome/css/v4-shims.css" %}">
-
-    {# Bootstrap JavaScript #}
-    <script type="application/javascript" src="{% static "bootstrap/js/bootstrap.bundle.min.js" %}" charset="utf-8"></script>
-
-    {# Webmanifest PWA permettant l'installation de l'application sur un écran d'accueil, pour navigateurs supportés #}
-    {% if TFJM.APP == "TFJM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_tfjm.webmanifest" %}">
-    {% elif TFJM.APP == "ETEAM" %}
-        <link rel="manifest" href="{% static "tfjm/chat_eteam.webmanifest" %}">
-    {% endif %}
-</head>
-<body class="d-flex w-100 h-100 flex-column">
-    <div class="container">
-        <h1>{% trans "Log in" %}</h1>
-        {% include "registration/includes/login.html" %}
-    </div>
-
-{# Inclusion du script permettant de gérer le thème sombre et le thème clair #}
-{% javascript 'theme' %}
-</body>
-</html>

chat/urls.py

@@ -1,18 +1,13 @@
 # Copyright (C) 2024 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.contrib.auth.views import LoginView, LogoutView
 from django.urls import path
-from django.utils.translation import gettext_lazy as _
-from tfjm.views import LoginRequiredTemplateView
+
+from .views import ChatView
+
 
 app_name = 'chat'
 
 urlpatterns = [
-    path('', LoginRequiredTemplateView.as_view(template_name="chat/chat.html",
-                                               extra_context={'title': _("Chat")}), name='chat'),
-    path('fullscreen/', LoginRequiredTemplateView.as_view(template_name="chat/fullscreen.html", login_url='chat:login'),
-         name='fullscreen'),
-    path('login/', LoginView.as_view(template_name="chat/login.html"), name='login'),
-    path('logout/', LogoutView.as_view(next_page='chat:fullscreen'), name='logout'),
+    path('', ChatView.as_view(), name='chat'),
 ]

chat/views.py

@@ -0,0 +1,13 @@
+# Copyright (C) 2024 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.views.generic import TemplateView
+
+
+class ChatView(LoginRequiredMixin, TemplateView):
+    """
+    This view is the main interface of the chat system, which is working
+    with Javascript and websockets.
+    """
+    template_name = "chat/chat.html"

docs/dev/install.rst

@@ -60,7 +60,7 @@ Dans le fichier ``docker-compose.yml``, configurer :
         networks:
           - tfjm
         labels:
-          - "traefik.http.routers.inscription-tfjm2.rule=Host(`inscription.tfjm.org`, `inscriptions.tfjm.org`, `plateforme.tfjm.org`)"
+          - "traefik.http.routers.inscription-tfjm2.rule=Host(`inscription.tfjm.org`, `plateforme.tfjm.org`)"
           - "traefik.http.routers.inscription-tfjm2.entrypoints=websecure"
           - "traefik.http.routers.inscription-tfjm2.tls.certresolver=mytlschallenge"
 

docs/dev/transition.rst

@@ -1,211 +0,0 @@
-Transition d'années
-===================
-
-Entre deux sessions du TFJM², certaines opérations doivent être effectuées chaque année,
-afin de réinitialiser les données et de passer à l'année suivante.
-
-Réinitialisation de la base de données
---------------------------------------
-
-Conservation des autorisations de droit à l'image
-"""""""""""""""""""""""""""""""""""""""""""""""""
-
-La base de données du TFJM² est supprimée chaque année, avant chaque tournoi. Il n'y a
-pas de conservation de données personnelles à l'exception des autorisations de droit
-à l'image qui doivent être conservées pour des raisons légales pendant 5 ans.
-
-Elles doivent alors être stockées sur Owncloud. Pour cela, il faut commencer par créer
-un dossier dans Owncloud, qui stockera lesdites autorisations.
-
-Rendez-vous ensuite dans le conteneur Docker et exécuter le script :
-
-.. code:: bash
-
-   ./manage.py export_photo_authorizations
-
-Cela a pour effet de générer un dossier dans ``output/photo_authorizations``, qui contient
-un dossier par équipe avec les différentes autorisations de droit à l'image.
-
-Il faut maintenant récupérer ce dossier. Sortir du conteneur, et exécuter dans ``/srv/TFJM`` :
-
-.. code:: bash
-
-   sudo docker cp tfjm-inscription-1:/code/output/photo_authorizations .
-   sudo mv photo_authorizations/* "data/owncloud/data/Emmy/files/Autorisations de droit à l'image/Autorisations de droit à l'image 2024/"
-   sudo chown -R www-data:root "data/owncloud/data/Emmy/files/Autorisations de droit à l'image/Autorisations de droit à l'image 2024"
-   sudo rmdir photo_authorizations
-
-Il faut enfin réactualiser Owncloud. Exécuter en tant que www-data :
-
-.. code:: bash
-
-   sudo docker compose exec -u www-data cloud php occ files:scan Emmy
-
-Vérifiez enfin que les fichiers sont bien accessibles dans l'interface Web.
-Ne pas oublier enfin de partager le dossier.
-
-
-Sauvegarde de secours
-"""""""""""""""""""""
-
-Si les données doivent être supprimées, il peut être utile de réaliser une sauvegarde à conserver
-quelques mois.
-
-.. danger::
-
-   Cette sauvegarde ne doit être faite qu'à des fins utiles et supprimée dès que plus nécessaire.
-
-Sauvegardez alors le dossier ``/srv/TFJM/data/inscription/media`` et exportez la base de données :
-
-.. code:: bash
-
-   sudo cp -r data/inscription/media data/inscription/media-2024
-   sudo docker compose exec -u postgres postgres pg_dump inscription_tfjm | sudo tee inscription_tfjm_bkp_2024.sql > /dev/null
-
-
-Réinitialisation effective
-""""""""""""""""""""""""""
-
-Il est désormais possible de réinitialiser la base de données, après avoir éteint le serveur :
-
-.. code:: bash
-
-   sudo docker compose stop inscription
-   sudo rm -r data/inscription/media/*
-   sudo docker compose exec -u postgres postgres dropdb inscription_tfjm
-   sudo docker compose exec -u postgres postgres createdb -O inscription_tfjm inscription_tfjm
-
-Redémarrez enfin le serveur (les migrations seront créées automatiquement)
-et créez un nouveau compte administrateur⋅rice :
-
-.. code:: bash
-
-   sudo docker compose up -d inscription
-   sudo docker compose exec inscription bash
-   ./manage.py createsuperuser
-
-Vérifiez finalement le bon fonctionnement du site.
-
-
-Sites Django
-""""""""""""
-
-Après avoir réinitialisé les données, il faut mettre à jour le site Django, qui permettra
-d'avoir notamment des noms de domaine correct dans les mails envoyés.
-
-Se connecter alors sur le site réouvert, puis dans la partie « Administration », chercher la
-section « Sites » et modifier l'unique site présent. Vous pouvez ensuite effectuer les modifications
-à réaliser.
-
-
-Nouveaux paramètres pour la nouvelle année
-------------------------------------------
-
-Certains paramètres doivent être modifiés pour prendre en compte la nouvelle année.
-
-Dates d'inscription
-"""""""""""""""""""
-
-Les inscriptions sont permises uniquement entre l'ouverture et la fermeture, afin d'éviter
-d'avoir des personnes s'inscrivant en dehors du TFJM².
-
-Pour cela, dans votre projet local, rendez-vous dans ``tfjm/settings.py`` et cherchez
-le paramètre ``REGISTRATION_DATES`` (pour le TFJM²). Modifiez alors les sous-paramètres
-``open`` et ``close`` pour définir les dates pendant lesquelles les inscriptions des
-participant⋅es sont permises pour cette nouvelle année. Elles doivent être au format ISO.
-
-Exemple pour l'année 2025 où les inscriptions ouvrent au 8 janvier midi pour fermer
-le 2 mars à 22h :
-
-.. code:: python
-
-    REGISTRATION_DATES = dict(
-        open=datetime.fromisoformat("2025-01-15T12:00:00+0100"),
-        close=datetime.fromisoformat("2025-03-02T22:00:00+0100"),
-    )
-
-Il faudra ensuite commiter la modification et redémarrer le serveur pour que la modification
-prenne effet.
-
-
-Noms des problèmes
-""""""""""""""""""
-
-Toujours dans la configuration dans ``tfjm/settings.py``, la liste des problèmes doit être
-modifiée pour que leurs noms s'affichent correctement lors du tirage au sort.
-
-Cherchez le paramètre ``PROBLEMS`` et mettez alors à jour la liste, dans l'ordre, des noms
-des problèmes.
-
-À nouveau, il est nécessaire de commiter la modification et redémarrer le serveur.
-
-
-Paramètres des tournois
-"""""""""""""""""""""""
-
-Il faut enfin paramétrer les différentes dates des tournois.
-
-Pour cela, connectez-vous sur la plateforme (avec un compte administrateur⋅rice), et dans l'onglet
-« Tournois », vous pouvez créer les différents tournois avec les différentes dates pour chaque tournoi.
-Plus d'information sur les différents paramètres dans la `section concernée
-<../orga.html#creer-un-tournoi>`_
-
-
-À la fin du tournoi
--------------------
-
-Lorsque le tournoi est terminé, il faut récupérer les informations à stocker de façon pérenne,
-notamment les solutions des équipes, les résultats ainsi que les autorisation de droit à l'image
-comme indiqué précédemment.
-
-Conservation des autorisations de droit à l'image
-"""""""""""""""""""""""""""""""""""""""""""""""""
-
-Se référer à la section plus haut.
-
-
-Conservation des solutions des équipes
-""""""""""""""""""""""""""""""""""""""
-
-Le processus est très similaire à la conservation des autorisations de droit à l'image.
-Il faut d'abord, dans le conteneur, lancer le script dédié pour récupérer les solutions
-dans ``/code/output/solutions`` :
-
-.. code:: bash
-
-   ./manage.py export_solutions
-
-On sort du conteneur et on récupère les solutions pour les déplacer dans Owncloud :
-
-.. code:: bash
-
-   sudo docker cp tfjm-inscription-1:/code/output/solutions .
-   sudo mv solutions/* "data/owncloud/data/Emmy/files/Solutions écrites 2024/"
-   sudo chown -R www-data:root "data/owncloud/data/Emmy/files/Solutions écrites 2024"
-   sudo rmdir solutions
-
-Il faut enfin réactualiser Owncloud. Exécuter en tant que www-data :
-
-.. code:: bash
-
-   sudo docker compose exec -u www-data cloud php occ files:scan Emmy
-
-Vérifiez enfin que les fichiers sont bien accessibles dans l'interface Web.
-Ne pas oublier enfin de partager le dossier.
-
-
-Génération de la page de résultats Wordpress
-""""""""""""""""""""""""""""""""""""""""""""
-
-Pour finir, il est possible de récupérer les notes pour chaque tournoi afin de générer
-la page Wordpress dans la section *Éditions précédentes*.
-
-Il suffit de lancer le script ``./manage.py export_results``, qui donne le texte brut pour
-Wordpress à ajouter sur la page de l'édition qui vient de se terminer dans l'onglet
-*Éditions précédentes*.
-
-Pensez à bien inclure sur cette page le lien vers les problèmes de l'année, ainsi que le
-lien vers le dossier partagé dans le Owncloud concernant les solutions des équipes.
-
-Assurez-vous de mettre à jour la page *Éditions précédentes* afin d'inclure le lien vers
-la page nouvellement créée.

docs/index.rst

@@ -21,4 +21,3 @@ administrateur⋅rice.
 
    dev/index
    dev/install
-   dev/transition

draw/consumers.py

@@ -9,7 +9,6 @@ from random import randint, shuffle
 from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 from django.conf import settings
-from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.utils import translation
 from django.utils.translation import gettext_lazy as _
@@ -45,8 +44,6 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         We accept only if this is a user of a team of the associated tournament, or a volunteer
         of the tournament.
         """
-        if '_fake_user_id' in self.scope['session']:
-            self.scope['user'] = await User.objects.aget(pk=self.scope['session']['_fake_user_id'])
 
         # Fetch the registration of the current user
         user = self.scope['user']
@@ -122,8 +119,6 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         self.tournament = await Tournament.objects.filter(pk=self.tournament_id)\
             .prefetch_related('draw__current_round__current_pool__current_team__participation__team').aget()
 
-        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-
         match content['type']:
             case 'set_language':
                 # Update the translation language
@@ -185,7 +180,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         # Create the draw
         draw = await Draw.objects.acreate(tournament=self.tournament)
         r1 = None
-        for i in range(1, settings.NB_ROUNDS + 1):
+        for i in [1, 2]:
             # Create the round
             r = await Round.objects.acreate(draw=draw, number=i)
             if i == 1:
@@ -235,8 +230,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
                                             {'tid': self.tournament_id, 'type': 'draw.notify',
                                              'title': 'Tirage au sort du TFJM²',
-                                             'body': _("The draw of tournament {tournament} started!")
-                                            .format(tournament=self.tournament.name)})
+                                             'body': "Le tirage au sort du tournoi de "
+                                                     f"{self.tournament.name} a commencé !"})
 
     async def draw_start(self, content) -> None:
         """
@@ -405,8 +400,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                     await self.channel_layer.group_send(
                         f"team-{dup.participation.team.trigram}",
                         {'tid': self.tournament_id, 'type': 'draw.notify', 'title': 'Tirage au sort du TFJM²',
-                         'body': _("Your dice score is identical to the one of one or multiple teams. "
-                                   "Please relaunch it.")}
+                         'body': 'Votre score de dé est identique à celui de une ou plusieurs équipes. '
+                                 'Veuillez le relancer.'}
                     )
                 # Alert the tournament
                 await self.channel_layer.group_send(
@@ -419,7 +414,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
 
         return error
 
-    async def process_dice_select_poules(self):  # noqa: C901
+    async def process_dice_select_poules(self):
         """
         Called when all teams launched their dice.
         Place teams into pools and order their passage.
@@ -450,7 +445,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         # We can add a joker team if there is not already a team in the pool that was in the same pool
         # in the first round, and such that the number of such jokers is exactly the free space of the current pool.
         # Exception: if there is one only pool with 5 teams, we exchange the first and the last teams of the pool.
-        if not self.tournament.final and settings.TFJM_APP == "TFJM":
+        if not self.tournament.final:
             tds_copy = sorted(tds, key=lambda td: (td.passage_index, -td.pool.letter,))
             jokers = [td for td in tds if td.passage_index == 4]
             round2 = await self.tournament.draw.round_set.filter(number=2).aget()
@@ -504,12 +499,12 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         await self.tournament.draw.current_round.asave()
 
         # Display dice result in the header of the information alert
-        trigrams = ", ".join(f"<strong>{td.participation.team.trigram}</strong> ({td.passage_dice})" for td in tds)
-        msg = _("The dice results are the following: {trigrams}. "
-                "The passage order and the compositions of the different pools are displayed on the side. "
-                "The passage orders for the first round are determined from the dice scores, in increasing order. "
-                "For the second round, the passage orders are determined from the passage orders of the first round.") \
-            .format(trigrams=trigrams)
+        msg = "Les résultats des dés sont les suivants : "
+        msg += ", ".join(f"<strong>{td.participation.team.trigram}</strong> ({td.passage_dice})" for td in tds)
+        msg += ". L'ordre de passage et les compositions des différentes poules sont affiché⋅es sur le côté. "
+        msg += "Les ordres de passage pour le premier tour sont déterminés à partir des scores des dés, "
+        msg += "dans l'ordre croissant. Pour le deuxième tour, les ordres de passage sont déterminés à partir "
+        msg += "des ordres de passage du premier tour."
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
@@ -533,18 +528,18 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                             {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
                                              'visible': True})
 
-        # 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,
-                                                 'poules': [
-                                                     {
-                                                         'letter': pool.get_letter_display(),
-                                                         'teams': await pool.atrigrams(),
-                                                     }
-                                                     async for pool in next_round.pool_set.order_by('letter').all()
-                                                 ]})
+        # First send the second pool to have the good team order
+        r2 = await self.tournament.draw.round_set.filter(number=2).aget()
+        await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
+                                            {'tid': self.tournament_id, 'type': 'draw.send_poules',
+                                             'round': r2.number,
+                                             'poules': [
+                                                 {
+                                                     'letter': pool.get_letter_display(),
+                                                     'teams': await pool.atrigrams(),
+                                                 }
+                                                 async for pool in r2.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',
                                              'round': r.number,
@@ -612,8 +607,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         # Notify the team that it can draw a problem
         await self.channel_layer.group_send(f"team-{tds[0].participation.team.trigram}",
                                             {'tid': self.tournament_id, 'type': 'draw.notify',
-                                             'title': _("Your turn!"),
-                                             'body': _("It's your turn to draw a problem!")})
+                                             'title': "À votre tour !",
+                                             'body': "C'est à vous de tirer un nouveau problème !"})
 
     async def select_problem(self, **kwargs):
         """
@@ -633,7 +628,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 .prefetch_related('team').aget()
             # Ensure that the user can draws a problem at this time
             if participation.id != td.participation_id:
-                return await self.alert(_("This is not your turn."), 'danger')
+                return await self.alert("This is not your turn.", 'danger')
 
         while True:
             # Choose a random problem
@@ -704,20 +699,19 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 .prefetch_related('team').aget()
             # Ensure that the user can accept a problem at this time
             if participation.id != td.participation_id:
-                return await self.alert(_("This is not your turn."), 'danger')
+                return await self.alert("This is not your turn.", 'danger')
 
         td.accepted = td.purposed
         td.purposed = None
         await td.asave()
 
         trigram = td.participation.team.trigram
-        msg = _("The team <strong>{trigram}</strong> accepted the problem <string>{problem}</strong>: "
-                "{problem_name}. ").format(trigram=trigram, problem=td.accepted,
-                                           problem_name=settings.PROBLEMS[td.accepted - 1])
+        msg = f"L'équipe <strong>{trigram}</strong> a accepté le problème <strong>{td.accepted} : " \
+              f"{settings.PROBLEMS[td.accepted - 1]}</strong>. "
         if pool.size == 5 and await pool.teamdraw_set.filter(accepted=td.accepted).acount() < 2:
-            msg += _("One team more can accept this problem.")
+            msg += "Une équipe peut encore l'accepter."
         else:
-            msg += _("No team can accept this problem anymore.")
+            msg += "Plus personne ne peut l'accepter."
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
@@ -752,8 +746,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
             # Notify the team that it can draw a problem
             await self.channel_layer.group_send(f"team-{new_trigram}",
                                                 {'tid': self.tournament_id, 'type': 'draw.notify',
-                                                 'title': _("Your turn!"),
-                                                 'body': _("It's your turn to draw a problem!")})
+                                                 'title': "À votre tour !",
+                                                 'body': "C'est à vous de tirer un nouveau problème !"})
         else:
             # Pool is ended
             await self.end_pool(pool)
@@ -811,8 +805,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 'problems': [td.accepted async for td in pool.team_draws],
             })
 
-        msg += "<br><br>" + _("The draw of the pool {pool} is ended. The summary is below.") \
-            .format(pool=f"{pool.get_letter_display()}{r.number}")
+        msg += f"<br><br>Le tirage de la poule {pool.get_letter_display()}{r.number} est terminé. " \
+               f"Le tableau récapitulatif est en bas."
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
@@ -829,8 +823,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 # Notify the team that it can draw a dice
                 await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
                                                     {'tid': self.tournament_id, 'type': 'draw.notify',
-                                                     'title': _("Your turn!"),
-                                                     'body': _("It's your turn to launch the dice!")})
+                                                     'title': "À votre tour !",
+                                                     'body': "C'est à vous de lancer le dé !"})
 
             await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
                                                 {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
@@ -846,11 +840,11 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         """
         msg = self.tournament.draw.last_message
 
-        if r.number < settings.NB_ROUNDS and not self.tournament.final and settings.TFJM_APP == "TFJM":
+        if r.number == 1 and not self.tournament.final:
             # Next round
-            next_round = await self.tournament.draw.round_set.filter(number=r.number + 1).aget()
-            self.tournament.draw.current_round = next_round
-            msg += "<br><br>" + _("The draw of the round {round} is ended.").format(round=r.number)
+            r2 = await self.tournament.draw.round_set.filter(number=2).aget()
+            self.tournament.draw.current_round = r2
+            msg += "<br><br>Le tirage au sort du tour 1 est terminé."
             self.tournament.draw.last_message = msg
             await self.tournament.draw.asave()
 
@@ -863,26 +857,26 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 # Notify the team that it can draw a dice
                 await self.channel_layer.group_send(f"team-{participation.team.trigram}",
                                                     {'tid': self.tournament_id, 'type': 'draw.notify',
-                                                     'title': _("Your turn!"),
-                                                     'body': _("It's your turn to launch the dice!")})
+                                                     'title': "À votre tour !",
+                                                     'body': "C'est à vous de lancer le dé !"})
 
             # Reorder dices
             await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
                                                 {'tid': self.tournament_id, 'type': 'draw.send_poules',
-                                                 'round': next_round.number,
+                                                 'round': r2.number,
                                                  'poules': [
                                                      {
                                                          'letter': pool.get_letter_display(),
                                                          'teams': await pool.atrigrams(),
                                                      }
-                                                     async for pool in next_round.pool_set.order_by('letter').all()
+                                                     async for pool in r2.pool_set.order_by('letter').all()
                                                  ]})
 
             # The passage order for the second round is already determined by the first round
             # Start the first pool of the second round
-            p1: Pool = await next_round.pool_set.filter(letter=1).aget()
-            next_round.current_pool = p1
-            await next_round.asave()
+            p1: Pool = await r2.pool_set.filter(letter=1).aget()
+            r2.current_pool = p1
+            await r2.asave()
 
             async for td in p1.teamdraw_set.prefetch_related('participation__team').all():
                 await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
@@ -891,9 +885,9 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
             await self.channel_layer.group_send(f"volunteer-{self.tournament.id}",
                                                 {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
                                                  'visible': True})
-        elif r.number == 1 and (self.tournament.final or not settings.HAS_FINAL):
+        elif r.number == 1 and self.tournament.final:
             # For the final tournament, we wait for a manual update between the two rounds.
-            msg += "<br><br>" + _("The draw of the first round is ended.")
+            msg += "<br><br>Le tirage au sort du tour 1 est terminé."
             self.tournament.draw.last_message = msg
             await self.tournament.draw.asave()
 
@@ -922,7 +916,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 .prefetch_related('team').aget()
             # Ensure that the user can reject a problem at this time
             if participation.id != td.participation_id:
-                return await self.alert(_("This is not your turn."), 'danger')
+                return await self.alert("This is not your turn.", 'danger')
 
         # Add the problem to the rejected problems list
         problem = td.purposed
@@ -932,20 +926,19 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         td.purposed = None
         await td.asave()
 
-        remaining = len(settings.PROBLEMS) - settings.RECOMMENDED_SOLUTIONS_COUNT - len(td.rejected)
+        remaining = len(settings.PROBLEMS) - 5 - len(td.rejected)
 
         # Update messages
         trigram = td.participation.team.trigram
-        msg = _("The team <strong>{trigram}</strong> refused the problem <strong>{problem}</strong>: "
-                "{problem_name}.").format(trigram=trigram, problem=problem,
-                                          problem_name=settings.PROBLEMS[problem - 1]) + " "
+        msg = f"L'équipe <strong>{trigram}</strong> a refusé le problème <strong>{problem} : " \
+              f"{settings.PROBLEMS[problem - 1]}</strong>. "
         if remaining >= 0:
-            msg += _("It remains {remaining} refusals without penalty.").format(remaining=remaining)
+            msg += f"Il lui reste {remaining} refus sans pénalité."
         else:
             if already_refused:
-                msg += _("This problem was already refused by this team.")
+                msg += "Cela n'ajoute pas de pénalité."
             else:
-                msg += _("It adds a 25% penalty on the coefficient of the oral defense.")
+                msg += "Cela ajoute une pénalité de 25&nbsp;% sur le coefficient de l'oral de la défense."
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
@@ -988,8 +981,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         # Notify the team that it can draw a problem
         await self.channel_layer.group_send(f"team-{new_trigram}",
                                             {'tid': self.tournament_id, 'type': 'draw.notify',
-                                             'title': _("Your turn!"),
-                                             'body': _("It's your turn to draw a problem!")})
+                                             'title': "À votre tour !",
+                                             'body': "C'est à vous de tirer un nouveau problème !"})
 
     @ensure_orga
     async def export(self, **kwargs):
@@ -1021,49 +1014,44 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         if not await Draw.objects.filter(tournament=self.tournament).aexists():
             return await self.alert(_("The draw has not started yet."), 'danger')
 
-        if not self.tournament.final and settings.TFJM_APP == "TFJM":
+        if not self.tournament.final:
             return await self.alert(_("This is only available for the final tournament."), 'danger')
 
-        r2 = await self.tournament.draw.round_set.filter(number=self.tournament.draw.current_round.number + 1).aget()
+        r2 = await self.tournament.draw.round_set.filter(number=2).aget()
         self.tournament.draw.current_round = r2
-        if settings.TFJM_APP == "TFJM":
-            msg = str(_("The draw of the round {round} is starting. "
-                        "The passage order is determined from the ranking of the first round, "
-                        "in order to mix the teams between the two days.").format(round=r2.number))
-        else:
-            msg = str(_("The draw of the round {round} is starting. "
-                        "The passage order is another time randomly drawn.").format(round=r2.number))
+        msg = "Le tirage au sort pour le tour 2 va commencer. " \
+              "L'ordre de passage est déterminé à partir du classement du premier tour, " \
+              "de sorte à mélanger les équipes entre les deux jours."
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
         # Send notification to everyone
         await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
                                             {'tid': self.tournament_id, 'type': 'draw.notify',
-                                             'title': _("Draw") + " " + settings.APP_NAME,
-                                             'body': str(_("The draw of the second round is starting!"))})
+                                             'title': 'Tirage au sort du TFJM²',
+                                             'body': "Le tirage au sort pour le second tour de la finale a commencé !"})
 
-        if settings.TFJM_APP == "TFJM":
-            # Set the first pool of the second round as the active pool
-            pool = await Pool.objects.filter(round=self.tournament.draw.current_round, letter=1).aget()
-            r2.current_pool = pool
-            await r2.asave()
+        # Set the first pool of the second round as the active pool
+        pool = await Pool.objects.filter(round=self.tournament.draw.current_round, letter=1).aget()
+        r2.current_pool = pool
+        await r2.asave()
 
-            # Fetch notes from the first round
-            notes = dict()
-            async for participation in self.tournament.participations.filter(valid=True).prefetch_related('team').all():
-                notes[participation] = sum([await pool.aaverage(participation)
-                                            async for pool in self.tournament.pools.filter(participations=participation)
-                                            .prefetch_related('passages')])
-            # Sort notes in a decreasing order
-            ordered_participations = sorted(notes.keys(), key=lambda x: -notes[x])
-            # Define pools and passage orders from the ranking of the first round
-            async for pool in r2.pool_set.order_by('letter').all():
-                for i in range(pool.size):
-                    participation = ordered_participations.pop(0)
-                    td = await TeamDraw.objects.aget(round=r2, participation=participation)
-                    td.pool = pool
-                    td.passage_index = i
-                    await td.asave()
+        # Fetch notes from the first round
+        notes = dict()
+        async for participation in self.tournament.participations.filter(valid=True).prefetch_related('team').all():
+            notes[participation] = sum([await pool.aaverage(participation)
+                                        async for pool in self.tournament.pools.filter(participations=participation)
+                                        .prefetch_related('passages')])
+        # Sort notes in a decreasing order
+        ordered_participations = sorted(notes.keys(), key=lambda x: -notes[x])
+        # Define pools and passage orders from the ranking of the first round
+        async for pool in r2.pool_set.order_by('letter').all():
+            for i in range(pool.size):
+                participation = ordered_participations.pop(0)
+                td = await TeamDraw.objects.aget(round=r2, participation=participation)
+                td.pool = pool
+                td.passage_index = i
+                await td.asave()
 
         # Send pools to users
         await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
@@ -1083,22 +1071,16 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 f"tournament-{self.tournament.id}",
                 {'tid': self.tournament_id, 'type': 'draw.dice', 'team': participation.team.trigram, 'result': None})
 
-        if settings.TFJM_APP == "TFJM":
-            async for td in r2.current_pool.team_draws.prefetch_related('participation__team'):
-                await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
-                                                    {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
-                                                     'visible': True})
+        async for td in r2.current_pool.team_draws.prefetch_related('participation__team'):
+            await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
+                                                {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
+                                                 'visible': True})
 
-                # Notify the team that it can draw a problem
-                await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
-                                                    {'tid': self.tournament_id, 'type': 'draw.notify',
-                                                     'title': _("Your turn!"),
-                                                     'body': _("It's your turn to draw a problem!")})
-        else:
-            async for td in r2.team_draws.prefetch_related('participation__team'):
-                await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
-                                                    {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
-                                                     'visible': True})
+            # Notify the team that it can draw a problem
+            await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
+                                                {'tid': self.tournament_id, 'type': 'draw.notify',
+                                                 'title': "À votre tour !",
+                                                 'body': "C'est à vous de tirer un nouveau problème !"})
 
         await self.channel_layer.group_send(f"volunteer-{self.tournament.id}",
                                             {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
@@ -1113,7 +1095,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
                                             {'tid': self.tournament_id, 'type': 'draw.set_active',
                                              'round': r2.number,
-                                             'pool': r2.current_pool.get_letter_display() if r2.current_pool else None})
+                                             'pool': r2.current_pool.get_letter_display()})
 
     @ensure_orga
     async def cancel_last_step(self, **kwargs):
@@ -1387,21 +1369,32 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                                      'round': r.number,
                                                      'team': td.participation.team.trigram,
                                                      'problem': td.accepted})
-            elif r.number >= 2 and settings.TFJM_APP == "TFJM":
+            elif r.number == 2:
                 if not self.tournament.final:
                     # Go to the previous round
-                    previous_round = await self.tournament.draw.round_set \
-                        .prefetch_related('current_pool__current_team__participation__team').aget(number=r.number - 1)
-                    self.tournament.draw.current_round = previous_round
+                    r1 = await self.tournament.draw.round_set \
+                        .prefetch_related('current_pool__current_team__participation__team').aget(number=1)
+                    self.tournament.draw.current_round = r1
                     await self.tournament.draw.asave()
 
-                    async for td in previous_round.team_draws.prefetch_related('participation__team').all():
+                    async for td in r1.team_draws.prefetch_related('participation__team').all():
                         await self.channel_layer.group_send(
                             f"tournament-{self.tournament.id}", {'tid': self.tournament_id, 'type': 'draw.dice',
                                                                  'team': td.participation.team.trigram,
                                                                  'result': td.choice_dice})
 
-                    previous_pool = previous_round.current_pool
+                    await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
+                                                        {'tid': self.tournament_id, 'type': 'draw.send_poules',
+                                                         'round': r1.number,
+                                                         'poules': [
+                                                             {
+                                                                 'letter': pool.get_letter_display(),
+                                                                 'teams': await pool.atrigrams(),
+                                                             }
+                                                             async for pool in r1.pool_set.order_by('letter').all()
+                                                         ]})
+
+                    previous_pool = r1.current_pool
 
                     td = previous_pool.current_team
                     td.purposed = td.accepted
@@ -1421,14 +1414,14 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
 
                     await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
                                                         {'tid': self.tournament_id, 'type': 'draw.set_problem',
-                                                         'round': previous_round.number,
+                                                         'round': r1.number,
                                                          'team': td.participation.team.trigram,
                                                          'problem': td.accepted})
                 else:
                     # Don't continue the final tournament
-                    previous_round = await self.tournament.draw.round_set \
+                    r1 = await self.tournament.draw.round_set \
                         .prefetch_related('current_pool__current_team__participation__team').aget(number=1)
-                    self.tournament.draw.current_round = previous_round
+                    self.tournament.draw.current_round = r1
                     await self.tournament.draw.asave()
 
                     async for td in r.teamdraw_set.all():
@@ -1450,7 +1443,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                                             ]
                                                         })
 
-                    async for td in previous_round.team_draws.prefetch_related('participation__team').all():
+                    async for td in r1.team_draws.prefetch_related('participation__team').all():
                         await self.channel_layer.group_send(
                             f"tournament-{self.tournament.id}", {'tid': self.tournament_id, 'type': 'draw.dice',
                                                                  'team': td.participation.team.trigram,
@@ -1464,31 +1457,17 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                                          'visible': True})
             else:
                 # Go to the dice order
-                async for td in r.teamdraw_set.all():
-                    td.pool = None
-                    td.passage_index = None
-                    td.choose_index = None
-                    td.choice_dice = None
-                    await td.asave()
+                async for r0 in self.tournament.draw.round_set.all():
+                    async for td in r0.teamdraw_set.all():
+                        td.pool = None
+                        td.passage_index = None
+                        td.choose_index = None
+                        td.choice_dice = None
+                        await td.asave()
 
                 r.current_pool = None
                 await r.asave()
 
-                await self.channel_layer.group_send(
-                    f"tournament-{self.tournament.id}",
-                    {
-                        'tid': self.tournament_id,
-                        'type': 'draw.send_poules',
-                        'round': r.number,
-                        'poules': [
-                            {
-                                'letter': pool.get_letter_display(),
-                                'teams': await pool.atrigrams(),
-                            }
-                            async for pool in r.pool_set.order_by('letter').all()
-                        ]
-                    })
-
                 round_tds = {td.id: td async for td in r.team_draws.prefetch_related('participation__team')}
 
                 # Reset the last dice
@@ -1558,45 +1537,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                                              'team': last_td.participation.team.trigram,
                                                              'result': None})
                     break
-        elif r.number == 1:
-            # Cancel the draw if it is the first round
-            await self.abort()
         else:
-            # Go back to the first round after resetting all
-            previous_round = await self.tournament.draw.round_set \
-                .prefetch_related('current_pool__current_team__participation__team').aget(number=r.number - 1)
-            self.tournament.draw.current_round = previous_round
-            await self.tournament.draw.asave()
-
-            async for td in previous_round.team_draws.prefetch_related('participation__team').all():
-                await self.channel_layer.group_send(
-                    f"tournament-{self.tournament.id}", {'tid': self.tournament_id, 'type': 'draw.dice',
-                                                         'team': td.participation.team.trigram,
-                                                         'result': td.choice_dice})
-
-            previous_pool = previous_round.current_pool
-
-            td = previous_pool.current_team
-            td.purposed = td.accepted
-            td.accepted = None
-            await td.asave()
-
-            await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
-                                                {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
-                                                 'visible': False})
-
-            await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
-                                                {'tid': self.tournament_id, 'type': 'draw.buttons_visibility',
-                                                 'visible': True})
-            await self.channel_layer.group_send(f"volunteer-{self.tournament.id}",
-                                                {'tid': self.tournament_id, 'type': 'draw.buttons_visibility',
-                                                 'visible': True})
-
-            await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
-                                                {'tid': self.tournament_id, 'type': 'draw.set_problem',
-                                                 'round': previous_round.number,
-                                                 'team': td.participation.team.trigram,
-                                                 'problem': td.accepted})
+            await self.abort()
 
     async def draw_alert(self, content):
         """

draw/migrations/0004_alter_round_number.py

@@ -1,27 +0,0 @@
-# Generated by Django 5.0.6 on 2024-06-07 12:46
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("draw", "0003_alter_teamdraw_options"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="round",
-            name="number",
-            field=models.PositiveSmallIntegerField(
-                choices=[(1, "Round 1"), (2, "Round 2")],
-                help_text="The number of the round, 1 or 2 (or 3 for ETEAM)",
-                validators=[
-                    django.core.validators.MinValueValidator(1),
-                    django.core.validators.MaxValueValidator(2),
-                ],
-                verbose_name="number",
-            ),
-        ),
-    ]

draw/migrations/0005_alter_round_number_alter_teamdraw_accepted_and_more.py

@@ -1,69 +0,0 @@
-# Generated by Django 5.0.6 on 2024-06-13 08:53
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("draw", "0004_alter_round_number"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="round",
-            name="number",
-            field=models.PositiveSmallIntegerField(
-                choices=[(1, "Round 1"), (2, "Round 2"), (3, "Round 3")],
-                help_text="The number of the round, 1 or 2 (or 3 for ETEAM)",
-                validators=[
-                    django.core.validators.MinValueValidator(1),
-                    django.core.validators.MaxValueValidator(3),
-                ],
-                verbose_name="number",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="teamdraw",
-            name="accepted",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (1, "Problem #1"),
-                    (2, "Problem #2"),
-                    (3, "Problem #3"),
-                    (4, "Problem #4"),
-                    (5, "Problem #5"),
-                    (6, "Problem #6"),
-                    (7, "Problem #7"),
-                    (8, "Problem #8"),
-                    (9, "Problem #9"),
-                    (10, "Problem #10"),
-                ],
-                default=None,
-                null=True,
-                verbose_name="accepted problem",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="teamdraw",
-            name="purposed",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (1, "Problem #1"),
-                    (2, "Problem #2"),
-                    (3, "Problem #3"),
-                    (4, "Problem #4"),
-                    (5, "Problem #5"),
-                    (6, "Problem #6"),
-                    (7, "Problem #7"),
-                    (8, "Problem #8"),
-                    (9, "Problem #9"),
-                    (10, "Problem #10"),
-                ],
-                default=None,
-                null=True,
-                verbose_name="purposed problem",
-            ),
-        ),
-    ]

draw/migrations/0006_alter_round_current_pool.py

@@ -1,27 +0,0 @@
-# Generated by Django 5.0.6 on 2024-07-09 11:07
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("draw", "0005_alter_round_number_alter_teamdraw_accepted_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="round",
-            name="current_pool",
-            field=models.ForeignKey(
-                default=None,
-                help_text="The current pool where teams select their problems.",
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="+",
-                to="draw.pool",
-                verbose_name="current pool",
-            ),
-        ),
-    ]

draw/models.py

@@ -5,7 +5,6 @@ import os
 
 from asgiref.sync import sync_to_async
 from django.conf import settings
-from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.db.models import QuerySet
@@ -82,7 +81,7 @@ class Draw(models.Model):
         elif self.current_round.current_pool.current_team is None:
             return 'DICE_ORDER_POULE'
         elif self.current_round.current_pool.current_team.accepted is not None:
-            if self.current_round.number < settings.NB_ROUNDS:
+            if self.current_round.number == 1:
                 # The last step can be the last problem acceptation after the first round
                 # only for the final between the two rounds
                 return 'WAITING_FINAL'
@@ -111,61 +110,58 @@ class Draw(models.Model):
                 # Waiting for dices to determine pools and passage order
                 if self.current_round.number == 1:
                     # Specific information for the first round
-                    s += _("We are going to start the problem draw.<br>"
-                           "You can ask any question if something is not clear or wrong.<br><br>"
-                           "We are going to first draw the pools and the passage order for the first round "
-                           "with all the teams, then for each pool, we will draw the draw order and the problems.")
-                    s += "<br><br>"
-                s += _("The captains, you can now all throw a 100-sided dice, by clicking on the big dice button. "
-                       "The pools and the passage order during the first round will be the increasing order "
-                       "of the dices, ie. the smallest dice will be the first to pass in pool A.")
+                    s += """Nous allons commencer le tirage des problèmes.<br>
+                        Vous pouvez à tout moment poser toute question si quelque chose
+                        n'est pas clair ou ne va pas.<br><br>
+                        Nous allons d'abord tirer les poules et l'ordre de passage
+                        pour le premier tour avec toutes les équipes puis pour chaque poule,
+                        nous tirerons l'ordre de tirage pour le tour et les problèmes.<br><br>"""
+                s += """
+                    Les capitaines, vous pouvez désormais toustes lancer un dé 100,
+                    en cliquant sur le gros bouton. Les poules et l'ordre de passage
+                    lors du premier tour sera l'ordre croissant des dés, c'est-à-dire
+                    que le plus petit lancer sera le premier à passer dans la poule A."""
             case 'DICE_ORDER_POULE':
                 # Waiting for dices to determine the choice order
-                s += _("We are going to start the problem draw for the pool <strong>{pool}</strong>, "
-                       "between the teams <strong>{teams}</strong>. "
-                       "The captains can throw a 100-sided dice by clicking on the big dice button "
-                       "to determine the order of draw. The team with the highest score will draw first.") \
-                    .format(pool=self.current_round.current_pool,
-                            teams=', '.join(td.participation.team.trigram
-                                            for td in self.current_round.current_pool.teamdraw_set.all()))
+                s += f"""Nous passons au tirage des problèmes pour la poule
+                <strong>{self.current_round.current_pool}</strong>, entre les équipes
+                <strong>{', '.join(td.participation.team.trigram
+                                   for td in self.current_round.current_pool.teamdraw_set.all())}</strong>.
+                Les capitaines peuvent lancer un dé 100 en cliquant sur le gros bouton
+                pour déterminer l'ordre de tirage. L'équipe réalisant le plus gros score pourra
+                tirer en premier."""
             case 'WAITING_DRAW_PROBLEM':
                 # Waiting for a problem draw
                 td = self.current_round.current_pool.current_team
-                s += _("The team <strong>{trigram}</strong> is going to draw a problem. "
-                       "Click on the urn in the middle to draw a problem.") \
-                    .format(trigram=td.participation.team.trigram)
+                s += f"""C'est au tour de l'équipe <strong>{td.participation.team.trigram}</strong>
+                     de choisir son problème. Cliquez sur l'urne au milieu pour tirer un problème au sort."""
             case 'WAITING_CHOOSE_PROBLEM':
                 # Waiting for the team that can accept or reject the problem
                 td = self.current_round.current_pool.current_team
-                s += _("The team <strong>{trigram}</strong> drew the problem <strong>{problem}: "
-                       "{problem_name}</strong>.") \
-                    .format(trigram=td.participation.team.trigram,
-                            problem=td.purposed, problem_name=settings.PROBLEMS[td.purposed - 1]) + " "
+                s += f"""L'équipe <strong>{td.participation.team.trigram}</strong> a tiré le problème
+                     <strong>{td.purposed} : {settings.PROBLEMS[td.purposed - 1]}</strong>. """
                 if td.purposed in td.rejected:
                     # The problem was previously rejected
-                    s += _("It already refused this problem before, so it can refuse it without penalty and "
-                           "draw a new problem immediately, or change its mind.")
+                    s += """Elle a déjà refusé ce problème auparavant, elle peut donc le refuser sans pénalité et
+                            tirer un nouveau problème immédiatement, ou bien revenir sur son choix."""
                 else:
                     # The problem can be rejected
-                    s += _("It can decide to accept or refuse this problem.") + " "
-                    if len(td.rejected) >= len(settings.PROBLEMS) - settings.RECOMMENDED_SOLUTIONS_COUNT:
-                        s += _("Refusing this problem will add a new 25% penalty "
-                               "on the coefficient of the oral defense.")
+                    s += "Elle peut décider d'accepter ou de refuser ce problème. "
+                    if len(td.rejected) >= len(settings.PROBLEMS) - 5:
+                        s += "Refuser ce problème ajoutera une nouvelle pénalité de 25 % sur le coefficient de l'oral de la défense."
                     else:
-                        s += _("There are still {remaining} refusals without penalty.").format(
-                            remaining=len(settings.PROBLEMS) - settings.RECOMMENDED_SOLUTIONS_COUNT - len(td.rejected))
+                        s += f"Il reste {len(settings.PROBLEMS) - 5 - len(td.rejected)} refus sans pénalité."
             case 'WAITING_FINAL':
                 # We are between the two rounds of the final tournament
-                s += _("The draw for the second round will take place at the end of the first round. Good luck!")
+                s += "Le tirage au sort pour le tour 2 aura lieu à la fin du premier tour. Bon courage !"
             case 'DRAW_ENDED':
                 # The draw is ended
-                s += _("The draw is ended. The solutions of the other teams can be found in the tab "
-                       "\"My participation\".")
+                s += "Le tirage au sort est terminé. Les solutions des autres équipes peuvent être trouvées dans l'onglet « Ma participation »."
 
         s += "<br><br>" if s else ""
-        rules_link = settings.RULES_LINK
-        s += _("For more details on the draw, the rules are available on "
-               "<a class=\"alert-link\" href=\"{link}\">{link}</a>.").format(link=rules_link)
+        s += """Pour plus de détails sur le déroulement du tirage au sort,
+                le règlement est accessible sur
+                <a class="alert-link" href="https://tfjm.org/reglement">https://tfjm.org/reglement</a>."""
         return s
 
     async def ainformation(self) -> str:
@@ -197,15 +193,15 @@ class Round(models.Model):
         choices=[
             (1, _('Round 1')),
             (2, _('Round 2')),
-            (3, _('Round 3'))],
+        ],
         verbose_name=_('number'),
-        help_text=_("The number of the round, 1 or 2 (or 3 for ETEAM)"),
-        validators=[MinValueValidator(1), MaxValueValidator(3)],
+        help_text=_("The number of the round, 1 or 2"),
+        validators=[MinValueValidator(1), MaxValueValidator(2)],
     )
 
     current_pool = models.ForeignKey(
         'Pool',
-        on_delete=models.SET_NULL,
+        on_delete=models.CASCADE,
         null=True,
         default=None,
         related_name='+',
@@ -234,13 +230,6 @@ class Round(models.Model):
     def __str__(self):
         return self.get_number_display()
 
-    def clean(self):
-        if self.number is not None and self.number > settings.NB_ROUNDS:
-            raise ValidationError({'number': _("The number of the round must be between 1 and {nb}.")
-                                  .format(nb=settings.NB_ROUNDS)})
-
-        return super().clean()
-
     class Meta:
         verbose_name = _('round')
         verbose_name_plural = _('rounds')
@@ -400,11 +389,11 @@ class Pool(models.Model):
             ]
         elif self.size == 5:
             table = [
-                [0, 2, 3, 4],
-                [1, 3, 4, 0],
-                [2, 4, 0, 1],
-                [3, 0, 1, 2],
-                [4, 1, 2, 3],
+                [0, 2, 3],
+                [1, 3, 4],
+                [2, 4, 0],
+                [3, 0, 1],
+                [4, 1, 2],
             ]
 
         for i, line in enumerate(table):
@@ -416,21 +405,15 @@ class Pool(models.Model):
                     passage_pool = pool2
                 passage_position = 1 + i // 2
 
-            reporter = tds[line[0]].participation
-            opponent = tds[line[1]].participation
-            reviewer = tds[line[2]].participation
-            observer = tds[line[3]].participation if self.size >= 4 and settings.HAS_OBSERVER else None
-
             # Create the passage
             await Passage.objects.acreate(
                 pool=passage_pool,
                 position=passage_position,
                 solution_number=tds[line[0]].accepted,
-                reporter=reporter,
-                opponent=opponent,
-                reviewer=reviewer,
-                observer=observer,
-                reporter_penalties=tds[line[0]].penalty_int,
+                defender=tds[line[0]].participation,
+                opponent=tds[line[1]].participation,
+                reporter=tds[line[2]].participation,
+                defender_penalties=tds[line[0]].penalty_int,
             )
 
         # Update Google Sheets
@@ -541,15 +524,15 @@ class TeamDraw(models.Model):
     @property
     def penalty_int(self):
         """
-        The number of penalties, which is the number of rejected problems after the P - 5 free rejects
-        (P - 6 for ETEAM), where P is the number of problems.
+        The number of penalties, which is the number of rejected problems after the P - 5 free rejects,
+        where P is the number of problems.
         """
-        return max(0, len(self.rejected) - (len(settings.PROBLEMS) - settings.RECOMMENDED_SOLUTIONS_COUNT))
+        return max(0, len(self.rejected) - (len(settings.PROBLEMS) - 5))
 
     @property
     def penalty(self):
         """
-        The penalty multiplier on the reporter oral, in percentage, which is a malus of 25% for each penalty.
+        The penalty multiplier on the defender oral, in percentage, which is a malus of 25% for each penalty.
         """
         return 25 * self.penalty_int
 

draw/static/draw.js

@@ -4,9 +4,6 @@
     await Notification.requestPermission()
 })()
 
-const TFJM = JSON.parse(document.getElementById('TFJM_settings').textContent)
-const RECOMMENDED_SOLUTIONS_COUNT = TFJM.RECOMMENDED_SOLUTIONS_COUNT
-
 const problems_count = JSON.parse(document.getElementById('problems_count').textContent)
 
 const tournaments = JSON.parse(document.getElementById('tournaments_list').textContent)
@@ -311,7 +308,7 @@ document.addEventListener('DOMContentLoaded', () => {
     /**
      * Set the different pools for the given round, and update the interface.
      * @param tid The tournament id
-     * @param round The round number, as integer (1 or 2, or 3 for ETEAM)
+     * @param round The round number, as integer (1 or 2)
      * @param poules The list of poules, which are represented with their letters and trigrams,
      *                  [{'letter': 'A', 'teams': ['ABC', 'DEF', 'GHI']}]
      */
@@ -433,7 +430,7 @@ document.addEventListener('DOMContentLoaded', () => {
     /**
      * Update the table for the given round and the given pool, where there will be the chosen problems.
      * @param tid The tournament id
-     * @param round The round number, as integer (1 or 2, or 3 for ETEAM)
+     * @param round The round number, as integer (1 or 2)
      * @param poule The current pool, which id represented with its letter and trigrams,
      *                  {'letter': 'A', 'teams': ['ABC', 'DEF', 'GHI']}
      */
@@ -521,45 +518,45 @@ document.addEventListener('DOMContentLoaded', () => {
                 teamTd.innerText = team
                 teamTr.append(teamTd)
 
-                let reporterTd = document.createElement('td')
-                reporterTd.classList.add('text-center')
-                reporterTd.innerText = 'Déf'
+                let defenderTd = document.createElement('td')
+                defenderTd.classList.add('text-center')
+                defenderTd.innerText = 'Déf'
 
                 let opponentTd = document.createElement('td')
                 opponentTd.classList.add('text-center')
                 opponentTd.innerText = 'Opp'
 
-                let reviewerTd = document.createElement('td')
-                reviewerTd.classList.add('text-center')
-                reviewerTd.innerText = 'Rap'
+                let reporterTd = document.createElement('td')
+                reporterTd.classList.add('text-center')
+                reporterTd.innerText = 'Rap'
 
                 // Put the cells in their right places, according to the pool size and the row number.
                 if (poule.teams.length === 3) {
                     switch (i) {
                         case 0:
-                            teamTr.append(reporterTd, reviewerTd, opponentTd)
+                            teamTr.append(defenderTd, reporterTd, opponentTd)
                             break
                         case 1:
-                            teamTr.append(opponentTd, reporterTd, reviewerTd)
+                            teamTr.append(opponentTd, defenderTd, reporterTd)
                             break
                         case 2:
-                            teamTr.append(reviewerTd, opponentTd, reporterTd)
+                            teamTr.append(reporterTd, opponentTd, defenderTd)
                             break
                     }
                 } else if (poule.teams.length === 4) {
                     let emptyTd = document.createElement('td')
                     switch (i) {
                         case 0:
-                            teamTr.append(reporterTd, emptyTd, reviewerTd, opponentTd)
+                            teamTr.append(defenderTd, emptyTd, reporterTd, opponentTd)
                             break
                         case 1:
-                            teamTr.append(opponentTd, reporterTd, emptyTd, reviewerTd)
+                            teamTr.append(opponentTd, defenderTd, emptyTd, reporterTd)
                             break
                         case 2:
-                            teamTr.append(reviewerTd, opponentTd, reporterTd, emptyTd)
+                            teamTr.append(reporterTd, opponentTd, defenderTd, emptyTd)
                             break
                         case 3:
-                            teamTr.append(emptyTd, reviewerTd, opponentTd, reporterTd)
+                            teamTr.append(emptyTd, reporterTd, opponentTd, defenderTd)
                             break
                     }
                 } else if (poule.teams.length === 5) {
@@ -567,19 +564,19 @@ document.addEventListener('DOMContentLoaded', () => {
                     let emptyTd2 = document.createElement('td')
                     switch (i) {
                         case 0:
-                            teamTr.append(reporterTd, emptyTd, opponentTd, reviewerTd, emptyTd2)
+                            teamTr.append(defenderTd, emptyTd, opponentTd, reporterTd, emptyTd2)
                             break
                         case 1:
-                            teamTr.append(emptyTd, reporterTd, reviewerTd, emptyTd2, opponentTd)
+                            teamTr.append(emptyTd, defenderTd, reporterTd, emptyTd2, opponentTd)
                             break
                         case 2:
-                            teamTr.append(opponentTd, emptyTd, reporterTd, emptyTd2, reviewerTd)
+                            teamTr.append(opponentTd, emptyTd, defenderTd, emptyTd2, reporterTd)
                             break
                         case 3:
-                            teamTr.append(reviewerTd, opponentTd, emptyTd, reporterTd, emptyTd2)
+                            teamTr.append(reporterTd, opponentTd, emptyTd, defenderTd, emptyTd2)
                             break
                         case 4:
-                            teamTr.append(emptyTd, reviewerTd, emptyTd2, opponentTd, reporterTd)
+                            teamTr.append(emptyTd, reporterTd, emptyTd2, opponentTd, defenderTd)
                             break
                     }
                 }
@@ -590,7 +587,7 @@ document.addEventListener('DOMContentLoaded', () => {
     /**
      * Highlight the team that is currently choosing its problem.
      * @param tid The tournament id
-     * @param round The current round number, as integer (1 or 2, or 3 for ETEAM)
+     * @param round The current round number, as integer (1 or 2)
      * @param pool The current pool letter (A, B, C or D) (null if non-relevant)
      * @param team The current team trigram (null if non-relevant)
      */
@@ -627,7 +624,7 @@ document.addEventListener('DOMContentLoaded', () => {
     /**
      * Update the recap and the table when a team accepts a problem.
      * @param tid The tournament id
-     * @param round The current round, as integer (1 or 2, or 3 for ETEAM)
+     * @param round The current round, as integer (1 or 2)
      * @param team The current team trigram
      * @param problem The accepted problem, as integer
      */
@@ -651,7 +648,7 @@ document.addEventListener('DOMContentLoaded', () => {
     /**
      * Update the recap when a team rejects a problem.
      * @param tid The tournament id
-     * @param round The current round, as integer (1 or 2, or 3 for ETEAM)
+     * @param round The current round, as integer (1 or 2)
      * @param team The current team trigram
      * @param rejected The full list of rejected problems
      */
@@ -661,16 +658,15 @@ document.addEventListener('DOMContentLoaded', () => {
         recapDiv.textContent = `🗑️ ${rejected.join(', ')}`
 
         let penaltyDiv = document.getElementById(`recap-${tid}-round-${round}-team-${team}-penalty`)
-        if (rejected.length > problems_count - RECOMMENDED_SOLUTIONS_COUNT) {
-            // If more than P - 5 problems were rejected, add a penalty of 25% of the coefficient of the oral reporter
-            // This is P - 6 for the ETEAM
+        if (rejected.length > problems_count - 5) {
+            // If more than P - 5 problems were rejected, add a penalty of 25% of the coefficient of the oral defender
             if (penaltyDiv === null) {
                 penaltyDiv = document.createElement('div')
                 penaltyDiv.id = `recap-${tid}-round-${round}-team-${team}-penalty`
                 penaltyDiv.classList.add('badge', 'rounded-pill', 'text-bg-info')
                 recapDiv.parentNode.append(penaltyDiv)
             }
-            penaltyDiv.textContent = `❌ ${25 * (rejected.length - (problems_count - RECOMMENDED_SOLUTIONS_COUNT))} %`
+            penaltyDiv.textContent = `❌ ${25 * (rejected.length - (problems_count - 5))} %`
         } else {
             // Eventually remove this div
             if (penaltyDiv !== null)
@@ -682,7 +678,7 @@ document.addEventListener('DOMContentLoaded', () => {
      * For a 5-teams pool, we may reorder the pool if two teams select the same problem.
      * Then, we redraw the table and set the accepted problems.
      * @param tid The tournament id
-     * @param round The current round, as integer (1 or 2, or 3 for ETEAM)
+     * @param round The current round, as integer (1 or 2)
      * @param poule The pool represented by its letter
      * @param teams The teams list represented by their trigrams, ["ABC", "DEF", "GHI", "JKL", "MNO"]
      * @param problems The accepted problems in the same order than the teams, [1, 1, 2, 2, 3]
@@ -700,9 +696,6 @@ document.addEventListener('DOMContentLoaded', () => {
             let problem = problems[i]
 
             setProblemAccepted(tid, round, team, problem)
-
-            let recapTeam = document.getElementById(`recap-${tid}-round-${round}-team-${team}`)
-            recapTeam.style.order = i.toString()
         }
     }
 

draw/templates/draw/index.html

@@ -2,7 +2,6 @@
 
 {% load static %}
 {% load i18n %}
-{% load pipeline %}
 
 {% block content %}
     {# The navbar to select the tournament #}
@@ -41,5 +40,5 @@
     {{ problems|length|json_script:'problems_count' }}
 
     {# This script contains all data for the draw management #}
-    {% javascript 'draw' %}
+    <script src="{% static 'draw.js' %}"></script>
 {% endblock %}

draw/templates/draw/tournament_content.html

@@ -176,7 +176,7 @@
                                 📁 {% trans "Export" %}
                             </button>
                         </div>
-                        {% if tournament.final or not TFJM.HAS_FINAL %}
+                        {% if tournament.final %}
                             {# Volunteers can continue the second round for the final tournament #}
                             <div id="continue-{{ tournament.id }}"
                                  class="card-footer text-center{% if tournament.draw.get_state != 'WAITING_FINAL' %} d-none{% endif %}">
@@ -307,71 +307,71 @@
                                                         <td class="text-center">{{ td.participation.team.trigram }}</td>
                                                         {% if pool.size == 3 %}
                                                             {% if forloop.counter == 1 %}
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
                                                             {% elif forloop.counter == 2 %}
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">Rap</td>
                                                             {% elif forloop.counter == 3 %}
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">Déf</td>
                                                             {% endif %}
                                                         {% elif pool.size == 4 %}
                                                             {% if forloop.counter == 1 %}
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td></td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
                                                             {% elif forloop.counter == 2 %}
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td></td>
+                                                                <td class="text-center">Rap</td>
                                                             {% elif forloop.counter == 3 %}
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td></td>
                                                             {% elif forloop.counter == 4 %}
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
+                                                                <td></td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">Déf</td>
                                                             {% endif %}
                                                         {% elif pool.size == 5 %}
                                                             {% if forloop.counter == 1 %}
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center"></td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td></td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td></td>
                                                             {% elif forloop.counter == 2 %}
-                                                                <td class="text-center"></td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
+                                                                <td></td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td></td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
                                                             {% elif forloop.counter == 3 %}
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center"></td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td></td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td></td>
+                                                                <td class="text-center">Rap</td>
                                                             {% elif forloop.counter == 4 %}
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center"></td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td></td>
+                                                                <td class="text-center">Déf</td>
+                                                                <td></td>
                                                             {% elif forloop.counter == 5 %}
-                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center"></td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
+                                                                <td></td>
+                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">Opp</td>
+                                                                <td></td>
+                                                                <td class="text-center">Déf</td>
                                                             {% endif %}
                                                         {% endif %}
                                                     </tr>

draw/tests.py

@@ -71,7 +71,7 @@ class TestDraw(TestCase):
         resp = await communicator.receive_json_from()
         self.assertEqual(resp['type'], 'alert')
         self.assertEqual(resp['alert_type'], 'danger')
-        self.assertEqual(resp['message'], "La somme doit être égale au nombre d'équipes : attendu 12, obtenu 3")
+        self.assertEqual(resp['message'], "The sum must be equal to the number of teams: expected 12, got 3")
         self.assertFalse(await Draw.objects.filter(tournament=self.tournament).aexists())
 
         # Now start the draw
@@ -113,7 +113,7 @@ class TestDraw(TestCase):
         resp = await communicator.receive_json_from()
         self.assertEqual(resp['type'], 'alert')
         self.assertEqual(resp['alert_type'], 'danger')
-        self.assertEqual(resp['message'], "Le tirage a déjà commencé.")
+        self.assertEqual(resp['message'], "The draw is already started.")
 
         draw: Draw = await Draw.objects.prefetch_related(
             'current_round__current_pool__current_team__participation__team').aget(tournament=self.tournament)
@@ -135,7 +135,7 @@ class TestDraw(TestCase):
                 await communicator.send_json_to({'tid': tid, 'type': "dice", 'trigram': team.trigram})
                 resp = await communicator.receive_json_from()
                 self.assertEqual(resp['type'], 'alert')
-                self.assertEqual(resp['message'], "Vous avez déjà lancé le dé.")
+                self.assertEqual(resp['message'], "You've already launched the dice.")
 
             # Force exactly one duplicate
             await td.arefresh_from_db()
@@ -207,7 +207,7 @@ class TestDraw(TestCase):
                 await communicator.send_json_to({'tid': tid, 'type': "dice", 'trigram': trigram})
                 resp = await communicator.receive_json_from()
                 self.assertEqual(resp['type'], 'alert')
-                self.assertEqual(resp['message'], "Vous avez déjà lancé le dé.")
+                self.assertEqual(resp['message'], "You've already launched the dice.")
 
             # Force exactly one duplicate
             await td.arefresh_from_db()
@@ -254,7 +254,7 @@ class TestDraw(TestCase):
         await communicator.send_json_to({'tid': tid, 'type': 'dice', 'trigram': None})
         resp = await communicator.receive_json_from()
         self.assertEqual(resp['type'], 'alert')
-        self.assertEqual(resp['message'], "Ce n'est pas le moment pour cela.")
+        self.assertEqual(resp['message'], "This is not the time for this.")
 
         # Draw a problem
         await communicator.send_json_to({'tid': tid, 'type': 'draw_problem'})
@@ -277,7 +277,7 @@ class TestDraw(TestCase):
         await communicator.send_json_to({'tid': tid, 'type': 'draw_problem'})
         resp = await communicator.receive_json_from()
         self.assertEqual(resp['type'], 'alert')
-        self.assertEqual(resp['message'], "Ce n'est pas le moment pour cela.")
+        self.assertEqual(resp['message'], "This is not the time for this.")
 
         # Reject the first problem
         await communicator.send_json_to({'tid': tid, 'type': 'reject'})

participation/admin.py

@@ -4,7 +4,7 @@
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 
-from .models import Note, Participation, Passage, Pool, Solution, Team, Tournament, Tweak, WrittenReview
+from .models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament, Tweak
 
 
 class ParticipationInline(admin.StackedInline):
@@ -32,8 +32,8 @@ class SolutionInline(admin.TabularInline):
     show_change_link = True
 
 
-class WrittenReviewInline(admin.TabularInline):
-    model = WrittenReview
+class SynthesisInline(admin.TabularInline):
+    model = Synthesis
     extra = 0
     ordering = ('passage__solution_number', 'type',)
     autocomplete_fields = ('passage',)
@@ -51,7 +51,7 @@ class PassageInline(admin.TabularInline):
     model = Passage
     extra = 0
     ordering = ('position',)
-    autocomplete_fields = ('reporter', 'opponent', 'reviewer', 'observer',)
+    autocomplete_fields = ('defender', 'opponent', 'reporter',)
     show_change_link = True
 
 
@@ -95,7 +95,7 @@ class ParticipationAdmin(admin.ModelAdmin):
     search_fields = ('team__name', 'team__trigram',)
     list_filter = ('valid', 'tournament',)
     autocomplete_fields = ('team', 'tournament',)
-    inlines = (SolutionInline, WrittenReviewInline,)
+    inlines = (SolutionInline, SynthesisInline,)
 
 
 @admin.register(Pool)
@@ -113,29 +113,25 @@ class PoolAdmin(admin.ModelAdmin):
 
 @admin.register(Passage)
 class PassageAdmin(admin.ModelAdmin):
-    list_display = ('__str__', 'reporter_trigram', 'solution_number', 'opponent_trigram', 'reviewer_trigram',
-                    'observer_trigram', 'pool_abbr', 'position', 'tournament')
+    list_display = ('__str__', 'defender_trigram', 'solution_number', 'opponent_trigram', 'reporter_trigram',
+                    'pool_abbr', 'position', 'tournament')
     list_filter = ('pool__tournament', 'pool__round', 'pool__letter', 'solution_number',)
     search_fields = ('pool__participations__team__name', 'pool__participations__team__trigram',)
     ordering = ('pool__tournament', 'pool__round', 'pool__letter', 'position',)
-    autocomplete_fields = ('pool', 'reporter', 'opponent', 'reviewer', 'observer',)
+    autocomplete_fields = ('pool', 'defender', 'opponent', 'reporter',)
     inlines = (NoteInline,)
 
-    @admin.display(description=_("reporter"), ordering='reporter__team__trigram')
-    def reporter_trigram(self, record: Passage):
-        return record.reporter.team.trigram
+    @admin.display(description=_("defender"), ordering='defender__team__trigram')
+    def defender_trigram(self, record: Passage):
+        return record.defender.team.trigram
 
     @admin.display(description=_("opponent"), ordering='opponent__team__trigram')
     def opponent_trigram(self, record: Passage):
         return record.opponent.team.trigram
 
-    @admin.display(description=_("reviewer"), ordering='reviewer__team__trigram')
-    def reviewer_trigram(self, record: Passage):
-        return record.reviewer.team.trigram
-
-    @admin.display(description=_("observer"), ordering='observer__team__trigram')
-    def observer_trigram(self, record: Passage):
-        return record.observer.team.trigram
+    @admin.display(description=_("reporter"), ordering='reporter__team__trigram')
+    def reporter_trigram(self, record: Passage):
+        return record.reporter.team.trigram
 
     @admin.display(description=_("pool"), ordering='pool__letter')
     def pool_abbr(self, record):
@@ -148,13 +144,12 @@ class PassageAdmin(admin.ModelAdmin):
 
 @admin.register(Note)
 class NoteAdmin(admin.ModelAdmin):
-    list_display = ('passage', 'pool', 'jury', 'reporter_writing', 'reporter_oral',
-                    'opponent_writing', 'opponent_oral', 'reviewer_writing', 'reviewer_oral',
-                    'observer_writing', 'observer_oral',)
+    list_display = ('passage', 'pool', 'jury', 'defender_writing', 'defender_oral',
+                    'opponent_writing', 'opponent_oral', 'reporter_writing', 'reporter_oral',)
     list_filter = ('passage__pool__letter', 'passage__solution_number', 'jury',
-                   'reporter_writing', 'reporter_oral', 'opponent_writing', 'opponent_oral',
-                   'reviewer_writing', 'reviewer_oral', 'observer_writing', 'observer_oral')
-    search_fields = ('jury__user__last_name', 'jury__user__first_name', 'passage__reporter__team__trigram',)
+                   'defender_writing', 'defender_oral', 'opponent_writing', 'opponent_oral',
+                   'reporter_writing', 'reporter_oral')
+    search_fields = ('jury__user__last_name', 'jury__user__first_name', 'passage__defender__team__trigram',)
     autocomplete_fields = ('jury', 'passage',)
 
     @admin.display(description=_("pool"))
@@ -178,19 +173,19 @@ class SolutionAdmin(admin.ModelAdmin):
         return Tournament.final_tournament() if record.final_solution else record.participation.tournament
 
 
-@admin.register(WrittenReview)
-class WrittenReviewAdmin(admin.ModelAdmin):
-    list_display = ('participation', 'type', 'reporter', 'passage',)
+@admin.register(Synthesis)
+class SynthesisAdmin(admin.ModelAdmin):
+    list_display = ('participation', 'type', 'defender', 'passage',)
     list_filter = ('participation__tournament', 'type', 'passage__solution_number',)
     search_fields = ('participation__team__name', 'participation__team__trigram',)
     autocomplete_fields = ('participation', 'passage',)
 
-    @admin.display(description=_("reporter"))
-    def reporter(self, record: WrittenReview):
-        return record.passage.reporter
+    @admin.display(description=_("defender"))
+    def defender(self, record: Synthesis):
+        return record.passage.defender
 
     @admin.display(description=_("problem"))
-    def problem(self, record: WrittenReview):
+    def problem(self, record: Synthesis):
         return record.passage.solution_number
 
 

participation/api/serializers.py

@@ -3,7 +3,7 @@
 
 from rest_framework import serializers
 
-from ..models import Note, Participation, Passage, Pool, Solution, Team, Tournament, WrittenReview
+from ..models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament
 
 
 class NoteSerializer(serializers.ModelSerializer):
@@ -38,9 +38,9 @@ class SolutionSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 
-class WrittenReviewSerializer(serializers.ModelSerializer):
+class SynthesisSerializer(serializers.ModelSerializer):
     class Meta:
-        model = WrittenReview
+        model = Synthesis
         fields = '__all__'
 
 
@@ -58,9 +58,8 @@ class TournamentSerializer(serializers.ModelSerializer):
     class Meta:
         model = Tournament
         fields = ('id', 'pk', 'name', 'date_start', 'date_end', 'place', 'max_teams', 'price', 'remote',
-                  'inscription_limit', 'solution_limit', 'solutions_draw', 'reviews_first_phase_limit',
-                  'solutions_available_second_phase', 'reviews_second_phase_limit',
-                  'solutions_available_third_phase', 'reviews_third_phase_limit',
+                  'inscription_limit', 'solution_limit', 'solutions_draw', 'syntheses_first_phase_limit',
+                  'solutions_available_second_phase', 'syntheses_second_phase_limit',
                   'description', 'organizers', 'final', 'participations',)
 
 

participation/api/urls.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from .views import NoteViewSet, ParticipationViewSet, PassageViewSet, PoolViewSet, \
-    SolutionViewSet, TeamViewSet, TournamentViewSet, TweakViewSet, WrittenReviewViewSet
+    SolutionViewSet, SynthesisViewSet, TeamViewSet, TournamentViewSet, TweakViewSet
 
 
 def register_participation_urls(router, path):
@@ -13,8 +13,8 @@ def register_participation_urls(router, path):
     router.register(path + "/participation", ParticipationViewSet)
     router.register(path + "/passage", PassageViewSet)
     router.register(path + "/pool", PoolViewSet)
-    router.register(path + "/review", WrittenReviewViewSet)
     router.register(path + "/solution", SolutionViewSet)
+    router.register(path + "/synthesis", SynthesisViewSet)
     router.register(path + "/team", TeamViewSet)
     router.register(path + "/tournament", TournamentViewSet)
     router.register(path + "/tweak", TweakViewSet)

participation/api/views.py

@@ -4,16 +4,16 @@ from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.viewsets import ModelViewSet
 
 from .serializers import NoteSerializer, ParticipationSerializer, PassageSerializer, PoolSerializer, \
-    SolutionSerializer, TeamSerializer, TournamentSerializer, TweakSerializer, WrittenReviewSerializer
-from ..models import Note, Participation, Passage, Pool, Solution, Team, Tournament, Tweak, WrittenReview
+    SolutionSerializer, SynthesisSerializer, TeamSerializer, TournamentSerializer, TweakSerializer
+from ..models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament, Tweak
 
 
 class NoteViewSet(ModelViewSet):
     queryset = Note.objects.all()
     serializer_class = NoteSerializer
     filter_backends = [DjangoFilterBackend]
-    filterset_fields = ['jury', 'passage', 'reporter_writing', 'reporter_oral', 'opponent_writing',
-                        'opponent_oral', 'reviewer_writing', 'reviewer_oral', 'observer_writing', 'observer_oral', ]
+    filterset_fields = ['jury', 'passage', 'defender_writing', 'defender_oral', 'opponent_writing',
+                        'opponent_oral', 'reporter_writing', 'reporter_oral', ]
 
 
 class ParticipationViewSet(ModelViewSet):
@@ -27,7 +27,7 @@ class PassageViewSet(ModelViewSet):
     queryset = Passage.objects.all()
     serializer_class = PassageSerializer
     filter_backends = [DjangoFilterBackend]
-    filterset_fields = ['pool', 'solution_number', 'reporter', 'opponent', 'reviewer', 'observer', 'pool_tournament', ]
+    filterset_fields = ['pool', 'solution_number', 'defender', 'opponent', 'reporter', 'pool_tournament', ]
 
 
 class PoolViewSet(ModelViewSet):
@@ -44,9 +44,9 @@ class SolutionViewSet(ModelViewSet):
     filterset_fields = ['participation', 'number', 'problem', 'final_solution', ]
 
 
-class WrittenReviewViewSet(ModelViewSet):
-    queryset = WrittenReview.objects.all()
-    serializer_class = WrittenReviewSerializer
+class SynthesisViewSet(ModelViewSet):
+    queryset = Synthesis.objects.all()
+    serializer_class = SynthesisSerializer
     filter_backends = [DjangoFilterBackend]
     filterset_fields = ['participation', 'number', 'passage', 'type', ]
 
@@ -64,9 +64,8 @@ class TournamentViewSet(ModelViewSet):
     serializer_class = TournamentSerializer
     filter_backends = [DjangoFilterBackend]
     filterset_fields = ['name', 'date_start', 'date_end', 'place', 'max_teams', 'price', 'remote',
-                        'inscription_limit', 'solution_limit', 'solutions_draw', 'reviews_first_phase_limit',
-                        'solutions_available_second_phase', 'reviews_second_phase_limit',
-                        'solutions_available_third_phase', 'reviews_third_phase_limit',
+                        'inscription_limit', 'solution_limit', 'solutions_draw', 'syntheses_first_phase_limit',
+                        'solutions_available_second_phase', 'syntheses_second_phase_limit',
                         'description', 'organizers', 'final', ]
 
 

participation/forms.py

@@ -5,7 +5,7 @@ from io import StringIO
 import re
 
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Div, Field, HTML, Layout, Submit
+from crispy_forms.layout import Div, Field, Submit
 from django import forms
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
@@ -14,9 +14,8 @@ from django.utils.translation import gettext_lazy as _
 import pandas
 from pypdf import PdfReader
 from registration.models import VolunteerRegistration
-from tfjm import settings
 
-from .models import Note, Participation, Passage, Pool, Solution, Team, Tournament, WrittenReview
+from .models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament
 
 
 class TeamForm(forms.ModelForm):
@@ -75,33 +74,6 @@ class ParticipationForm(forms.ModelForm):
     """
     Form to update the problem of a team participation.
     """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if settings.SINGLE_TOURNAMENT:
-            del self.fields['tournament']
-        self.helper = FormHelper()
-        idf_warning_banner = f"""
-<div class=\"alert alert-warning\">
-<h5 class=\"alert-heading\">{_("IMPORTANT")}</h4>
-{_("""For the tournaments in the region "Île-de-France": registration is
-unified for each tournament. By choosing a tournament "Île-de-France",
-you're accepting that your team may be selected for one of these tournaments.
-In case of date conflict, please write them in your motivation letter.""")}
-</div>
-"""
-        unified_registration_tournament_ids = ",".join(
-            str(tournament.id) for tournament in Tournament.objects.filter(
-                unified_registration=True).all())
-        self.helper.layout = Layout(
-            'tournament',
-            Div(
-                HTML(idf_warning_banner),
-                css_id="idf_warning_banner",
-                data_tid_unified=unified_registration_tournament_ids,
-            ),
-            'final',
-        )
-
     class Meta:
         model = Participation
         fields = ('tournament', 'final',)
@@ -132,7 +104,7 @@ class RequestValidationForm(forms.Form):
     )
 
     engagement = forms.BooleanField(
-        label=_("I engage myself to participate to the whole tournament."),
+        label=_("I engage myself to participate to the whole TFJM²."),
         required=True,
     )
 
@@ -153,15 +125,6 @@ class ValidateParticipationForm(forms.Form):
 
 
 class TournamentForm(forms.ModelForm):
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if settings.NB_ROUNDS < 3:
-            del self.fields['date_third_phase']
-            del self.fields['solutions_available_third_phase']
-            del self.fields['reviews_third_phase_limit']
-        if not settings.PAYMENT_MANAGEMENT:
-            del self.fields['price']
-
     class Meta:
         model = Tournament
         exclude = ('notes_sheet_id', )
@@ -171,15 +134,12 @@ class TournamentForm(forms.ModelForm):
             'inscription_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M'),
             'solution_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M'),
             'solutions_draw': forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M'),
-            'date_first_phase': forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d'),
-            'reviews_first_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
-                                                             format='%Y-%m-%d %H:%M'),
-            'date_second_phase': forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d'),
-            'reviews_second_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
-                                                              format='%Y-%m-%d %H:%M'),
-            'date_third_phase': forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d'),
-            'reviews_third_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
-                                                             format='%Y-%m-%d %H:%M'),
+            'syntheses_first_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
+                                                               format='%Y-%m-%d %H:%M'),
+            'solutions_available_second_phase': forms.DateTimeInput(attrs={'type': 'datetime-local'},
+                                                                    format='%Y-%m-%d %H:%M'),
+            'syntheses_second_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
+                                                                format='%Y-%m-%d %H:%M'),
             'organizers': forms.SelectMultiple(attrs={
                 'class': 'selectpicker',
                 'data-live-search': 'true',
@@ -323,26 +283,25 @@ class UploadNotesForm(forms.Form):
             line = [s for s in line if s == s]
             # Strip cases
             line = [str(s).strip() for s in line if str(s)]
-            if line and line[0] in ["Problème", "Problem"]:
+            if line and line[0] == 'Problème':
                 pool_size = len(line) - 1
-                line_length = 2 + (8 if df.iat[1, 8] == "Observer" else 6) * pool_size
+                line_length = 2 + 6 * pool_size
                 continue
 
             if pool_size == 0 or len(line) < line_length:
                 continue
 
             name = line[0]
-            if name.lower() in ["rôle", "juré⋅e", "juré?e", "moyenne", "coefficient", "sous-total", "équipe", "equipe",
-                                "role", "juree", "average", "coefficient", "subtotal", "team"]:
+            if name.lower() in ["rôle", "juré⋅e", "juré?e", "moyenne", "coefficient", "sous-total", "équipe", "equipe"]:
                 continue
             notes = line[2:line_length]
+            print(name, notes)
             if not all(s.isnumeric() or s[0] == '-' and s[1:].isnumeric() for s in notes):
                 continue
             notes = list(map(lambda x: int(float(x)), notes))
+            print(notes)
 
-            max_notes = pool_size * [20 if settings.TFJM_APP == "TFJM" else 10,
-                                     20 if settings.TFJM_APP == "TFJM" else 10,
-                                     10, 10, 10, 10, 10, 10]
+            max_notes = pool_size * [20, 20, 10, 10, 10, 10]
             for n, max_n in zip(notes, max_notes):
                 if n > max_n:
                     self.add_error('file',
@@ -366,21 +325,21 @@ class UploadNotesForm(forms.Form):
 class PassageForm(forms.ModelForm):
     def clean(self):
         cleaned_data = super().clean()
-        if "reporter" in cleaned_data and "opponent" in cleaned_data and "reviewer" in cleaned_data \
-                and len({cleaned_data["reporter"], cleaned_data["opponent"], cleaned_data["reviewer"]}) < 3:
-            self.add_error(None, _("The reporter, the opponent and the reviewer must be different."))
-        if "reporter" in self.cleaned_data and "solution_number" in self.cleaned_data \
-                and not Solution.objects.filter(participation=cleaned_data["reporter"],
+        if "defender" in cleaned_data and "opponent" in cleaned_data and "reporter" in cleaned_data \
+                and len({cleaned_data["defender"], cleaned_data["opponent"], cleaned_data["reporter"]}) < 3:
+            self.add_error(None, _("The defender, the opponent and the reporter must be different."))
+        if "defender" in self.cleaned_data and "solution_number" in self.cleaned_data \
+                and not Solution.objects.filter(participation=cleaned_data["defender"],
                                                 problem=cleaned_data["solution_number"]).exists():
-            self.add_error("solution_number", _("This reporter did not work on this problem."))
+            self.add_error("solution_number", _("This defender did not work on this problem."))
         return cleaned_data
 
     class Meta:
         model = Passage
-        fields = ('position', 'solution_number', 'reporter', 'opponent', 'reviewer', 'opponent', 'reporter_penalties',)
+        fields = ('position', 'solution_number', 'defender', 'opponent', 'reporter', 'defender_penalties',)
 
 
-class WrittenReviewForm(forms.ModelForm):
+class SynthesisForm(forms.ModelForm):
     def clean_file(self):
         if "file" in self.files:
             file = self.files["file"]
@@ -396,16 +355,16 @@ class WrittenReviewForm(forms.ModelForm):
 
     def save(self, commit=True):
         """
-        Don't save a written review with this way. Use a view instead
+        Don't save a synthesis with this way. Use a view instead
         """
 
     class Meta:
-        model = WrittenReview
+        model = Synthesis
         fields = ('file',)
 
 
 class NoteForm(forms.ModelForm):
     class Meta:
         model = Note
-        fields = ('reporter_writing', 'reporter_oral', 'opponent_writing',
-                  'opponent_oral', 'reviewer_writing', 'reviewer_oral', 'observer_writing', 'observer_oral', )
+        fields = ('defender_writing', 'defender_oral', 'opponent_writing',
+                  'opponent_oral', 'reporter_writing', 'reporter_oral', )

participation/management/commands/export_results.py

@@ -1,7 +1,6 @@
 # Copyright (C) 2021 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.conf import settings
 from django.core.management import BaseCommand
 from django.utils.formats import date_format
 from django.utils.translation import activate
@@ -10,7 +9,7 @@ from participation.models import Tournament
 
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
-        activate(settings.PREFERRED_LANGUAGE_CODE)
+        activate('fr')
 
         tournaments = Tournament.objects.order_by('-date_start', 'name')
         for tournament in tournaments:
@@ -18,8 +17,8 @@ class Command(BaseCommand):
             self.w("")
             self.w("")
 
-    def w(self, msg, prefix="", suffix=""):
-        self.stdout.write(f"{prefix}{msg}{suffix}")
+    def w(self, msg):
+        self.stdout.write(msg)
 
     def handle_tournament(self, tournament):
         name = tournament.name
@@ -41,7 +40,7 @@ class Command(BaseCommand):
         if tournament.final:
             self.w(f"<p>La finale a eu lieu le weekend du {date_start} au {date_end} et a été remporté par l'équipe "
                    f"<em>{notes[0][0].team.name}</em> suivie de l'équipe <em>{notes[1][0].team.name}</em>. "
-                   f"Les deux premières équipes sont sélectionnées pour représenter la France lors de l'ETEAM.</p>")
+                   f"Les deux premières équipes sont sélectionnées pour représenter la France lors de l'ITYM.</p>")
         else:
             self.w(f"<p>Le tournoi de {name} a eu lieu le weekend du {date_start} au {date_end} et a été remporté par "
                    f"l'équipe <em>{notes[0][0].team.name}</em>.</p>")
@@ -53,29 +52,32 @@ class Command(BaseCommand):
         self.w("<table>")
         self.w("<thead>")
         self.w("<tr>")
-        self.w("    <th>Équipe</th>")
-        self.w("    <th>Score Tour 1</th>")
-        self.w("    <th>Score Tour 2</th>")
-        self.w("    <th>Total</th>")
-        self.w("    <th class=\"has-text-align-center\">Prix</th>")
+        self.w("\t<th>Équipe</th>")
+        self.w("\t<th>Score Tour 1</th>")
+        self.w("\t<th>Score Tour 2</th>")
+        self.w("\t<th>Total</th>")
+        self.w("\t<th class=\"has-text-align-center\">Prix</th>")
         self.w("</tr>")
         self.w("</thead>")
         self.w("<tbody>")
         for i, (participation, note) in enumerate(notes):
             self.w("<tr>")
-            bold = (not tournament.final and participation.final) or (tournament.final and i < 2)
-            if bold:
-                prefix, suffix = "    <td><strong>", "</strong></td>"
+            if i < (2 if len(notes) >= 7 else 1):
+                self.w(f"\t<th>{participation.team.name} ({participation.team.trigram})</td>")
             else:
-                prefix, suffix = "    <td>", "</td>"
-            self.w(f"{participation.team.name} ({participation.team.trigram})", prefix, suffix)
-            for tournament_round in [1, 2]:
-                pool_note = sum(pool.average(participation)
-                                for pool in tournament.pools.filter(participations=participation,
-                                                                    round=tournament_round).all())
-                self.w(f"{pool_note:.01f}", prefix, suffix)
-            self.w(f"{note:.01f}", prefix, suffix)
-            self.w(participation.mention_final if tournament.final else participation.mention, prefix, suffix)
+                self.w(f"\t<td>{participation.team.name} ({participation.team.trigram})</td>")
+            for pool in tournament.pools.filter(participations=participation).all():
+                pool_note = pool.average(participation)
+                self.w(f"\t<td>{pool_note:.01f}</td>")
+            self.w(f"\t<td>{note:.01f}</td>")
+            if i == 0:
+                self.w("\t<td class=\"has-text-align-center\">1<sup>er</sup> prix</td>")
+            elif i < (5 if tournament.final else 3):
+                self.w(f"\t<td class=\"has-text-align-center\">{i + 1}<sup>ème</sup> prix</td>")
+            elif i < 2 * len(notes) / 3:
+                self.w("\t<td class=\"has-text-align-center\">Mention très honorable</td>")
+            else:
+                self.w("\t<td class=\"has-text-align-center\">Mention honorable</td>")
             self.w("</tr>")
         self.w("</tbody>")
         self.w("</table>")

participation/management/commands/export_solutions.py

@@ -5,16 +5,16 @@ from pathlib import Path
 
 from django.conf import settings
 from django.core.management import BaseCommand
+from django.utils.translation import activate
 from participation.models import Solution, Tournament
 
 
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
+        activate('fr')
+
         base_dir = Path(__file__).parent.parent.parent.parent
         base_dir /= "output"
-        if not base_dir.is_dir():
-            base_dir.mkdir()
-        base_dir /= "solutions"
         if not base_dir.is_dir():
             base_dir.mkdir()
         base_dir /= "Par équipe"

participation/management/commands/fix_sympa_lists.py

@@ -1,6 +1,6 @@
 # Copyright (C) 2020 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
-from django.conf import settings
+
 from django.core.management import BaseCommand
 from django.db.models import Q
 from participation.models import Team, Tournament
@@ -13,9 +13,6 @@ class Command(BaseCommand):
         """
         Create Sympa mailing lists and register teams.
         """
-        if not settings.ML_MANAGEMENT:
-            return
-
         sympa = get_sympa_client()
 
         sympa.create_list("equipes", "Equipes du TFJM2", "hotline",

participation/management/commands/generate_seconds_sheet.py

@@ -12,7 +12,7 @@ from ...models import Passage, Tournament
 
 class Command(BaseCommand):
     def handle(self, *args, **options):
-        activate(settings.PREFERRED_LANGUAGE_CODE)
+        activate('fr')
         gc = gspread.service_account_from_dict(settings.GOOGLE_SERVICE_CLIENT)
         try:
             spreadsheet = gc.open("Tableau des deuxièmes", folder_id=settings.NOTES_DRIVE_FOLDER_ID)
@@ -51,25 +51,25 @@ class Command(BaseCommand):
             team3, score3 = sorted_notes[2]
 
             pool1 = tournament.pools.filter(round=1, participations=team2).first()
-            reporter_passage_1 = Passage.objects.get(pool__tournament=tournament, pool__round=1, reporter=team2)
+            defender_passage_1 = Passage.objects.get(pool__tournament=tournament, pool__round=1, defender=team2)
             opponent_passage_1 = Passage.objects.get(pool__tournament=tournament, pool__round=1, opponent=team2)
-            reviewer_passage_1 = Passage.objects.get(pool__tournament=tournament, pool__round=1, reviewer=team2)
+            reporter_passage_1 = Passage.objects.get(pool__tournament=tournament, pool__round=1, reporter=team2)
             pool2 = tournament.pools.filter(round=2, participations=team2).first()
-            reporter_passage_2 = Passage.objects.get(pool__tournament=tournament, pool__round=2, reporter=team2)
+            defender_passage_2 = Passage.objects.get(pool__tournament=tournament, pool__round=2, defender=team2)
             opponent_passage_2 = Passage.objects.get(pool__tournament=tournament, pool__round=2, opponent=team2)
-            reviewer_passage_2 = Passage.objects.get(pool__tournament=tournament, pool__round=2, reviewer=team2)
+            reporter_passage_2 = Passage.objects.get(pool__tournament=tournament, pool__round=2, reporter=team2)
 
             line.append(team2.team.trigram)
             line.append(str(pool1.jury_president or ""))
-            line.append(f"Pb. {reporter_passage_1.solution_number}")
-            line.extend([reporter_passage_1.average_reporter_writing, reporter_passage_1.average_reporter_oral,
+            line.append(f"Pb. {defender_passage_1.solution_number}")
+            line.extend([defender_passage_1.average_defender_writing, defender_passage_1.average_defender_oral,
                          opponent_passage_1.average_opponent_writing, opponent_passage_1.average_opponent_oral,
-                         reviewer_passage_1.average_reviewer_writing, reviewer_passage_1.average_reviewer_oral])
+                         reporter_passage_1.average_reporter_writing, reporter_passage_1.average_reporter_oral])
             line.append(str(pool2.jury_president or ""))
-            line.append(f"Pb. {reporter_passage_2.solution_number}")
-            line.extend([reporter_passage_2.average_reporter_writing, reporter_passage_2.average_reporter_oral,
+            line.append(f"Pb. {defender_passage_2.solution_number}")
+            line.extend([defender_passage_2.average_defender_writing, defender_passage_2.average_defender_oral,
                          opponent_passage_2.average_opponent_writing, opponent_passage_2.average_opponent_oral,
-                         reviewer_passage_2.average_reviewer_writing, reviewer_passage_2.average_reviewer_oral])
+                         reporter_passage_2.average_reporter_writing, reporter_passage_2.average_reporter_oral])
             line.extend([score2, f"{score1:.1f} ({team1.team.trigram})",
                          f"{score3:.1f} ({team3.team.trigram})"])
 

participation/migrations/0014_alter_team_trigram.py

@@ -1,31 +0,0 @@
-# Generated by Django 5.0.6 on 2024-06-07 12:46
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0013_alter_pool_options_pool_room"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="team",
-            name="trigram",
-            field=models.CharField(
-                help_text="The code must be composed of 3 uppercase letters.",
-                max_length=3,
-                unique=True,
-                validators=[
-                    django.core.validators.RegexValidator("^[A-Z]{3}$"),
-                    django.core.validators.RegexValidator(
-                        "^(?!BIT$|CNO$|CRO$|CUL$|FTG$|FCK$|FUC$|FUK$|FYS$|HIV$|IST$|MST$|KKK$|KYS$|SEX$)",
-                        message="This team code is forbidden.",
-                    ),
-                ],
-                verbose_name="code",
-            ),
-        ),
-    ]

participation/migrations/0015_tournament_solutions_available_third_phase_and_more.py

@@ -1,42 +0,0 @@
-# Generated by Django 5.0.6 on 2024-06-07 13:51
-
-import django.utils.timezone
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0014_alter_team_trigram"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="tournament",
-            name="solutions_available_second_phase",
-        ),
-        migrations.AddField(
-            model_name="tournament",
-            name="solutions_available_second_phase",
-            field=models.BooleanField(
-                default=False,
-                verbose_name="check this case when solutions for the second round become available",
-            ),
-        ),
-        migrations.AddField(
-            model_name="tournament",
-            name="solutions_available_third_phase",
-            field=models.BooleanField(
-                default=False,
-                verbose_name="check this case when solutions for the third round become available",
-            ),
-        ),
-        migrations.AddField(
-            model_name="tournament",
-            name="syntheses_third_phase_limit",
-            field=models.DateTimeField(
-                default=django.utils.timezone.now,
-                verbose_name="limit date to upload the syntheses for the third phase",
-            ),
-        )
-    ]

participation/migrations/0016_tournament_date_first_phase_and_more.py

@@ -1,35 +0,0 @@
-# Generated by Django 5.0.6 on 2024-06-07 14:01
-
-import datetime
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0015_tournament_solutions_available_third_phase_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="tournament",
-            name="date_first_phase",
-            field=models.DateField(
-                default=datetime.date.today, verbose_name="first phase date"
-            ),
-        ),
-        migrations.AddField(
-            model_name="tournament",
-            name="date_second_phase",
-            field=models.DateField(
-                default=datetime.date.today, verbose_name="first second date"
-            ),
-        ),
-        migrations.AddField(
-            model_name="tournament",
-            name="date_third_phase",
-            field=models.DateField(
-                default=datetime.date.today, verbose_name="third phase date"
-            ),
-        ),
-    ]

participation/migrations/0017_alter_passage_solution_number_alter_pool_round_and_more.py

@@ -1,77 +0,0 @@
-# Generated by Django 5.0.6 on 2024-06-13 08:53
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0016_tournament_date_first_phase_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="passage",
-            name="solution_number",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (1, "Problem #1"),
-                    (2, "Problem #2"),
-                    (3, "Problem #3"),
-                    (4, "Problem #4"),
-                    (5, "Problem #5"),
-                    (6, "Problem #6"),
-                    (7, "Problem #7"),
-                    (8, "Problem #8"),
-                    (9, "Problem #9"),
-                    (10, "Problem #10"),
-                ],
-                verbose_name="defended solution",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="pool",
-            name="round",
-            field=models.PositiveSmallIntegerField(
-                choices=[(1, "Round 1"), (2, "Round 2"), (3, "Round 3")],
-                verbose_name="round",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="solution",
-            name="problem",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (1, "Problem #1"),
-                    (2, "Problem #2"),
-                    (3, "Problem #3"),
-                    (4, "Problem #4"),
-                    (5, "Problem #5"),
-                    (6, "Problem #6"),
-                    (7, "Problem #7"),
-                    (8, "Problem #8"),
-                    (9, "Problem #9"),
-                    (10, "Problem #10"),
-                ],
-                verbose_name="problem",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="team",
-            name="trigram",
-            field=models.CharField(
-                help_text="The code must be composed of 4 uppercase letters.",
-                max_length=4,
-                unique=True,
-                validators=[
-                    django.core.validators.RegexValidator("^[A-Z]{3}[A-Z]*$"),
-                    django.core.validators.RegexValidator(
-                        "^(?!BIT$|CNO$|CRO$|CUL$|FTG$|FCK$|FUC$|FUK$|FYS$|HIV$|IST$|MST$|KKK$|KYS$|SEX$)",
-                        message="This team code is forbidden.",
-                    ),
-                ],
-                verbose_name="code",
-            ),
-        ),
-    ]

participation/migrations/0018_rename_reporter_to_reviewer.py

@@ -1,91 +0,0 @@
-# Generated by Django 5.0.6 on 2024-07-05 08:53
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        (
-            "participation",
-            "0017_alter_passage_solution_number_alter_pool_round_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="note",
-            old_name="reporter_oral",
-            new_name="reviewer_oral",
-        ),
-        migrations.RenameField(
-            model_name="note",
-            old_name="reporter_writing",
-            new_name="reviewer_writing",
-        ),
-        migrations.RenameField(
-            model_name="passage",
-            old_name="reporter",
-            new_name="reviewer",
-        ),
-        migrations.AlterField(
-            model_name="note",
-            name="reviewer_oral",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (0, 0),
-                    (1, 1),
-                    (2, 2),
-                    (3, 3),
-                    (4, 4),
-                    (5, 5),
-                    (6, 6),
-                    (7, 7),
-                    (8, 8),
-                    (9, 9),
-                    (10, 10),
-                ],
-                default=0,
-                verbose_name="reviewer oral note",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="note",
-            name="reviewer_writing",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (0, 0),
-                    (1, 1),
-                    (2, 2),
-                    (3, 3),
-                    (4, 4),
-                    (5, 5),
-                    (6, 6),
-                    (7, 7),
-                    (8, 8),
-                    (9, 9),
-                    (10, 10),
-                ],
-                default=0,
-                verbose_name="reviewer writing note",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="passage",
-            name="reviewer",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="+",
-                to="participation.participation",
-                verbose_name="reviewer",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="synthesis",
-            name="type",
-            field=models.PositiveSmallIntegerField(
-                choices=[(1, "opponent"), (2, "reviewer")]
-            ),
-        ),
-    ]

participation/migrations/0019_note_observer_oral_note_observer_writing_and_more.py

@@ -1,86 +0,0 @@
-# Generated by Django 5.0.6 on 2024-07-05 09:47
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0018_rename_reporter_to_reviewer"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="note",
-            name="observer_oral",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (-10, -10),
-                    (-9, -9),
-                    (-8, -8),
-                    (-7, -7),
-                    (-6, -6),
-                    (-5, -5),
-                    (-4, -4),
-                    (-3, -3),
-                    (-2, -2),
-                    (-1, -1),
-                    (0, 0),
-                    (1, 1),
-                    (2, 2),
-                    (3, 3),
-                    (4, 4),
-                    (5, 5),
-                    (6, 6),
-                    (7, 7),
-                    (8, 8),
-                    (9, 9),
-                    (10, 10),
-                ],
-                default=0,
-                verbose_name="observer oral note",
-            ),
-        ),
-        migrations.AddField(
-            model_name="note",
-            name="observer_writing",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (0, 0),
-                    (1, 1),
-                    (2, 2),
-                    (3, 3),
-                    (4, 4),
-                    (5, 5),
-                    (6, 6),
-                    (7, 7),
-                    (8, 8),
-                    (9, 9),
-                    (10, 10),
-                ],
-                default=0,
-                verbose_name="observer writing note",
-            ),
-        ),
-        migrations.AddField(
-            model_name="passage",
-            name="observer",
-            field=models.ForeignKey(
-                blank=True,
-                default=None,
-                null=True,
-                on_delete=django.db.models.deletion.SET_NULL,
-                related_name="+",
-                to="participation.participation",
-                verbose_name="observer",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="synthesis",
-            name="type",
-            field=models.PositiveSmallIntegerField(
-                choices=[(1, "opponent"), (2, "reviewer"), (3, "observer")]
-            ),
-        ),
-    ]

participation/migrations/0020_rename_synthesis_writtenreview_and_more.py

@@ -1,75 +0,0 @@
-# Generated by Django 5.0.6 on 2024-07-06 19:19
-
-import django.utils.timezone
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0019_note_observer_oral_note_observer_writing_and_more"),
-    ]
-
-    operations = [
-        migrations.RenameModel(
-            old_name="Synthesis",
-            new_name="WrittenReview",
-        ),
-        migrations.AlterModelOptions(
-            name="writtenreview",
-            options={
-                "ordering": ("passage__pool__round", "type"),
-                "verbose_name": "written review",
-                "verbose_name_plural": "written reviews",
-            },
-        ),
-        migrations.RenameField(
-            model_name="tournament",
-            old_name="syntheses_first_phase_limit",
-            new_name="reviews_first_phase_limit",
-        ),
-        migrations.RenameField(
-            model_name="tournament",
-            old_name="syntheses_second_phase_limit",
-            new_name="reviews_second_phase_limit",
-        ),
-        migrations.RenameField(
-            model_name="tournament",
-            old_name="syntheses_third_phase_limit",
-            new_name="reviews_third_phase_limit",
-        ),
-        migrations.AlterField(
-            model_name="tournament",
-            name="reviews_first_phase_limit",
-            field=models.DateTimeField(
-                default=django.utils.timezone.now,
-                verbose_name="limit date to upload the written reviews for the first phase",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="tournament",
-            name="reviews_second_phase_limit",
-            field=models.DateTimeField(
-                default=django.utils.timezone.now,
-                verbose_name="limit date to upload the written reviews for the second phase",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="tournament",
-            name="reviews_third_phase_limit",
-            field=models.DateTimeField(
-                default=django.utils.timezone.now,
-                verbose_name="limit date to upload the written reviews for the third phase",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="writtenreview",
-            name="passage",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="written_reviews",
-                to="participation.passage",
-                verbose_name="passage",
-            ),
-        ),
-    ]

participation/migrations/0021_rename_defender_oral_note_reporter_oral_and_more.py

@@ -1,133 +0,0 @@
-# Generated by Django 5.0.6 on 2024-07-06 20:00
-import django
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0020_rename_synthesis_writtenreview_and_more"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="note",
-            old_name="defender_oral",
-            new_name="reporter_oral",
-        ),
-        migrations.RenameField(
-            model_name="note",
-            old_name="defender_writing",
-            new_name="reporter_writing",
-        ),
-        migrations.RenameField(
-            model_name="passage",
-            old_name="defender",
-            new_name="reporter",
-        ),
-        migrations.RenameField(
-            model_name="passage",
-            old_name="defender_penalties",
-            new_name="reporter_penalties",
-        ),
-        migrations.AlterField(
-            model_name="passage",
-            name="solution_number",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (1, "Problem #1"),
-                    (2, "Problem #2"),
-                    (3, "Problem #3"),
-                    (4, "Problem #4"),
-                    (5, "Problem #5"),
-                    (6, "Problem #6"),
-                    (7, "Problem #7"),
-                    (8, "Problem #8"),
-                    (9, "Problem #9"),
-                    (10, "Problem #10"),
-                ],
-                verbose_name="reported solution",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="note",
-            name="reporter_oral",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (0, 0),
-                    (1, 1),
-                    (2, 2),
-                    (3, 3),
-                    (4, 4),
-                    (5, 5),
-                    (6, 6),
-                    (7, 7),
-                    (8, 8),
-                    (9, 9),
-                    (10, 10),
-                    (11, 11),
-                    (12, 12),
-                    (13, 13),
-                    (14, 14),
-                    (15, 15),
-                    (16, 16),
-                    (17, 17),
-                    (18, 18),
-                    (19, 19),
-                    (20, 20),
-                ],
-                default=0,
-                verbose_name="reporter oral note",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="note",
-            name="reporter_writing",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (0, 0),
-                    (1, 1),
-                    (2, 2),
-                    (3, 3),
-                    (4, 4),
-                    (5, 5),
-                    (6, 6),
-                    (7, 7),
-                    (8, 8),
-                    (9, 9),
-                    (10, 10),
-                    (11, 11),
-                    (12, 12),
-                    (13, 13),
-                    (14, 14),
-                    (15, 15),
-                    (16, 16),
-                    (17, 17),
-                    (18, 18),
-                    (19, 19),
-                    (20, 20),
-                ],
-                default=0,
-                verbose_name="reporter writing note",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="passage",
-            name="reporter",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.PROTECT,
-                related_name="+",
-                to="participation.participation",
-                verbose_name="reporter",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="passage",
-            name="reporter_penalties",
-            field=models.PositiveSmallIntegerField(
-                default=0,
-                help_text="Number of penalties for the reporter. The reporter will loose a 0.5 coefficient per penalty.",
-                verbose_name="penalties",
-            ),
-        ),
-    ]

participation/migrations/0022_alter_note_observer_oral.py

@@ -1,44 +0,0 @@
-# Generated by Django 5.0.6 on 2024-07-11 08:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0021_rename_defender_oral_note_reporter_oral_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="note",
-            name="observer_oral",
-            field=models.SmallIntegerField(
-                choices=[
-                    (-10, -10),
-                    (-9, -9),
-                    (-8, -8),
-                    (-7, -7),
-                    (-6, -6),
-                    (-5, -5),
-                    (-4, -4),
-                    (-3, -3),
-                    (-2, -2),
-                    (-1, -1),
-                    (0, 0),
-                    (1, 1),
-                    (2, 2),
-                    (3, 3),
-                    (4, 4),
-                    (5, 5),
-                    (6, 6),
-                    (7, 7),
-                    (8, 8),
-                    (9, 9),
-                    (10, 10),
-                ],
-                default=0,
-                verbose_name="observer oral note",
-            ),
-        ),
-    ]

participation/migrations/0023_tournament_unified_registration.py

@@ -1,21 +0,0 @@
-# Generated by Django 5.1.5 on 2025-01-14 18:06
-
-import django.core.validators
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("participation", "0022_alter_note_observer_oral"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="tournament",
-            name="unified_registration",
-            field=models.BooleanField(
-                default=False, verbose_name="unified registration"
-            ),
-        ),
-    ]

participation/signals.py

@@ -1,9 +1,7 @@
 # Copyright (C) 2020 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 from typing import Union
 
-from django.conf import settings
 from participation.models import Note, Participation, Passage, Pool, Team, Tournament
 from registration.models import Payment
 from tfjm.lists import get_sympa_client
@@ -15,8 +13,6 @@ def create_team_participation(instance, created, raw, **_):
     """
     if not raw:
         participation = Participation.objects.get_or_create(team=instance)[0]
-        if settings.TFJM_APP == "ETEAM":
-            participation.tournament = Tournament.objects.first()
         participation.save()
         if not created:
             participation.team.create_mailing_list()
@@ -26,7 +22,7 @@ def update_mailing_list(instance: Team, raw, **_):
     """
     When a team name or trigram got updated, update mailing lists
     """
-    if instance.pk and not raw and settings.ML_MANAGEMENT:
+    if instance.pk and not raw:
         old_team = Team.objects.get(pk=instance.pk)
         if old_team.trigram != instance.trigram:
             # Delete old mailing list, create a new one
@@ -45,7 +41,7 @@ def create_payments(instance: Participation, created, raw, **_):
     """
     When a participation got created, create an associated payment.
     """
-    if instance.valid and not raw and settings.PAYMENT_MANAGEMENT:
+    if instance.valid and not raw:
         for student in instance.team.students.all():
             payment_qs = Payment.objects.filter(registrations=student, final=False)
             if payment_qs.exists():

participation/tables.py

@@ -106,24 +106,19 @@ class PoolTable(tables.Table):
 
 
 class PassageTable(tables.Table):
-    # FIXME Ne pas afficher l'équipe observatrice si non nécessaire
-
-    reporter = tables.LinkColumn(
+    defender = tables.LinkColumn(
         "participation:passage_detail",
         args=[tables.A("id")],
-        verbose_name=_("reporter").capitalize,
+        verbose_name=_("defender").capitalize,
     )
 
-    def render_reporter(self, value):
+    def render_defender(self, value):
         return value.team.trigram
 
     def render_opponent(self, value):
         return value.team.trigram
 
-    def render_reviewer(self, value):
-        return value.team.trigram
-
-    def render_observer(self, value):
+    def render_reporter(self, value):
         return value.team.trigram
 
     class Meta:
@@ -131,7 +126,7 @@ class PassageTable(tables.Table):
             'class': 'table table-condensed table-striped text-center',
         }
         model = Passage
-        fields = ('reporter', 'opponent', 'reviewer', 'observer', 'solution_number', )
+        fields = ('defender', 'opponent', 'reporter', 'solution_number', )
 
 
 class NoteTable(tables.Table):
@@ -159,5 +154,5 @@ class NoteTable(tables.Table):
             'class': 'table table-condensed table-striped text-center',
         }
         model = Note
-        fields = ('jury', 'reporter_writing', 'reporter_oral', 'opponent_writing', 'opponent_oral',
-                  'reviewer_writing', 'reviewer_oral', 'observer_writing', 'observer_oral', 'update',)
+        fields = ('jury', 'defender_writing', 'defender_oral', 'opponent_writing', 'opponent_oral',
+                  'reporter_writing', 'reporter_oral', 'update',)

participation/templates/participation/note_form.html

@@ -6,7 +6,7 @@
     <form method="post">
         <div id="form-content">
             <h4>{% trans "Notes of" %} {{ note.jury }}</h4>
-            <h5>{% trans "Defense of" %} {{ note.passage.reporter.team.trigram }}, {% trans "Pb." %} {{ note.passage.solution_number }}</h5>
+            <h5>{% trans "Defense of" %} {{ note.passage.defender.team.trigram }}, {% trans "Pb." %} {{ note.passage.solution_number }}</h5>
             <hr>
             {% csrf_token %}
             {{ form|crispy }}

participation/templates/participation/passage_detail.html

@@ -25,32 +25,27 @@
                 <dt class="col-sm-3">{% trans "Position:" %}</dt>
                 <dd class="col-sm-9">{{ passage.position }}</dd>
 
-                <dt class="col-sm-3">{% trans "Reporter:" %}</dt>
-                <dd class="col-sm-9"><a href="{{ passage.reporter.get_absolute_url }}">{{ passage.reporter.team }}</a></dd>
+                <dt class="col-sm-3">{% trans "Defender:" %}</dt>
+                <dd class="col-sm-9"><a href="{{ passage.defender.get_absolute_url }}">{{ passage.defender.team }}</a></dd>
 
                 <dt class="col-sm-3">{% trans "Opponent:" %}</dt>
                 <dd class="col-sm-9"><a href="{{ passage.opponent.get_absolute_url }}">{{ passage.opponent.team }}</a></dd>
 
-                <dt class="col-sm-3">{% trans "Reviewer:" %}</dt>
-                <dd class="col-sm-9"><a href="{{ passage.reviewer.get_absolute_url }}">{{ passage.reviewer.team }}</a></dd>
+                <dt class="col-sm-3">{% trans "Reporter:" %}</dt>
+                <dd class="col-sm-9"><a href="{{ passage.reporter.get_absolute_url }}">{{ passage.reporter.team }}</a></dd>
 
-                {% if passage.observer %}
-                    <dt class="col-sm-3">{% trans "Observer:" %}</dt>
-                    <dd class="col-sm-9"><a href="{{ passage.observer.get_absolute_url }}">{{ passage.observer.team }}</a></dd>
-                {% endif %}
+                <dt class="col-sm-3">{% trans "Defended solution:" %}</dt>
+                <dd class="col-sm-9"><a href="{{ passage.defended_solution.file.url }}">{{ passage.defended_solution }}</a></dd>
 
-                <dt class="col-sm-3">{% trans "Reported solution:" %}</dt>
-                <dd class="col-sm-9"><a href="{{ passage.reported_solution.file.url }}">{{ passage.reported_solution }}</a></dd>
-
-                <dt class="col-sm-3">{% trans "Reporter penalties count:" %}</dt>
-                <dd class="col-sm-9">{{ passage.reporter_penalties }}</dd>
+                <dt class="col-sm-3">{% trans "Defender penalties count:" %}</dt>
+                <dd class="col-sm-9">{{ passage.defender_penalties }}</dd>
 
                 <dt class="col-sm-3">{% trans "Syntheses:" %}</dt>
                 <dd class="col-sm-9">
-                    {% for review in passage.written_reviews.all %}
-                        <a href="{{ review.file.url }}">{{ review }}{% if not forloop.last %}, {% endif %}</a>
+                    {% for synthesis in passage.syntheses.all %}
+                        <a href="{{ synthesis.file.url }}">{{ synthesis }}{% if not forloop.last %}, {% endif %}</a>
                     {% empty %}
-                        {% trans "No review was uploaded yet." %}
+                        {% trans "No synthesis was uploaded yet." %}
                     {% endfor %}
                 </dd>
             </dl>
@@ -63,7 +58,7 @@
             </div>
         {% elif user.registration.participates %}
             <div class="card-footer text-center">
-                <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadWrittenReviewModal">{% trans "Upload review" %}</button>
+                <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadSynthesisModal">{% trans "Upload synthesis" %}</button>
             </div>
         {% endif %}
     </div>
@@ -79,20 +74,16 @@
             <div class="card-body">
                 <dl class="row">
                     <dt class="col-sm-8">
-                        {% trans "Average points for the reporter writing" %}
-                        ({{ passage.reporter.team.trigram }}) :
+                        {% trans "Average points for the defender writing" %}
+                        ({{ passage.defender.team.trigram }}) :
                     </dt>
-                    <dd class="col-sm-4">
-                        {{ passage.average_reporter_writing|floatformat }}/{% if TFJM_APP == "TFJM" %}20{% else %}10{% endif %}
-                    </dd>
+                    <dd class="col-sm-4">{{ passage.average_defender_writing|floatformat }}/20</dd>
 
                     <dt class="col-sm-8">
-                        {% trans "Average points for the reporter oral" %}
-                        ({{ passage.reporter.team.trigram }}) :
+                        {% trans "Average points for the defender oral" %}
+                        ({{ passage.defender.team.trigram }}) :
                     </dt>
-                    <dd class="col-sm-4">
-                        {{ passage.average_reporter_oral|floatformat }}/{% if TFJM_APP == "TFJM" %}20{% else %}10{% endif %}
-                    </dd>
+                    <dd class="col-sm-4">{{ passage.average_defender_oral|floatformat }}/20</dd>
 
                     <dt class="col-sm-8">
                         {% trans "Average points for the opponent writing" %}
@@ -107,65 +98,38 @@
                     <dd class="col-sm-4">{{ passage.average_opponent_oral|floatformat }}/10</dd>
 
                     <dt class="col-sm-8">
-                        {% trans "Average points for the reviewer writing" %}
-                        ({{ passage.reviewer.team.trigram }}) :
+                        {% trans "Average points for the reporter writing" %}
+                        ({{ passage.reporter.team.trigram }}) :
                     </dt>
-                    <dd class="col-sm-4">{{ passage.average_reviewer_writing|floatformat }}/10</dd>
+                    <dd class="col-sm-4">{{ passage.average_reporter_writing|floatformat }}/10</dd>
 
                     <dt class="col-sm-8">
-                        {% trans "Average points for the reviewer oral" %}
-                        ({{ passage.reviewer.team.trigram }}) :
+                        {% trans "Average points for the reporter oral" %}
+                        ({{ passage.reporter.team.trigram }}) :
                     </dt>
-                    <dd class="col-sm-4">{{ passage.average_reviewer_oral|floatformat }}/10</dd>
-
-                    {% if passage.observer %}
-                        <dt class="col-sm-8">
-                            {% trans "Average points for the observer writing" %}
-                            ({{ passage.observer.team.trigram }}) :
-                        </dt>
-                        <dd class="col-sm-4">{{ passage.average_observer_writing|floatformat }}/10</dd>
-
-                        <dt class="col-sm-8">
-                            {% trans "Average points for the observer oral" %}
-                            ({{ passage.observer.team.trigram }}) :
-                        </dt>
-                        <dd class="col-sm-4">{{ passage.average_observer_oral|floatformat }}/10</dd>
-                    {% endif %}
+                    <dd class="col-sm-4">{{ passage.average_reporter_oral|floatformat }}/10</dd>
                 </dl>
 
                 <hr>
 
                 <dl class="row">
                     <dt class="col-sm-8">
-                        {% trans "Reporter points" %}
-                        ({{ passage.reporter.team.trigram }}) :
+                        {% trans "Defender points" %}
+                        ({{ passage.defender.team.trigram }}) :
                     </dt>
-                    <dd class="col-sm-4">
-                        {{ passage.average_reporter|floatformat }}/{% if TFJM_APP == "TFJM" %}52{% else %}50{% endif %}
-                    </dd>
+                    <dd class="col-sm-4">{{ passage.average_defender|floatformat }}/52</dd>
 
                     <dt class="col-sm-8">
                         {% trans "Opponent points" %}
                         ({{ passage.opponent.team.trigram }}) :
                     </dt>
-                    <dd class="col-sm-4">
-                        {{ passage.average_opponent|floatformat }}/{% if TFJM_APP == "TFJM" %}29{% else %}{% if passage.observer %}26{% else %}29{% endif %}{% endif %}
-                    </dd>
+                    <dd class="col-sm-4">{{ passage.average_opponent|floatformat }}/29</dd>
 
                     <dt class="col-sm-8">
-                        {% trans "reviewer points" %}
-                        ({{ passage.reviewer.team.trigram }}) :
+                        {% trans "Reporter points" %}
+                        ({{ passage.reporter.team.trigram }}) :
                     </dt>
-                    <dd class="col-sm-4">{{ passage.average_reviewer|floatformat }}/{% if TFJM_APP == "TFJM" %}19{% else %}{% if passage.observer %}18{% else %}21{% endif %}{% endif %}</dd>
-
-                    {% if passage.observer %}
-                        <dt class="col-sm-8">
-                            {% trans "observer points" %}
-                            ({{ passage.observer.team.trigram }}) :
-                        </dt>
-
-                        <dd class="col-sm-4">{{ passage.average_observer|floatformat }}/6</dd>
-                    {% endif %}
+                    <dd class="col-sm-4">{{ passage.average_reporter|floatformat }}/19</dd>
                 </dl>
             </div>
         </div>
@@ -184,10 +148,10 @@
             {% include "base_modal.html" with modal_id=note.modal_name %}
         {% endfor %}
     {% elif user.registration.participates %}
-        {% trans "Upload review" as modal_title %}
+        {% trans "Upload synthesis" as modal_title %}
         {% trans "Upload" as modal_button %}
-        {% url "participation:upload_written_review" pk=passage.pk as modal_action %}
-        {% include "base_modal.html" with modal_id="uploadWrittenReview" modal_enctype="multipart/form-data" %}
+        {% url "participation:upload_synthesis" pk=passage.pk as modal_action %}
+        {% include "base_modal.html" with modal_id="uploadSynthesis" modal_enctype="multipart/form-data" %}
     {% endif %}
 {% endblock %}
 
@@ -201,8 +165,8 @@
                 initModal("{{ note.modal_name }}", "{% url "participation:update_notes" pk=note.pk %}")
             {% endfor %}
             {% elif user.registration.participates %}
-                initModal("uploadWrittenReview", "{% url "participation:upload_written_review" pk=passage.pk %}")
+                initModal("uploadSynthesis", "{% url "participation:upload_synthesis" pk=passage.pk %}")
             {% endif %}
-        })
+        });
     </script>
 {% endblock %}

participation/templates/participation/pool_detail.html

@@ -46,10 +46,10 @@
                     </a>
                 </dd>
 
-                <dt class="col-sm-3">{% trans "Reported solutions:" %}</dt>
+                <dt class="col-sm-3">{% trans "Defended solutions:" %}</dt>
                 <dd class="col-sm-9">
                     {% for passage in pool.passages.all %}
-                        <a href="{{ passage.reported_solution.file.url }}">{{ passage.reporter.team.trigram }} — {{ passage.get_solution_number_display }}</a>{% if not forloop.last %}, {% endif %}
+                        <a href="{{ passage.defended_solution.file.url }}">{{ passage.defender.team.trigram }} — {{ passage.get_solution_number_display }}</a>{% if not forloop.last %}, {% endif %}
                     {% endfor %}
                     <a href="{% url 'participation:pool_download_solutions' pool_id=pool.id %}" class="badge rounded-pill text-bg-secondary">
                         <i class="fas fa-download"></i> {% trans "Download all" %}
@@ -61,16 +61,16 @@
                     <ul class="list-group list-group-flush">
                         {% for passage in pool.passages.all %}
                             <li class="list-group-item">
-                                {{ passage.reporter.team.trigram }} — {{ passage.get_solution_number_display }} :
-                                {% for review in passage.written_reviews.all %}
-                                    <a href="{{ review.file.url }}">{{ review.participation.team.trigram }} ({{ review.get_type_display }})</a>{% if not forloop.last %}, {% endif %}
+                                {{ passage.defender.team.trigram }} — {{ passage.get_solution_number_display }} :
+                                {% for synthesis in passage.syntheses.all %}
+                                    <a href="{{ synthesis.file.url }}">{{ synthesis.participation.team.trigram }} ({{ synthesis.get_type_display }})</a>{% if not forloop.last %}, {% endif %}
                                 {% empty %}
-                                    {% trans "No review was uploaded yet." %}
+                                    {% trans "No synthesis was uploaded yet." %}
                                 {% endfor %}
                             </li>
                         {% endfor %}
                     </ul>
-                    <a href="{% url 'participation:pool_download_written_reviews' pool_id=pool.id %}" class="badge rounded-pill text-bg-secondary">
+                    <a href="{% url 'participation:pool_download_syntheses' pool_id=pool.id %}" class="badge rounded-pill text-bg-secondary">
                         <i class="fas fa-download"></i> {% trans "Download all" %}
                     </a>
                 </dd>

participation/templates/participation/team_detail.html

@@ -10,19 +10,19 @@
         </div>
     <div class="card-body">
         <dl class="row">
-            <dt class="col-sm-6 text-sm-end">{% trans "Name:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Name:" %}</dt>
             <dd class="col-sm-6">{{ team.name }}</dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Trigram:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Trigram:" %}</dt>
             <dd class="col-sm-6">{{ team.trigram }}</dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Email:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Email:" %}</dt>
             <dd class="col-sm-6"><a href="mailto:{{ team.email }}">{{ team.email }}</a></dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Access code:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Access code:" %}</dt>
             <dd class="col-sm-6">{{ team.access_code }}</dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Coaches:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Coaches:" %}</dt>
             <dd class="col-sm-6">
                 {% for coach in team.coaches.all %}
                     <a href="{% url "registration:user_detail" pk=coach.user.pk %}">{{ coach }}</a>{% if not forloop.last %},{% endif %}
@@ -31,7 +31,7 @@
                 {% endfor %}
             </dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Participants:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Participants:" %}</dt>
             <dd class="col-sm-6">
                 {% for student in team.students.all %}
                     <a href="{% url "registration:user_detail" pk=student.user.pk %}">{{ student }}</a>{% if not forloop.last %},{% endif %}
@@ -40,7 +40,7 @@
                 {% endfor %}
             </dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Tournament:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Tournament:" %}</dt>
             <dd class="col-sm-6">
                 {% if team.participation.tournament %}
                     <a href="{% url "participation:tournament_detail" pk=team.participation.tournament.pk %}">{{ team.participation.tournament }}</a>
@@ -49,7 +49,7 @@
                 {% endif %}
             </dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Photo authorizations:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Photo authorizations:" %}</dt>
             <dd class="col-sm-6">
                 {% for participant in team.participants.all %}
                     {% if participant.photo_authorization %}
@@ -61,7 +61,7 @@
             </dd>
 
             {% if team.participation.final %}
-                <dt class="col-sm-6 text-sm-end">{% trans "Photo authorizations (final):" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Photo authorizations (final):" %}</dt>
                 <dd class="col-sm-6">
                     {% for participant in team.participants.all %}
                         {% if participant.photo_authorization_final %}
@@ -73,38 +73,34 @@
                 </dd>
             {% endif %}
 
-            {% if not team.participation.tournament.remote %}
-                {% if TFJM.HEALTH_SHEET_REQUIRED %}
-                    <dt class="col-sm-6 text-sm-end">{% trans "Health sheets:" %}</dt>
-                    <dd class="col-sm-6">
-                        {% for student in team.students.all %}
-                            {% if student.under_18 %}
-                                {% if student.health_sheet %}
-                                    <a href="{{ student.health_sheet.url }}">{{ student }}</a>{% if not forloop.last %},{% endif %}
-                                {% else %}
-                                    {{ student }} ({% trans "Not uploaded yet" %}){% if not forloop.last %},{% endif %}
-                                {% endif %}
+            {% if not team.participation.tournament.remote  %}
+                <dt class="col-sm-6 text-end">{% trans "Health sheets:" %}</dt>
+                <dd class="col-sm-6">
+                    {% for student in team.students.all %}
+                        {% if student.under_18 %}
+                            {% if student.health_sheet %}
+                                <a href="{{ student.health_sheet.url }}">{{ student }}</a>{% if not forloop.last %},{% endif %}
+                            {% else %}
+                                {{ student }} ({% trans "Not uploaded yet" %}){% if not forloop.last %},{% endif %}
                             {% endif %}
-                        {% endfor %}
-                    </dd>
-                {% endif %}
+                        {% endif %}
+                    {% endfor %}
+                </dd>
 
-                {% if TFJM.VACCINE_SHEET_REQUIRED %}
-                    <dt class="col-sm-6 text-sm-end">{% trans "Vaccine sheets:" %}</dt>
-                    <dd class="col-sm-6">
-                        {% for student in team.students.all %}
-                            {% if student.under_18 %}
-                                {% if student.vaccine_sheet %}
-                                    <a href="{{ student.vaccine_sheet.url }}">{{ student }}</a>{% if not forloop.last %},{% endif %}
-                                {% else %}
-                                    {{ student }} ({% trans "Not uploaded yet" %}){% if not forloop.last %},{% endif %}
-                                {% endif %}
+                <dt class="col-sm-6 text-end">{% trans "Vaccine sheets:" %}</dt>
+                <dd class="col-sm-6">
+                    {% for student in team.students.all %}
+                        {% if student.under_18 %}
+                            {% if student.vaccine_sheet %}
+                                <a href="{{ student.vaccine_sheet.url }}">{{ student }}</a>{% if not forloop.last %},{% endif %}
+                            {% else %}
+                                {{ student }} ({% trans "Not uploaded yet" %}){% if not forloop.last %},{% endif %}
                             {% endif %}
-                        {% endfor %}
-                    </dd>
-                {% endif %}
+                        {% endif %}
+                    {% endfor %}
+                </dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Parental authorizations:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Parental authorizations:" %}</dt>
                 <dd class="col-sm-6">
                     {% for student in team.students.all %}
                         {% if student.under_18 %}
@@ -118,7 +114,7 @@
                 </dd>
 
                 {% if team.participation.final %}
-                    <dt class="col-sm-6 text-sm-end">{% trans "Parental authorizations (final):" %}</dt>
+                    <dt class="col-sm-6 text-end">{% trans "Parental authorizations (final):" %}</dt>
                     <dd class="col-sm-6">
                         {% for student in team.students.all %}
                             {% if student.under_18_final %}
@@ -133,19 +129,17 @@
                 {% endif %}
             {% endif %}
 
-            {% if TFJM.MOTIVATION_LETTER_REQUIRED %}
-                <dt class="col-sm-6 text-sm-end">{% trans "Motivation letter:" %}</dt>
-                <dd class="col-sm-6">
-                    {% if team.motivation_letter %}
-                        <a href="{{ team.motivation_letter.url }}">{% trans "Download" %}</a>
-                    {% else %}
-                        <em>{% trans "Not uploaded yet" %}</em>
-                    {% endif %}
-                    {% if user.registration.team == team and not user.registration.team.participation.valid or user.registration.is_admin %}
-                        <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadMotivationLetterModal">{% trans "Replace" %}</button>
-                    {% endif %}
-                </dd>
-            {% endif %}
+            <dt class="col-sm-6 text-end">{% trans "Motivation letter:" %}</dt>
+            <dd class="col-sm-6">
+                {% if team.motivation_letter %}
+                    <a href="{{ team.motivation_letter.url }}">{% trans "Download" %}</a>
+                {% else %}
+                    <em>{% trans "Not uploaded yet" %}</em>
+                {% endif %}
+                {% if user.registration.team == team and not user.registration.team.participation.valid or user.registration.is_admin %}
+                    <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadMotivationLetterModal">{% trans "Replace" %}</button>
+                {% endif %}
+            </dd>
 
         {% if user.registration.is_volunteer %}
             {% if user.registration in self.team.participation.tournament.organizers or user.registration.is_admin %}
@@ -161,7 +155,7 @@
             <hr class="my-3">
             {% for student in team.students.all %}
                 {% for payment in student.payments.all %}
-                    <dt class="col-sm-6 text-sm-end">
+                    <dt class="col-sm-6 text-end">
                         {% trans "Payment of" %} {{ student }}
                         {% if payment.grouped %}({% trans "grouped" %}){% endif %}
                         {% if payment.final %} ({% trans "final" %}){% endif %} :
@@ -240,12 +234,10 @@
         {% endif %}
     {% endif %}
 
-    {% if TFJM.MOTIVATION_LETTER_REQUIRED %}
-        {% trans "Upload motivation letter" as modal_title %}
-        {% trans "Upload" as modal_button %}
-        {% url "participation:upload_team_motivation_letter" pk=team.pk as modal_action %}
-        {% include "base_modal.html" with modal_id="uploadMotivationLetter" modal_enctype="multipart/form-data" %}
-    {% endif %}
+    {% trans "Upload motivation letter" as modal_title %}
+    {% trans "Upload" as modal_button %}
+    {% url "participation:upload_team_motivation_letter" pk=team.pk as modal_action %}
+    {% include "base_modal.html" with modal_id="uploadMotivationLetter" modal_enctype="multipart/form-data" %}
 
     {% trans "Update team" as modal_title %}
     {% trans "Update" as modal_button %}
@@ -261,9 +253,7 @@
 {% block extrajavascript %}
     <script>
         document.addEventListener('DOMContentLoaded', () => {
-            {% if TFJM.MOTIVATION_LETTER_REQUIRED %}
-              initModal("uploadMotivationLetter", "{% url "participation:upload_team_motivation_letter" pk=team.pk %}")
-            {% endif %}
+            initModal("uploadMotivationLetter", "{% url "participation:upload_team_motivation_letter" pk=team.pk %}")
             initModal("updateTeam", "{% url "participation:update_team" pk=team.pk %}")
             initModal("leaveTeam", "{% url "participation:team_leave" %}")
         })

participation/templates/participation/tex/bareme.tex

@@ -17,15 +17,13 @@
 \usepackage{array}
 \usepackage{multirow}
 \usepackage{footnote}
-\usepackage{rotating}
+\usepackage{xintexpr}
 
 \addtolength{\textwidth}{4cm}
 \setlength{\parindent}{0mm}
 
 \geometry{left=1.6cm,right=1.6cm,top=1.2cm,bottom=1.2cm}
 
-\DeclareUnicodeCharacter{22C5}{\textperiodcentered{}}
-
 \newcommand{\tfjm}{$\mathbb{TFJM}^2$}
 \pagestyle{empty}
 \renewcommand{\leq}{\leqslant}
@@ -43,7 +41,7 @@
 \begin{center}
 \begin{itemize}
 {% for passage in passages.all %}
-\item D\'efenseur⋅se au passage {{ forloop.counter }} : \underline{\texttt{~{{ passage.reporter.team.trigram }}~}} $\qquad$ probl\`eme \underline{~{{ passage.solution_number }}~}
+\item D\'efenseur\textperiodcentered{}se au passage {{ forloop.counter }} : \underline{\texttt{~{{ passage.defender.team.trigram }}~}} $\qquad$ probl\`eme \underline{~{{ passage.solution_number }}~}
 {% endfor %}
 \end{itemize}
 \end{center}
@@ -52,24 +50,24 @@
 
 %%%%%%%%%%%%%%%%%%%%%DEFENSEUR
 \begin{tabular}{|c|p{24mm}|p{11cm}|c|{% for passage in passages.all %}p{2cm}|{% endfor %}}\hline
-\multicolumn{4}{|l|}{Læ {\bf D\'efenseur⋅se} \normalsize pr\'esente les id\'ees et r\'esultats principaux pour la solution du probl\`eme.} {% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.reporter.team.trigram }} {% endfor %}\\ \hline \hline
+\multicolumn{4}{|l|}{Læ {\bf D\'efenseur\textperiodcentered{}se} \normalsize pr\'esente les id\'ees et r\'esultats principaux pour la solution du probl\`eme.} {% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.defender.team.trigram }} {% endfor %}\\ \hline \hline
 
 %ECRIT
-\multirow{7}{3mm}{\bf \begin{turn}{90}ÉCRIT\end{turn}} & \multirow{3}{24mm}{Partie scientifique} & Profondeur et difficulté des éléments présentés & [0,6] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
+\multirow{6}{3mm}{\centering \bf\'E\\ C\\ R\\ I\\ T} & \multirow{3}{20mm}{Partie scientifique} & Profondeur et difficulté des éléments présentés & [0,6] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Présence, exactitude et justesse des démonstrations et algorithmes & [0,6] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Pertinence, efficacité et élégance & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multirow{3}{24mm}{Forme}& Clarté du raisonnement (explications, exemples, illustrations, schémas, etc.) & [0,3]{{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
+&\multirow{3}{20mm}{Forme}& Clarté du raisonnement (explications, exemples, illustrations, schémas, etc.) & [0,3]{{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
 && Présentation (lisibilité, respect du format, etc.) & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 &\multicolumn{3}{|l|}{\bf TOTAL \'ECRIT (/20)} {{ esp|safe }} \\ \hline \hline
 
 %ORAL
-\multirow{11}{3mm}{\bf \begin{turn}{90}ORAL\end{turn}} & \multirow{6}{24mm}{Présentation orale} & Compréhension du matériel présenté, connaissance et maîtrise des sujets mathématiques utilisés \emph{lors de la présentation} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
+\multirow{8}{3mm}{\centering\bf O\\ R\\ A\\ L} & \multirow{4}{20mm}{Présentation orale} & Compréhension du matériel présenté, connaissance et maîtrise des sujets mathématiques utilisés \emph{lors de la présentation} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Pertinence des choix (démonstrations, exemples, profondeur au regard de la solution écrite) & [0,4] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Pédagogie et clarté du discours (explications, illustrations, etc.) & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Brieveté et propreté de la présentation & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multirow{3}{24mm}{Débats} & Réponses correctes aux questions posées & [0,5] {{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
+&\multirow{2}{20mm}{Débats} & Réponses correctes aux questions posées & [0,5] {{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
 && Capacité de faire avancer le débat (expliquer les limites de ses connaissances, des conjectures, rechercher en direct, etc.) & [0,4] {{ esp|safe }} \\ \cline{2-{{ passages.count|add:4 }}}
-&\multirow{2}{24mm}{Malus} & Attitude irrespectueuse ? & [--6,0] {{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
+&\multirow{2}{20mm}{Malus} & Attitude irrespectueuse ? & [--6,0] {{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
 && Non-conformité de la présentation avec le matériel écrit ? & [--6,0] {{ esp|safe }} \\ \cline{2-{{ passages.count|add:4 }}}
 &\multicolumn{3}{|l|}{\bf TOTAL ORAL (/20)} {{ esp|safe }} \\ \hline
 
@@ -79,21 +77,21 @@
 
 %%%%%%%%%%%%%%%%%OPPOSANT
 \begin{tabular}{|c|p{24mm}|p{11cm}|c{% for passage in passages.all %}|p{2cm}{% endfor %}|}\hline
-\multicolumn{4}{|l|}{L' {\bf Opposant⋅e} \normalsize fournit une analyse critique de la solution et de la pr\'esentation.}
+\multicolumn{4}{|l|}{L' {\bf Opposant\textperiodcentered{}e} \normalsize fournit une analyse critique de la solution et de la pr\'esentation.}
 {% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.opponent.team.trigram }} {% endfor %} \\ \hline \hline
 
 %ECRIT
-\multirow{6}{3mm}{\bf \begin{turn}{90}ÉCRIT\end{turn}} &\multirow{4}{24mm}{Partie scientifique} & Recul et esprit critique par rapport à la solution proposée & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
+\multirow{4}{3mm}{\centering\bf\'E\\ C\\ R\\ I\\ T} &\multirow{3}{20mm}{Partie scientifique} & Recul et esprit critique par rapport à la solution proposée & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Validité des erreurs et points positifs soulevés & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Repérer les erreurs et points positifs les plus importants et les hiérarchiser & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 & Forme & Pr\'esentation (lisibilité, respect du format, etc.) & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 &\multicolumn{3}{|l|}{\bf TOTAL \'ECRIT (/10)} {{ esp|safe }} \\ \hline \hline
 
 %ORAL
-\multirow{10}{3mm}{\bf \begin{turn}{90}ORAL\end{turn}} & \multirow{5}{24mm}{Questions et discours de l'opposant⋅e} & Pertinence des questions (importance des sujets abordés, des points soulevés) & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
+\multirow{6}{3mm}{\centering\bf O\\ R\\ A\\ L} & \multirow{3}{20mm}{Questions et discours de l'opposant\textperiodcentered{}e} & Pertinence des questions (importance des sujets abordés, des points soulevés) & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Gestion de l'échange (formulation des questions, réaction aux réponses, articulation entre les questions, gestion du temps) & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Capacité à évaluer la qualité de la prestation de læ Défenseur⋅se (présentation et réponses à l'Opposant⋅e) & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&& Réponses aux questions de læ Rapporteur⋅rice et du jury (fond et capacité à faire avancer le débat) & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
+&& Réponses aux questions de læ Rapporteur\textperiodcentered{}rice et du jury (fond et capacité à faire avancer le débat) & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 & Malus & Attitude irrespectueuse ? & [-3,0] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 &\multicolumn{3}{|l|}{\bf TOTAL ORAL (/10)} {{ esp|safe }}\\ \hline
 \end{tabular}
@@ -102,20 +100,20 @@
 
 %%%%%%%%%%%%%%%%%%%%%%RAPPORTEUR.RICE
 \begin{tabular}{|c|p{24mm}|p{11cm}|c{% for passage in passages.all %}|p{2cm}{% endfor %}|}\hline
-\multicolumn{4}{|l|}{Læ {\bf Rapporteur⋅rice} \normalsize \'evalue le d\'ebat entre læ D\'efenseur⋅se et l'Opposant⋅e.} {% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.reviewer.team.trigram }} {% endfor %}\\ \hline \hline
+\multicolumn{4}{|l|}{Læ {\bf Rapporteur\textperiodcentered{}rice} \normalsize \'evalue le d\'ebat entre læ D\'efenseur\textperiodcentered{}se et l'Opposant\textperiodcentered{}e.} {% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.reporter.team.trigram }} {% endfor %}\\ \hline \hline
 
 %ECRIT
-\multirow{6}{3mm}{\bf \begin{turn}{90}ÉCRIT\end{turn}} &\multirow{4}{24mm}{Partie scientifique} & Recul et esprit critique par rapport à la solution proposée & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
+\multirow{4}{3mm}{\centering\bf\'E\\ C\\ R\\ I\\ T} &\multirow{3}{20mm}{Partie scientifique} & Recul et esprit critique par rapport à la solution proposée & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Validité des erreurs et points positifs soulevés & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Repérer les erreurs et points positifs les plus importants et les hiérarchiser & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 & Forme & Présentation (lisibilité, respect du format, etc.) & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 &\multicolumn{3}{|l|}{\bf TOTAL \'ECRIT (/10)} {{ esp|safe }}\\ \hline \hline
 
 %ORAL
-\multirow{9}{3mm}{\bf \begin{turn}{90}ORAL\end{turn}} & \multirow{5}{24mm}{Questions et discours de læ rapporteur⋅rice} & \footnotesize Faire prendre de la hauteur au débat (par les sujets abordés, la pertinence des questions posées, les points soulevés, gestion du temps) & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
+\multirow{6}{3mm}{\centering\bf O\\ R\\ A\\ L} & \multirow{3}{20mm}{Questions et discours de læ rapporteur\textperiodcentered{}rice} & \footnotesize Faire prendre de la hauteur au débat (par les sujets abordés, la pertinence des questions posées, les points soulevés, gestion du temps) & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && \footnotesize Créer un échange constructif entre les participants (formulation des questions, réaction aux réponses, articulation entre les questions, circulation de la parole) & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
 && Capacité à évaluer la qualité des échanges (Défenseur⋅se-Opposant⋅e et à trois) & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&& Réponses aux questions de læ Rapporteur⋅rice et du jury (fond et capacité à faire avancer le débat) & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
+&& Réponses aux questions de læ Rapporteur\textperiodcentered{}rice et du jury (fond et capacité à faire avancer le débat) & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 & Malus & Attitude irrespectueuse ? & [-3,0] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
 &\multicolumn{3}{|l|}{\bf TOTAL ORAL (/10)} {{ esp|safe }}\\ \hline
 \end{tabular}

participation/templates/participation/tex/final_sheet.tex

@@ -1,88 +0,0 @@
-{% load i18n %}
-
-\documentclass[10pt,a4paper,landscape]{article}
-
-\usepackage[T1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage[french]{babel}
-
-\usepackage[a4paper]{geometry}
-\usepackage{graphicx}
-\usepackage{amsmath}
-\usepackage{amsfonts}
-\usepackage{amssymb}
-\usepackage{amsthm}
-\usepackage{hyperref}
-\usepackage{color}
-\usepackage{mathtools}
-\usepackage{comment}
-\usepackage{array}
-\usepackage{multirow}
-\usepackage{footnote}
-\usepackage{tabularx}
-
-\addtolength{\textwidth}{6cm}
-\addtolength{\oddsidemargin}{-3cm}
-\addtolength{\textheight}{2cm}
-\addtolength{\topmargin}{-0.5cm}
-\setlength{\parindent}{0mm}
-
-\DeclareUnicodeCharacter{22C5}{\textperiodcentered{}}
-
-\newcommand{\tfjm}{$\mathbb{TFJM}^2$}
-\renewcommand{\leq}{\leqslant}
-\def\tfjmedition{~{{ tfjm_number }}}
-
-\begin{document}
-\pagenumbering{gobble}
-
-\centering
-
-{% if TFJM.APP == "TFJM" %}
-    \Large {\bf \tfjmedition$^{e}$ Tournoi Fran\c cais des Jeunes Math\'ematiciennes et Math\'ematiciens \tfjm}\\
-{% else %}
-    \Large {\bf \tfjmedition$^{st}$ European Tournament of Enthusiastic Apprentice Mathematicians}\\
-{% endif %}
-\vspace{3mm}
-{% trans "Round" %} {{ pool.round }} \;-- {% trans "Pool" %} {{ pool.get_letter_display }}{% if pool.participations.count == 5 %} \;-- {{ pool.get_room_display }}{% endif %} \;-- {% if pool.round == 1 %}{{ pool.tournament.date_first_phase }}{% elif pool.round == 2 %}{{ pool.tournament.date_second_phase }}{% else %}{{ pool.tournament.date_third_phase }}{% endif %}
-
-
-\vspace{15mm}
-
-
-\begin{tabular}{|p{40mm}{% for passage in passages.all %}{% if passages.count <= 3 %}|p{3cm}|p{3cm}{% else %}|p{2.8cm}|p{2.5cm}{% endif %}{% endfor %}|}\hline
-\multirow{2}{40mm}{\LARGE {% trans "Role" %}} {% for passage in passages.all %}& \multicolumn{2}{c|}{ \Large {% trans "Problem" %} {{ passage.solution_number }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
-{% for passage in passages.all %}& \hspace{4mm} {\Large {% trans "Writing"|upper %}} & \hspace{4mm} {\Large {% trans "Oral"|upper %}}{% endfor %} \\ \hline
-\multirow{2}{35mm}{\LARGE {% trans "Reporter" %}} {% for passage in passages.all %}& \multicolumn{2}{c|}{\Large {{ passage.reporter.team.trigram }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
-{% for passage in passages.all %}
-& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq {% if TFJM.APP == "TFJM" %}20{% else %}10{% endif %}$
-& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq {% if TFJM.APP == "TFJM" %}20{% else %}10{% endif %}$
-{% endfor %} & \hline
-\multirow{2}{35mm}{\LARGE {% trans "Opponent" %}} {% for passage in passages.all %}& \multicolumn{2}{c|}{\Large {{ passage.opponent.team.trigram }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
-{% for passage in passages.all %}
-& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
-& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
-{% endfor %} & \hline
-\multirow{2}{35mm}{\LARGE {% trans "Reviewer" %}} {% for passage in passages.all %}& \multicolumn{2}{c|}{\Large {{ passage.reviewer.team.trigram }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
-{% for passage in passages.all %}
-& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
-& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
-{% endfor %} & \hline
-{% if TFJM.APP == "ETEAM" and pool.participations.count >= 4 %}
-    \multirow{2}{35mm}{\LARGE {% trans "Observer" %}} {% for passage in passages.all %}& \multicolumn{2}{c|}{\Large {{ passage.observer.team.trigram }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
-    {% for passage in passages.all %}
-    & \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
-    & \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
-    {% endfor %} & \hline
-{% endif %}
-\end{tabular}
-
-\vspace{15mm}
-
-\LARGE {% trans "name"|capfirst %} {% trans "Juree"|lower %} :
-{% if jury %}\underline{ {{ jury.user.first_name|safe }} {{ jury.user.last_name|safe }} }{% else %}\underline{\phantom{Phrase suffisamment longue pour le nom}}{% endif %}
-$\qquad$ {% trans "Signature" %} : \underline{\phantom{Phrase moins longue}}
-
-\newpage
-%}
-\end{document}

participation/templates/participation/tex/finale.tex

@@ -0,0 +1,74 @@
+\documentclass[10pt,a4paper,landscape]{article}
+
+\usepackage[T1]{fontenc}
+\usepackage[utf8x]{inputenc}
+\usepackage[french]{babel}
+
+\usepackage[a4paper]{geometry}
+\usepackage{graphicx}
+\usepackage{amsmath}
+\usepackage{amsfonts}
+\usepackage{amssymb}
+\usepackage{amsthm}
+\usepackage{hyperref}
+\usepackage{color}
+\usepackage{mathtools}
+\usepackage{comment}
+\usepackage{array}
+\usepackage{multirow}
+\usepackage{footnote}
+\usepackage{tabularx}
+\usepackage{xintexpr}
+
+\addtolength{\textwidth}{6cm}
+\addtolength{\oddsidemargin}{-3cm}
+\addtolength{\textheight}{2cm}
+\addtolength{\topmargin}{-0.5cm}
+\setlength{\parindent}{0mm}
+
+\newcommand{\tfjm}{$\mathbb{TFJM}^2$}
+\renewcommand{\leq}{\leqslant}
+\def\tfjmedition{~{{ tfjm_number }}}
+
+\begin{document}
+\pagenumbering{gobble}
+
+\centering
+
+\Large {\bf \tfjmedition$^{e}$ Tournoi Fran\c cais des Jeunes Math\'ematiciennes et Math\'ematiciens \tfjm}\\
+\vspace{3mm}
+Tour {{ pool.round }} \;-- Poule {{ pool.get_letter_display }}{% if pool.participations.count == 5 %} \;-- {{ pool.get_room_display }}{% endif %} \;-- {% if pool.round == 1 %}{{ pool.tournament.date_start }}{% else %}{{ pool.tournament.date_end }}{% endif %}
+
+
+\vspace{15mm}
+
+
+\begin{tabular}{|p{40mm}{% for passage in passages.all %}{% if passages.count == 3 %}|p{3cm}|p{3cm}{% else %}|p{2.5cm}|p{2.5cm}{% endif %}{% endfor %}|}\hline
+\multirow{2}{40mm}{\LARGE R\^ole} {% for passage in passages.all %}& \multicolumn{2}{c|}{ \Large Probl\`eme {{ passage.solution_number }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
+{% for passage in passages.all %}& \hspace{4mm} {\Large \'ECRIT} & \hspace{4mm} {\Large ORAL}{% endfor %} \\ \hline
+\multirow{2}{35mm}{\LARGE D\'efenseur\textperiodcentered{}se} {% for passage in passages.all %}& \multicolumn{2}{c|}{\Large {{ passage.defender.team.trigram }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
+{% for passage in passages.all %}
+& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 20$
+& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 20$
+{% endfor %} & \hline
+\multirow{2}{35mm}{\LARGE Opposant\textperiodcentered{}e} {% for passage in passages.all %}& \multicolumn{2}{c|}{\Large {{ passage.opponent.team.trigram }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
+{% for passage in passages.all %}
+& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
+& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
+{% endfor %} & \hline
+\multirow{2}{35mm}{\LARGE Rapporteur\textperiodcentered{}rice} {% for passage in passages.all %}& \multicolumn{2}{c|}{\Large {{ passage.reporter.team.trigram }}}{% endfor %} \\ \cline{2-{{ passages.count|add:passages.count|add:1 }}}
+{% for passage in passages.all %}
+& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
+& \phantom{asd asd} \phantom{asd asd} \centering \normalsize$0\leq x\leq 10$
+{% endfor %} & \hline
+\end{tabular}
+
+\vspace{15mm}
+
+\LARGE Nom jur\'e\textperiodcentered{}e :
+{% if jury %}\underline{ {{ jury.user.first_name|safe }} {{ jury.user.last_name|safe }} }{% else %}\underline{\phantom{Phrase suffisamment longue pour le nom}}{% endif %}
+$\qquad$ Signature : \underline{\phantom{Phrase moins longue}}
+
+\newpage
+%}
+\end{document}

participation/templates/participation/tex/scale_eteam.tex

@@ -1,151 +0,0 @@
-{% load i18n %}
-
-\documentclass[11pt,a4paper,landscape]{article}
-
-\usepackage[T1]{fontenc}
-\usepackage[utf8x]{inputenc}
-\usepackage[english]{babel}
-
-\usepackage[a4paper]{geometry}
-\usepackage{graphicx}
-\usepackage{amsmath}
-\usepackage{amsfonts}
-\usepackage{amssymb}
-\usepackage{amsthm}
-\usepackage{hyperref}
-\usepackage{color}
-\usepackage{mathtools}
-\usepackage{comment}
-\usepackage{array}
-\usepackage{multirow}
-\usepackage{footnote}
-\usepackage{rotating}
-
-\addtolength{\textwidth}{4cm}
-\setlength{\parindent}{0mm}
-
-\geometry{left=1.6cm,right=1.6cm,top=1.2cm,bottom=1.2cm}
-
-\DeclareUnicodeCharacter{22C5}{\textperiodcentered{}}
-
-\newcommand{\tfjm}{$\mathbb{TFJM}^2$}
-\pagestyle{empty}
-\renewcommand{\leq}{\leqslant}
-\def\tfjmedition{~{{ tfjm_number }}}
-
-\begin{document}
-\thispagestyle{empty}
-
-
-\begin{center}
-{% if TFJM.APP == "TFJM" %}
-    \Large {\bf \tfjmedition$^{e}$ Tournoi Fran\c cais des Jeunes Math\'ematiciennes et Math\'ematiciens \tfjm}\\
-{% else %}
-    \Large {\bf \tfjmedition$^{st}$ European Tournament of Enthusiastic Apprentice Mathematicians}\\
-{% endif %}
-\end{center}
-\vspace{3mm}
-
-\begin{center}
-\begin{itemize}
-{% for passage in passages.all %}
-\item {% trans "Reporter" %} {% trans "for passage" %} {{ forloop.counter }} : \underline{\texttt{~{{ passage.reporter.team.trigram }}~}} $\qquad$ {% trans "problem" %} \underline{~{{ passage.solution_number }}~}
-{% endfor %}
-\end{itemize}
-\end{center}
-
-\vspace{6mm}
-
-%%%%%%%%%%%%%%%%%%%%%DEFENSEUR
-\begin{tabular}{|c|p{25mm}|p{11cm}|c|{% for passage in passages.all %}p{2cm}|{% endfor %}}\hline
-\multicolumn{4}{|l|}{The {\bf {% trans "Reporter" %}} \normalsize presents their ideas and major results for the solution of the problem.} {% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.reporter.team.trigram }} {% endfor %}\\ \hline \hline
-
-%ECRIT
-\multirow{7}{3mm}{\bf \begin{turn}{90}WRITING\end{turn}} & \multirow{3}{20mm}{ {% trans "Scientific part" %}} & {% trans "Depth and difficulty of the elements presented" %} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Presence, accuracy and correctness of proofs and algorithms" %} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Relevance, efficiency and elegance" %} & [0,1] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multirow{3}{20mm}{ {% trans "Formal aspects" %}}& {% trans "Clarity of reasoning (explanations, examples, illustrations, diagrams, etc.)" %} & [0,2]{{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Presentation (readability, compliance with the format, etc.)" %} & [0,1] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multicolumn{3}{|l|}{\bf {% trans "TOTAL WRITING" %} (/10)} {{ esp|safe }} \\ \hline \hline
-
-%ORAL
-\multirow{11}{3mm}{\bf \begin{turn}{90}ORAL\end{turn}} & \multirow{6}{20mm}{Oral presentation} & {% trans "Understanding of the material presented, knowledge and mastery of the mathematical subjects used during the presentation" %}} & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Relevance of choices (proofs, examples, depth in relation to the written solution)" %} & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Pedagogy and clarity of speech (explanations, illustrations, etc.)" %} & [0,1] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Brevity and cleanliness of the presentation" %} & [0,1] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multirow{3}{20mm}{ {% trans "Debates " %}} & {% trans "Correct answers to the questions asked" %} & [0,2] {{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Ability to move the debate forward (explaining the limits of one's knowledge, conjectures, live research, etc.)" %} & [0,2] {{ esp|safe }} \\ \cline{2-{{ passages.count|add:4 }}}
-&\multirow{2}{20mm}{ {% trans "Penalty" %}} & {% trans "Ethical behaviour" %} & [--3,0] {{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Correspondence to the written material" %} & [--3,0] {{ esp|safe }} \\ \cline{2-{{ passages.count|add:4 }}}
-&\multicolumn{3}{|l|}{\bf {% trans "TOTAL ORAL" %} (/10)} {{ esp|safe }} \\ \hline
-
-\end{tabular}
-
-\newpage
-
-%%%%%%%%%%%%%%%%%OPPOSANT⋅E
-\begin{tabular}{|c|p{25mm}|p{11cm}|c{% for passage in passages.all %}|p{2cm}{% endfor %}|}\hline
-\multicolumn{4}{|l|}{The {\bf {% trans "Opponent" %}} \normalsize provides a critical analysis of the solution and presentation.}
-{% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.opponent.team.trigram }} {% endfor %} \\ \hline \hline
-
-%ECRIT
-\multirow{6}{3mm}{\bf \begin{turn}{90}WRITING\end{turn}} &\multirow{4}{25mm}{ {% trans "Scientific part" %}} & {% trans "Critical thinking and perspective on the proposed solution" %} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Validity of errors and positive points raised" %} & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Identifying and prioritizing the most important errors and positive points" %} & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Formal aspects" %} & {% trans "Presentation (readability, compliance with the format, etc.)" %} & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multicolumn{3}{|l|}{\bf {% trans "TOTAL WRITING" %} (/10)} {{ esp|safe }} \\ \hline \hline
-
-%ORAL
-\multirow{9}{3mm}{\bf \begin{turn}{90}ORAL\end{turn}} & \multirow{6}{20mm}{ {% trans "Discussion" %}} & {% trans "Relevance of questions (importance of the topics covered, points raised)" %} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Questioning skills (formulation of questions, reaction to answers, articulation between questions, time management)" %} & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Ability to assess the quality of the Defender's presentation (presentation and answers to the Opponent) (0-2)" %} & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Understanding" %} & {% trans "Answers to the questions of the Reporter and the jury (substance and ability to move the debate forward)" %} & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Penalty" %} & {% trans "Ethical behavior" %} & [-3,0] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multicolumn{3}{|l|}{\bf {% trans "TOTAL ORAL" %} (/10)} {{ esp|safe }}\\ \hline
-\end{tabular}
-
-\vfill
-
-%%%%%%%%%%%%%%%%%%%%%%RAPPORTEUR⋅RICE
-\begin{tabular}{|c|p{25mm}|p{11cm}|c{% for passage in passages.all %}|p{2cm}{% endfor %}|}\hline
-\multicolumn{4}{|l|}{The {\bf {% trans "Reviewer" %}} \normalsize evaluates the debate between the Reporter and the Opponent.} {% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.reviewer.team.trigram }} {% endfor %}\\ \hline \hline
-
-%ECRIT
-\multirow{6}{3mm}{\bf \begin{turn}{90}WRITING\end{turn}} &\multirow{4}{25mm}{ {% trans "Scientific part" %}} & {% trans "Critical thinking and perspective on the proposed solution" %} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Validity of errors and positive points raised" %} & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Identifying and prioritizing the most important errors and positive points" %} & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Formal aspects" %} & {% trans "Presentation (readability, compliance with the format, etc.)" %} & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multicolumn{3}{|l|}{\bf {% trans "TOTAL WRITING" %} (/10)} {{ esp|safe }} \\ \hline \hline
-
-%ORAL
-\multirow{12}{3mm}{\bf \begin{turn}{90}ORAL\end{turn}} & \multirow{8}{20mm}{ {% trans "Discussion" %}} & {% trans "Taking the debate to a higher level (through the topics covered, the relevance of the questions asked, the points raised, time management)" %} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Creating a constructive dialogue between the participants (formulation of questions, reaction to answers, articulation between questions, speaking time)" %} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Ability to assess the quality of the exchanges (Reporter-Opponent, and three-way)" %} & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Understanding" %} & {% trans "Answers to the jury's questions (substance and ability to move the debate forward)" %} & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Penalty" %} & {% trans "Ethical behavior" %} & [-3,0] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multicolumn{3}{|l|}{\bf {% trans "TOTAL ORAL" %} (/10)} {{ esp|safe }}\\ \hline
-\end{tabular}
-
-\vfill
-
-{% if TFJM.APP == "ETEAM" and pool.participations.count >= 4 %}
-%%%%%%%%%%%%%%%%%%%%%%OBSERVATEUR⋅RICE
-\begin{tabular}{|c|p{25mm}|p{11cm}|c{% for passage in passages.all %}|p{2cm}{% endfor %}|}\hline
-\multicolumn{4}{|l|}{The {\bf {% trans "Observer" %}} \normalsize makes useful remarks on crucial points missed by the other participants.} {% for passage in passages.all %}& P.{{ forloop.counter }} - {{ passage.observer.team.trigram }} {% endfor %}\\ \hline \hline
-
-%ECRIT
-\multirow{6}{3mm}{\bf \begin{turn}{90}WRITING\end{turn}} &\multirow{4}{25mm}{ {% trans "Scientific part" %}} & {% trans "Critical thinking and perspective on the proposed solution" %} & [0,3] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Validity of errors and positive points raised" %} & [0,2] {{ esp|safe }}\\ \cline{3-{{ passages.count|add:4 }}}
-&& {% trans "Identifying and prioritizing the most important errors and positive points" %} & [0,3] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Formal aspects" %} & {% trans "Presentation (readability, compliance with the format, etc.)" %} & [0,2] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multicolumn{3}{|l|}{\bf {% trans "TOTAL WRITING" %} (/10)} {{ esp|safe }} \\ \hline \hline
-
-%ORAL
-\multirow{6}{3mm}{\bf \begin{turn}{90}ORAL\end{turn}} &  {% trans "Scientific part" %} & {% trans "Significance of the remarks and questions (positive mark only if the other players omitted crucial matter)" %} & [--5,5] {{ esp|safe }} \\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Formal aspects" %} & {% trans "Relevance of the remarks and questions (positive mark only if the other players omitted crucial matter)" %} & [--5,5] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-& {% trans "Penalty" %} & {% trans "Ethical behavior" %} & [-3,0] {{ esp|safe }}\\ \cline{2-{{ passages.count|add:4 }}}
-&\multicolumn{3}{|l|}{\bf {% trans "TOTAL ORAL" %} (/10)} {{ esp|safe }}\\ \hline
-\end{tabular}
-{% endif %}
-
-\end{document}

participation/templates/participation/tournament_detail.html

@@ -9,59 +9,53 @@
         </div>
         <div class="card-body">
             <dl class="row">
-                <dt class="col-sm-6 text-sm-end">{% trans 'organizers'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.organizers.all|join:", " }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'organizers'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.organizers.all|join:", " }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'size'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.max_teams }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'size'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.max_teams }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'place'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.place }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'place'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.place }}</dd>
 
-                {% if TFJM.PAYMENT_MANAGEMENT %}
-                    <dt class="col-sm-6 text-sm-end">{% trans 'price'|capfirst %}</dt>
-                    <dd class="col-sm-6">{% if tournament.price %}{{ tournament.price }} €{% else %}{% trans "Free" %}{% endif %}</dd>
-                {% endif %}
+                <dt class="col-xl-6 text-end">{% trans 'price'|capfirst %}</dt>
+                <dd class="col-xl-6">{% if tournament.price %}{{ tournament.price }} €{% else %}{% trans "Free" %}{% endif %}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'remote'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.remote|yesno }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'remote'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.remote|yesno }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'dates'|capfirst %}</dt>
-                <dd class="col-sm-6">{% trans "From" %} {{ tournament.date_start }} {% trans "to" %} {{ tournament.date_end }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'dates'|capfirst %}</dt>
+                <dd class="col-xl-6">{% trans "From" %} {{ tournament.date_start }} {% trans "to" %} {{ tournament.date_end }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'date of registration closing'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.inscription_limit }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'date of registration closing'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.inscription_limit }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal solution submission'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.solution_limit }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'date of maximal solution submission'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.solution_limit }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'date of the random draw'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.solutions_draw }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'date of the random draw'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.solutions_draw }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal written reviews submission for the first round'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.reviews_first_phase_limit }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'date of maximal syntheses submission for the first round'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.syntheses_first_phase_limit }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal written reviews submission for the second round'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.reviews_second_phase_limit }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'date when solutions of round 2 are available'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.solutions_available_second_phase }}</dd>
 
-                {% if TFJM.APP == "ETEAM" %}
-                    <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal written reviews submission for the third round'|capfirst %}</dt>
-                    <dd class="col-sm-6">{{ tournament.reviews_third_phase_limit }}</dd>
-                {% endif %}
+                <dt class="col-xl-6 text-end">{% trans 'date of maximal syntheses submission for the second round'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.syntheses_second_phase_limit }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'description'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.description }}</dd>
+                <dt class="col-xl-6 text-end">{% trans 'description'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ tournament.description }}</dd>
 
-                {% if TFJM.ML_MANAGEMENT %}
-                    <dt class="col-sm-6 text-sm-end">{% trans 'To contact organizers' %}</dt>
-                    <dd class="col-sm-6"><a href="mailto:{{ tournament.organizers_email }}">{{ tournament.organizers_email }}</a></dd>
+                <dt class="col-xl-6 text-end">{% trans 'To contact organizers' %}</dt>
+                <dd class="col-xl-6"><a href="mailto:{{ tournament.organizers_email }}">{{ tournament.organizers_email }}</a></dd>
 
-                    <dt class="col-sm-6 text-sm-end">{% trans 'To contact juries' %}</dt>
-                    <dd class="col-sm-6"><a href="mailto:{{ tournament.jurys_email }}">{{ tournament.jurys_email }}</a></dd>
+                <dt class="col-xl-6 text-end">{% trans 'To contact juries' %}</dt>
+                <dd class="col-xl-6"><a href="mailto:{{ tournament.jurys_email }}">{{ tournament.jurys_email }}</a></dd>
 
-                    <dt class="col-sm-6 text-sm-end">{% trans 'To contact valid teams' %}</dt>
-                    <dd class="col-sm-6"><a href="mailto:{{ tournament.teams_email }}">{{ tournament.teams_email }}</a></dd>
-                {% endif %}
+                <dt class="col-xl-6 text-end">{% trans 'To contact valid teams' %}</dt>
+                <dd class="col-xl-6"><a href="mailto:{{ tournament.teams_email }}">{{ tournament.teams_email }}</a></dd>
             </dl>
         </div>
 
@@ -81,15 +75,13 @@
     <div id="teams_table">
         {% render_table teams %}
     </div>
-
-    {% if TFJM.PAYMENT_MANAGEMENT %}
-        {% if user.registration.is_admin or user.registration in tournament.organizers.all %}
-            <div class="text-center">
-                <a href="{% url "participation:tournament_payments" pk=tournament.pk %}" class="btn btn-secondary">
-                    <i class="fas fa-money-bill-wave"></i> {% trans "Access to payments list" %}
-                </a>
-            </div>
-        {% endif %}
+    
+    {% if user.registration.is_admin or user.registration in tournament.organizers.all %}
+        <div class="text-center">
+            <a href="{% url "participation:tournament_payments" pk=tournament.pk %}" class="btn btn-secondary">
+                <i class="fas fa-money-bill-wave"></i> {% trans "Access to payments list" %}
+            </a>
+        </div>
     {% endif %}
 
     {% if pools.data %}
@@ -113,7 +105,7 @@
                     {% for participation, note in notes %}
                         <li>
                             <strong>{{ participation.team }} :</strong> {{ note|floatformat }}
-                            {% if available_notes_2 or user.registration.is_volunteer %}
+                            {% if available_notes_2 %}
                                 {% if not tournament.final and participation.mention %}
                                     — {{ participation.mention }}
                                 {% endif %}
@@ -121,7 +113,7 @@
                                     — {{ participation.mention_final }}
                                 {% endif %}
                              {% endif %}
-                            {% if participation.final and not tournament.final %}
+                            {% if participation.final %}
                                 <span class="badge badge-sm text-bg-warning">
                                     <i class="fas fa-medal"></i>
                                     {% trans "Selected for final tournament" %}
@@ -151,12 +143,6 @@
                             <i class="fas fa-ranking-star"></i>
                             {% trans "Harmonize" %} - {% trans "Day" %} 2
                         </a>
-                        {% if TFJM.NB_ROUNDS >= 3 %}
-                            <a href="{% url 'participation:tournament_harmonize' pk=tournament.pk round=3 %}" class="btn btn-secondary">
-                                <i class="fas fa-ranking-star"></i>
-                                {% trans "Harmonize" %} - {% trans "Day" %} 3
-                            </a>
-                        {% endif %}
                     </div>
                 </div>
                 <div class="card-footer text-center">
@@ -183,19 +169,6 @@
                                 {% trans "Unpublish notes for second round" %}
                             </a>
                         {% endif %}
-                        {% if TFJM.NB_ROUNDS >= 3 %}
-                            {% if not available_notes_3 %}
-                                <a href="{% url 'participation:tournament_publish_notes' pk=tournament.pk round=3 %}" class="btn btn-sm btn-info">
-                                    <i class="fas fa-eye"></i>
-                                    {% trans "Publish notes for third round" %}
-                                </a>
-                            {% else %}
-                                <a href="{% url 'participation:tournament_publish_notes' pk=tournament.pk round=3 %}?hide" class="btn btn-sm btn-danger">
-                                    <i class="fas fa-eye-slash"></i>
-                                    {% trans "Unpublish notes for third round" %}
-                                </a>
-                            {% endif %}
-                        {% endif %}
                     </div>
                 </div>
             {% endif %}
@@ -208,26 +181,25 @@
         <h3>{% trans "Files available for download" %}</h3>
 
         <div class="alert alert-warning fade show files-to-download-collapse" id="files-to-download-popup">
-            <h4>{% trans "IMPORTANT" %}</h4>
+            <h4>IMPORTANT</h4>
 
             <p>
-                {% blocktrans trimmed %}
-                The files accessible below may contain personal information.
-                In compliance with European law and out of respect for the confidentiality of participants data, 
-                you may only use this data for purposes strictly necessary to the organization of the tournament.
-                {% endblocktrans %}
+                Les fichiers accessibles ci-dessous peuvent contenir des informations personnelles.
+                Par conformité avec le droit européen et par respect de la confidentialité des données
+                des participant⋅es, vous ne devez utiliser ces données que dans un cadre strictement
+                nécessaire en lien avec l'organisation du tournoi.
             </p>
 
             <p>
-                {% blocktrans trimmed %}
-                Moreover, it is your responsibility to delete these files once you no longer need them, especially at the end of the tournament.
-                {% endblocktrans %}
+                De plus, il est de votre responsabilité de supprimer ces fichiers une fois que vous
+                n'en avez plus besoin, notamment à la fin du tournoi.
             </p>
 
             <p class="text-center">
                 <button class="btn btn-warning" data-bs-toggle="collapse" href=".files-to-download-collapse"
                         role="button" aria-expanded="false" aria-controls="files-to-download files-to-download-popup">
-                        {% trans "I agree not to divulge participants data and to delete them at the end of the tournament." %}
+                    Je m'engage à ne pas divulguer les données des participant⋅es
+                    et de les supprimer à l'issue du tournoi
                 </button>
             </p>
         </div>
@@ -237,48 +209,48 @@
                 <ul>
                     <li>
                         <a href="{% url "participation:tournament_csv" pk=tournament.pk %}">
-                            {% trans "Validated team participant data spreadsheet" %}
+                            Tableur de données des participant⋅es des équipes validées
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_csv" pk=tournament.pk %}?all">
-                            {% trans "All teams participant data spreadsheet" %}
+                            Tableur de données des participant⋅es de toutes les équipes
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_authorizations" tournament_id=tournament.id %}">
-                            {% trans "Archive of all authorisations sorted by team and person" %}
+                            Archive de toutes les autorisations triées par équipe et par personne
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}">
-                            {% trans "Archive of all submitted solutions sorted by team" %}
+                            Archive de toutes les solutions envoyées triées par équipe
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}?sort_by=problem">
-                            {% trans "Archive of all sent solutions sorted by problem" %}
+                            Archive de toutes les solutions envoyées triées par problème
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}?sort_by=pool">
-                            {% trans "Archive of all sent solutions sorted by pool" %}
+                            Archive de toutes les solutions envoyées triées par poule
                         </a>
                     </li>
                     <li>
-                        <a href="{% url "participation:tournament_written_reviews" tournament_id=tournament.id %}?sort_by=pool">
-                            {% trans "Archive of all summary notes sorted by pool and passage" %}
+                        <a href="{% url "participation:tournament_syntheses" tournament_id=tournament.id %}?sort_by=pool">
+                            Archive de toutes les notes de synthèse triées par poule et par passage
                         </a>
                     </li>
                     <li>
                         <a href="https://docs.google.com/spreadsheets/d/{{ tournament.notes_sheet_id }}/edit">
                             <i class="fas fa-table"></i>
-                            {% trans "Note spreadsheet on Google Sheets" %}
+                            Tableur de notes sur Google Sheets
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_notation_sheets" tournament_id=tournament.id %}">
-                            {% trans "Archive of all printable note sheets sorted by pool" %}
+                            Archive de toutes les feuilles de notes à imprimer triées par poule
                         </a>
                     </li>
                 </ul>

participation/templates/participation/update_team.html

@@ -1,37 +1,15 @@
 {% extends request.content_only|yesno:"empty.html,base.html" %}
 
-{% load crispy_forms_filters crispy_forms_tags i18n %}
+{% load crispy_forms_filters i18n %}
 
 {% block content %}
     <form method="post">
         <div id="form-content">
             {% csrf_token %}
             {{ form|crispy }}
-            {% crispy participation_form %}
+            {{ participation_form|crispy }}
         </div>
         <button class="btn btn-success" type="submit">{% trans "Update" %}</button>
     </form>
 {% endblock content %}
 
-{% block extrajavascript %}
-    <script>
-        const tournamentSelect = document.getElementById('id_tournament')
-        const idfWarningBanner = document.getElementById('idf_warning_banner')
-        const unifiedRegistrationTournamentIds = idfWarningBanner.getAttribute('data-tid-unified').split(',')
-        if (idfWarningBanner.getAttribute('data-tid-unified') !== "") {
-            function updateIDFWarningBannerVisibility() {
-                const tid = tournamentSelect.value
-                if (unifiedRegistrationTournamentIds.includes(tid))
-                    idfWarningBanner.classList.remove('d-none')
-                else
-                    idfWarningBanner.classList.add('d-none')
-            }
-
-            tournamentSelect.addEventListener('change', updateIDFWarningBannerVisibility)
-            updateIDFWarningBannerVisibility()
-        }
-        else {
-            idfWarningBanner.classList.add('d-none')
-        }
-    </script>
-{% endblock %}

participation/templates/participation/upload_synthesis.html

@@ -0,0 +1,20 @@
+{% extends request.content_only|yesno:"empty.html,base.html" %}
+
+{% load crispy_forms_filters i18n static %}
+
+{% block content %}
+    <form method="post" enctype="multipart/form-data">
+        <div id="form-content">
+            <div class="alert alert-info">
+                {% trans "Templates:" %}
+                <a class="alert-link" href="{% static "Fiche_synthèse.pdf" %}"> PDF</a> —
+                <a class="alert-link" href="{% static "Fiche_synthèse.tex" %}"> TEX</a> —
+                <a class="alert-link" href="{% static "Fiche_synthèse.odt" %}"> ODT</a> —
+                <a class="alert-link" href="{% static "Fiche_synthèse.docx" %}" title="{% trans "Warning: non-free format" %}"> DOCX</a>
+            </div>
+            {% csrf_token %}
+            {{ form|crispy }}
+        </div>
+        <button class="btn btn-primary" type="submit">{% trans "Upload" %}</button>
+    </form>
+{% endblock content %}

participation/templates/participation/upload_written_review.html

@@ -1,25 +0,0 @@
-{% extends request.content_only|yesno:"empty.html,base.html" %}
-
-{% load crispy_forms_filters i18n static %}
-
-{% block content %}
-    <form method="post" enctype="multipart/form-data">
-        <div id="form-content">
-            <div class="alert alert-info">
-                {% trans "Templates:" %}
-                {% if TFJM.APP == "TFJM" %}
-                    <a class="alert-link" href="{% static "tfjm/Fiche_synthèse.pdf" %}"> PDF</a> —
-                    <a class="alert-link" href="{% static "tfjm/Fiche_synthèse.tex" %}"> TEX</a> —
-                    <a class="alert-link" href="{% static "tfjm/Fiche_synthèse.odt" %}"> ODT</a> —
-                    <a class="alert-link" href="{% static "tfjm/Fiche_synthèse.docx" %}" title="{% trans "Warning: non-free format" %}"> DOCX</a>
-                {% elif TFJM.APP == "ETEAM" %}
-                    <a class="alert-link" href="{% static "eteam/Written_review.pdf" %}"> PDF</a> —
-                    <a class="alert-link" href="{% static "eteam/Written_review.tex" %}"> TEX</a>
-                {% endif %}
-            </div>
-            {% csrf_token %}
-            {{ form|crispy }}
-        </div>
-        <button class="btn btn-primary" type="submit">{% trans "Upload" %}</button>
-    </form>
-{% endblock content %}

participation/tests.py

@@ -674,7 +674,7 @@ class TestPayment(TestCase):
         response = self.client.post(reverse('registration:update_payment', args=(payment.pk,)),
                                     data={'type': "bank_transfer",
                                           'additional_information': "This is a bank transfer",
-                                          'receipt': open("tfjm/static/tfjm/Fiche_sanitaire.pdf", "rb")})
+                                          'receipt': open("tfjm/static/Fiche_sanitaire.pdf", "rb")})
         self.assertRedirects(response, reverse('participation:team_detail', args=(self.team.pk,)), 302, 200)
         payment.refresh_from_db()
         self.assertIsNone(payment.valid)
@@ -735,7 +735,7 @@ class TestPayment(TestCase):
         response = self.client.post(reverse('registration:update_payment', args=(payment.pk,)),
                                     data={'type': "scholarship",
                                           'additional_information': "I don't have to pay because I have a scholarship",
-                                          'receipt': open("tfjm/static/tfjm/Fiche_sanitaire.pdf", "rb")})
+                                          'receipt': open("tfjm/static/Fiche_sanitaire.pdf", "rb")})
         self.assertRedirects(response, reverse('participation:team_detail', args=(self.team.pk,)), 302, 200)
         payment.refresh_from_db()
         self.assertIsNone(payment.valid)

participation/urls.py

@@ -8,11 +8,11 @@ from .views import CreateTeamView, FinalNotationSheetTemplateView, GSheetNotific
     PassageDetailView, PassageUpdateView, PoolCreateView, PoolDetailView, PoolJuryView, PoolNotesTemplateView, \
     PoolPresideJuryView, PoolRemoveJuryView, PoolUpdateView, PoolUploadNotesView, \
     ScaleNotationSheetTemplateView, SelectTeamFinalView, \
-    SolutionsDownloadView, SolutionUploadView, \
+    SolutionsDownloadView, SolutionUploadView, SynthesisUploadView, \
     TeamAuthorizationsView, TeamDetailView, TeamLeaveView, TeamListView, TeamUpdateView, \
     TeamUploadMotivationLetterView, TournamentCreateView, TournamentDetailView, TournamentExportCSVView, \
     TournamentHarmonizeNoteView, TournamentHarmonizeView, TournamentListView, TournamentPaymentsView, \
-    TournamentPublishNotesView, TournamentUpdateView, WrittenReviewUploadView
+    TournamentPublishNotesView, TournamentUpdateView
 
 
 app_name = "participation"
@@ -42,8 +42,8 @@ urlpatterns = [
          name="tournament_authorizations"),
     path("tournament/<int:tournament_id>/solutions/", SolutionsDownloadView.as_view(),
          name="tournament_solutions"),
-    path("tournament/<int:tournament_id>/written_reviews/", SolutionsDownloadView.as_view(),
-         name="tournament_written_reviews"),
+    path("tournament/<int:tournament_id>/syntheses/", SolutionsDownloadView.as_view(),
+         name="tournament_syntheses"),
     path("tournament/<int:tournament_id>/notation/sheets/", NotationSheetsArchiveView.as_view(),
          name="tournament_notation_sheets"),
     path("tournament/<int:pk>/notation/notifications/", GSheetNotificationsView.as_view(),
@@ -60,7 +60,7 @@ urlpatterns = [
     path("pools/<int:pk>/", PoolDetailView.as_view(), name="pool_detail"),
     path("pools/<int:pk>/update/", PoolUpdateView.as_view(), name="pool_update"),
     path("pools/<int:pool_id>/solutions/", SolutionsDownloadView.as_view(), name="pool_download_solutions"),
-    path("pools/<int:pool_id>/written_reviews/", SolutionsDownloadView.as_view(), name="pool_download_written_reviews"),
+    path("pools/<int:pool_id>/syntheses/", SolutionsDownloadView.as_view(), name="pool_download_syntheses"),
     path("pools/<int:pk>/notation/scale/", ScaleNotationSheetTemplateView.as_view(), name="pool_scale_note_sheet"),
     path("pools/<int:pk>/notation/final/", FinalNotationSheetTemplateView.as_view(), name="pool_final_note_sheet"),
     path("pools/<int:pool_id>/notation/sheets/", NotationSheetsArchiveView.as_view(), name="pool_notation_sheets"),
@@ -71,6 +71,6 @@ urlpatterns = [
     path("pools/<int:pk>/upload-notes/template/", PoolNotesTemplateView.as_view(), name="pool_notes_template"),
     path("pools/passages/<int:pk>/", PassageDetailView.as_view(), name="passage_detail"),
     path("pools/passages/<int:pk>/update/", PassageUpdateView.as_view(), name="passage_update"),
-    path("pools/passages/<int:pk>/written_review/", WrittenReviewUploadView.as_view(), name="upload_written_review"),
+    path("pools/passages/<int:pk>/solution/", SynthesisUploadView.as_view(), name="upload_synthesis"),
     path("pools/passages/notes/<int:pk>/", NoteUpdateView.as_view(), name="update_notes"),
 ]

participation/views.py

@@ -24,7 +24,7 @@ from django.http import FileResponse, Http404, HttpResponse
 from django.shortcuts import redirect
 from django.template.loader import render_to_string
 from django.urls import reverse_lazy
-from django.utils import timezone, translation
+from django.utils import timezone
 from django.utils.crypto import get_random_string
 from django.utils.decorators import method_decorator
 from django.utils.timezone import localtime
@@ -46,9 +46,9 @@ from tfjm.lists import get_sympa_client
 from tfjm.views import AdminMixin, VolunteerMixin
 
 from .forms import AddJuryForm, JoinTeamForm, MotivationLetterForm, NoteForm, ParticipationForm, PassageForm, \
-    PoolForm, RequestValidationForm, SolutionForm, TeamForm, TournamentForm, UploadNotesForm, \
-    ValidateParticipationForm, WrittenReviewForm
-from .models import Note, Participation, Passage, Pool, Solution, Team, Tournament, Tweak, WrittenReview
+    PoolForm, RequestValidationForm, SolutionForm, SynthesisForm, TeamForm, TournamentForm, \
+    UploadNotesForm, ValidateParticipationForm
+from .models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament, Tweak
 from .tables import NoteTable, ParticipationTable, PassageTable, PoolTable, TeamTable, TournamentTable
 
 
@@ -231,7 +231,7 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView)
         mail_context = dict(team=self.object, domain=Site.objects.first().domain)
         mail_plain = render_to_string("participation/mails/request_validation.txt", mail_context)
         mail_html = render_to_string("participation/mails/request_validation.html", mail_context)
-        send_mail(f"[{settings.APP_NAME}] {_('Team validation')}", mail_plain, settings.DEFAULT_FROM_EMAIL,
+        send_mail("[TFJM²] Validation d'équipe", mail_plain, settings.DEFAULT_FROM_EMAIL,
                   [self.object.participation.tournament.organizers_email], html_message=mail_html)
 
         return super().form_valid(form)
@@ -255,28 +255,23 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView)
 
             domain = Site.objects.first().domain
             for registration in self.object.participants.all():
-                if settings.PAYMENT_MANAGEMENT and \
-                        registration.is_student and self.object.participation.tournament.price:
+                if registration.is_student and self.object.participation.tournament.price:
                     payment = Payment.objects.get(registrations=registration, final=False)
                 else:
                     payment = None
-                mail_context_plain = dict(domain=domain, registration=registration, team=self.object, payment=payment,
-                                          message=form.cleaned_data["message"])
-                mail_context_html = dict(domain=domain, registration=registration, team=self.object, payment=payment,
-                                         message=form.cleaned_data["message"].replace('\n', '<br>'))
-                mail_plain = render_to_string("participation/mails/team_validated.txt", mail_context_plain)
-                mail_html = render_to_string("participation/mails/team_validated.html", mail_context_html)
-                registration.user.email_user(f"[{settings.APP_NAME}] {_('Team validated')}", mail_plain,
-                                             html_message=mail_html)
+                mail_context = dict(domain=domain, registration=registration, team=self.object, payment=payment,
+                                    message=form.cleaned_data["message"])
+                mail_plain = render_to_string("participation/mails/team_validated.txt", mail_context)
+                mail_html = render_to_string("participation/mails/team_validated.html", mail_context)
+                registration.user.email_user("[TFJM²] Équipe validée", mail_plain, html_message=mail_html)
         elif "invalidate" in self.request.POST:
             self.object.participation.valid = None
             self.object.participation.save()
-            mail_context_plain = dict(team=self.object, message=form.cleaned_data["message"])
-            mail_context_html = dict(team=self.object, message=form.cleaned_data["message"].replace('\n', '<br>'))
-            mail_plain = render_to_string("participation/mails/team_not_validated.txt", mail_context_plain)
-            mail_html = render_to_string("participation/mails/team_not_validated.html", mail_context_html)
-            send_mail(f"[{settings.APP_NAME}] {_('Team not validated')}", mail_plain,
-                      None, [self.object.email], html_message=mail_html)
+            mail_context = dict(team=self.object, message=form.cleaned_data["message"])
+            mail_plain = render_to_string("participation/mails/team_not_validated.txt", mail_context)
+            mail_html = render_to_string("participation/mails/team_not_validated.html", mail_context)
+            send_mail("[TFJM²] Équipe non validée", mail_plain, None, [self.object.email],
+                      html_message=mail_html)
         else:
             form.add_error(None, _("You must specify if you validate the registration or not."))
             return self.form_invalid(form)
@@ -396,7 +391,7 @@ class TeamAuthorizationsView(LoginRequiredMixin, View):
             tournament = Tournament.objects.get(pk=kwargs["tournament_id"])
 
         if user.registration.is_admin or user.registration.is_volunteer \
-                and (user.registration in tournament.organizers.all()
+                and (user.registration in tournament.organizers
                      or (team is not None and team.participation.final
                          and user.registration in Tournament.final_tournament().organizers)):
             return super().dispatch(request, *args, **kwargs)
@@ -626,9 +621,8 @@ class TournamentDetailView(MultiTableMixin, DetailView):
         context["notes"] = sorted_notes
         context["available_notes_1"] = all(pool.results_available for pool in self.object.pools.filter(round=1).all())
         context["available_notes_2"] = all(pool.results_available for pool in self.object.pools.filter(round=2).all())
-        context["available_notes_3"] = all(pool.results_available for pool in self.object.pools.filter(round=3).all())
 
-        if settings.HAS_FINAL and not self.object.final and notes and context["available_notes_2"] \
+        if not self.object.final and notes and context["available_notes_2"] \
                 and not self.request.user.is_anonymous and self.request.user.registration.is_volunteer:
             context["team_selectable_for_final"] = next(participation for participation, _note in sorted_notes
                                                         if not participation.final)
@@ -686,7 +680,7 @@ class TournamentExportCSVView(VolunteerMixin, DetailView):
         )
         writer = csv.DictWriter(resp, ('Tournoi', 'Équipe', 'Trigramme', 'Sélectionnée',
                                        'Nom', 'Prénom', 'Email', 'Type', 'Genre', 'Date de naissance',
-                                       'Adresse', 'Code postal', 'Ville', 'Pays', 'Téléphone',
+                                       'Adresse', 'Code postal', 'Ville', 'Téléphone',
                                        'Classe', 'Établissement',
                                        'Nom responsable légal⋅e', 'Téléphone responsable légal⋅e',
                                        'Email responsable légal⋅e',
@@ -714,7 +708,6 @@ class TournamentExportCSVView(VolunteerMixin, DetailView):
                     'Adresse': registration.address,
                     'Code postal': registration.zip_code,
                     'Ville': registration.city,
-                    'Pays': registration.country,
                     'Téléphone': registration.phone_number,
                     'Classe': registration.get_student_class_display() if registration.is_student
                     else registration.last_degree,
@@ -775,7 +768,7 @@ class TournamentHarmonizeView(VolunteerMixin, DetailView):
         reg = request.user.registration
         if not reg.is_admin and (not reg.is_volunteer or tournament not in reg.organized_tournaments.all()):
             return self.handle_no_permission()
-        if self.kwargs['round'] not in range(1, settings.NB_ROUNDS + 1):
+        if self.kwargs['round'] not in (1, 2):
             raise Http404
         return super().dispatch(request, *args, **kwargs)
 
@@ -808,8 +801,7 @@ class TournamentHarmonizeNoteView(VolunteerMixin, DetailView):
         reg = request.user.registration
         if not reg.is_admin and (not reg.is_volunteer or tournament not in reg.organized_tournaments.all()):
             return self.handle_no_permission()
-        if self.kwargs['round'] not in range(1, settings.NB_ROUNDS + 1) \
-                or self.kwargs['action'] not in ('add', 'remove') \
+        if self.kwargs['round'] not in (1, 2) or self.kwargs['action'] not in ('add', 'remove') \
                 or self.kwargs['trigram'] not in [p.team.trigram
                                                   for p in tournament.participations.filter(valid=True).all()]:
             raise Http404
@@ -831,7 +823,7 @@ class TournamentHarmonizeNoteView(VolunteerMixin, DetailView):
         gc = gspread.service_account_from_dict(settings.GOOGLE_SERVICE_CLIENT)
         spreadsheet = gc.open_by_key(tournament.notes_sheet_id)
         worksheet = spreadsheet.worksheet("Classement final")
-        column = 3 if kwargs['round'] == 1 else 5 if kwargs['round'] == 2 else 8
+        column = 3 if kwargs['round'] == 1 else 5
         row = worksheet.find(f"{participation.team.name} ({participation.team.trigram})", in_column=1).row
         worksheet.update_cell(row, column, new_diff)
 
@@ -977,7 +969,7 @@ class PoolUpdateView(VolunteerMixin, UpdateView):
 
 class SolutionsDownloadView(VolunteerMixin, View):
     """
-    Download all solutions or written reviews as a ZIP archive.
+    Download all solutions or syntheses as a ZIP archive.
     """
 
     def dispatch(self, request, *args, **kwargs):
@@ -1018,12 +1010,11 @@ class SolutionsDownloadView(VolunteerMixin, View):
         if 'team_id' in kwargs:
             team = Team.objects.get(pk=kwargs["team_id"])
             solutions = Solution.objects.filter(participation=team.participation).all()
-            written_reviews = WrittenReview.objects.filter(participation=team.participation).all()
-            filename = _("Solutions of team {trigram}.zip") if is_solution \
-                else _("Written reviews of team {trigram}.zip")
+            syntheses = Synthesis.objects.filter(participation=team.participation).all()
+            filename = _("Solutions of team {trigram}.zip") if is_solution else _("Syntheses of team {trigram}.zip")
             filename = filename.format(trigram=team.trigram)
 
-            def prefix(s: Solution | WrittenReview) -> str:
+            def prefix(s: Solution | Synthesis) -> str:
                 return ""
         elif 'tournament_id' in kwargs:
             tournament = Tournament.objects.get(pk=kwargs["tournament_id"])
@@ -1036,12 +1027,11 @@ class SolutionsDownloadView(VolunteerMixin, View):
                     for sol in pool.solutions:
                         sol.pool = pool
                         solutions.append(sol)
-                written_reviews = WrittenReview.objects.filter(passage__pool__tournament=tournament).all()
-                filename = _("Solutions of {tournament}.zip") if is_solution \
-                    else _("Written reviews of {tournament}.zip")
+                syntheses = Synthesis.objects.filter(passage__pool__tournament=tournament).all()
+                filename = _("Solutions of {tournament}.zip") if is_solution else _("Syntheses of {tournament}.zip")
                 filename = filename.format(tournament=tournament.name)
 
-                def prefix(s: Solution | WrittenReview) -> str:
+                def prefix(s: Solution | Synthesis) -> str:
                     pool = s.pool if is_solution else s.passage.pool
                     p = f"Poule {pool.short_name}/"
                     if not is_solution:
@@ -1052,28 +1042,27 @@ class SolutionsDownloadView(VolunteerMixin, View):
                     solutions = Solution.objects.filter(participation__tournament=tournament).all()
                 else:
                     solutions = Solution.objects.filter(final_solution=True).all()
-                written_reviews = WrittenReview.objects.filter(passage__pool__tournament=tournament).all()
-                filename = _("Solutions of {tournament}.zip") if is_solution \
-                    else _("Written reviews of {tournament}.zip")
+                syntheses = Synthesis.objects.filter(passage__pool__tournament=tournament).all()
+                filename = _("Solutions of {tournament}.zip") if is_solution else _("Syntheses of {tournament}.zip")
                 filename = filename.format(tournament=tournament.name)
 
-                def prefix(s: Solution | WrittenReview) -> str:
+                def prefix(s: Solution | Synthesis) -> str:
                     return f"{s.participation.team.trigram}/" if sort_by == "team" else f"Problème {s.problem}/"
         else:
             pool = Pool.objects.get(pk=kwargs["pool_id"])
             solutions = pool.solutions
-            written_reviews = WrittenReview.objects.filter(passage__pool=pool).all()
+            syntheses = Synthesis.objects.filter(passage__pool=pool).all()
             filename = _("Solutions for pool {pool} of tournament {tournament}.zip") \
-                if is_solution else _("Written reviews for pool {pool} of tournament {tournament}.zip")
+                if is_solution else _("Syntheses for pool {pool} of tournament {tournament}.zip")
             filename = filename.format(pool=pool.short_name,
                                        tournament=pool.tournament.name)
 
-            def prefix(s: Solution | WrittenReview) -> str:
+            def prefix(s: Solution | Synthesis) -> str:
                 return ""
 
         output = BytesIO()
         zf = ZipFile(output, "w")
-        for s in (solutions if is_solution else written_reviews):
+        for s in (solutions if is_solution else syntheses):
             if s.file.storage.exists(s.file.path):
                 zf.write("media/" + s.file.name, prefix(s) + f"{s}.pdf")
 
@@ -1142,7 +1131,7 @@ class PoolJuryView(VolunteerMixin, FormView, DetailView):
             user.save()
 
             # Send welcome mail
-            subject = f"[{settings.APP_NAME}] " + str(_("New jury account"))
+            subject = "[TFJM²] " + str(_("New TFJM² jury account"))
             site = Site.objects.first()
             message = render_to_string('registration/mails/add_organizer.txt', dict(user=user,
                                                                                     inviter=self.request.user,
@@ -1259,7 +1248,7 @@ class PoolUploadNotesView(VolunteerMixin, FormView, DetailView):
             return self.form_invalid(form)
 
         for vr, notes in parsed_notes.items():
-            notes_count = 6 + (2 if pool.participations.count() >= 4 and settings.HAS_OBSERVER else 0)
+            notes_count = 6
             for i, passage in enumerate(pool.passages.all()):
                 note = Note.objects.get_or_create(jury=vr, passage=passage)[0]
                 passage_notes = notes[notes_count * i:notes_count * (i + 1)]
@@ -1294,11 +1283,8 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
         return self.handle_no_permission()
 
     def render_to_response(self, context, **response_kwargs):  # noqa: C901
-        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-
         pool_size = self.object.passages.count()
-        has_observer = self.object.participations.count() >= 4 and settings.HAS_OBSERVER
-        passage_width = 6 + (2 if has_observer else 0)
+        passage_width = 6
         line_length = pool_size * passage_width
 
         def getcol(number: int) -> str:
@@ -1483,95 +1469,78 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
         header_pb = TableRow()
         table.addElement(header_pb)
         problems_tc = TableCell(valuetype="string", stylename=title_style_topleft)
-        problems_tc.addElement(P(text=_("Problem")))
+        problems_tc.addElement(P(text="Problème"))
         problems_tc.setAttribute('numbercolumnsspanned', "2")
         header_pb.addElement(problems_tc)
         header_pb.addElement(CoveredTableCell())
         for passage in self.object.passages.all():
             tc = TableCell(valuetype="string", stylename=title_style_topleftright)
-            tc.addElement(P(text=_("Problem #{problem}").format(problem=passage.solution_number)))
-            tc.setAttribute('numbercolumnsspanned', str(passage_width))
+            tc.addElement(P(text=f"Problème {passage.solution_number}"))
+            tc.setAttribute('numbercolumnsspanned', "6")
             header_pb.addElement(tc)
-            header_pb.addElement(CoveredTableCell(numbercolumnsrepeated=passage_width - 1))
+            header_pb.addElement(CoveredTableCell(numbercolumnsrepeated=5))
 
         # Add roles on the second line of the table
         header_role = TableRow()
         table.addElement(header_role)
         role_tc = TableCell(valuetype="string", stylename=title_style_left)
-        role_tc.addElement(P(text=_("Role")))
+        role_tc.addElement(P(text="Rôle"))
         role_tc.setAttribute('numbercolumnsspanned', "2")
         header_role.addElement(role_tc)
         header_role.addElement(CoveredTableCell())
         for i in range(pool_size):
-            reporter_tc = TableCell(valuetype="string", stylename=title_style_left)
-            reporter_tc.addElement(P(text=_("Reporter")))
-            reporter_tc.setAttribute('numbercolumnsspanned', "2")
-            header_role.addElement(reporter_tc)
+            defender_tc = TableCell(valuetype="string", stylename=title_style_left)
+            defender_tc.addElement(P(text="Défenseur⋅se"))
+            defender_tc.setAttribute('numbercolumnsspanned', "2")
+            header_role.addElement(defender_tc)
             header_role.addElement(CoveredTableCell())
 
             opponent_tc = TableCell(valuetype="string", stylename=title_style)
-            opponent_tc.addElement(P(text=_("Opponent")))
+            opponent_tc.addElement(P(text="Opposant⋅e"))
             opponent_tc.setAttribute('numbercolumnsspanned', "2")
             header_role.addElement(opponent_tc)
             header_role.addElement(CoveredTableCell())
 
-            reviewer_tc = TableCell(valuetype="string",
-                                    stylename=title_style if has_observer else title_style_right)
-            reviewer_tc.addElement(P(text=_("Reviewer")))
-            reviewer_tc.setAttribute('numbercolumnsspanned', "2")
-            header_role.addElement(reviewer_tc)
+            reporter_tc = TableCell(valuetype="string",
+                                    stylename=title_style_right)
+            reporter_tc.addElement(P(text="Rapporteur⋅rice"))
+            reporter_tc.setAttribute('numbercolumnsspanned', "2")
+            header_role.addElement(reporter_tc)
             header_role.addElement(CoveredTableCell())
 
-            if has_observer:
-                observer_tc = TableCell(valuetype="string", stylename=title_style_right)
-                observer_tc.addElement(P(text=_("Observer")))
-                observer_tc.setAttribute('numbercolumnsspanned', "2")
-                header_role.addElement(observer_tc)
-                header_role.addElement(CoveredTableCell())
-
         # Add maximum notes on the third line
         header_notes = TableRow()
         table.addElement(header_notes)
-        jury_tc = TableCell(valuetype="string", value=_("Juree"), stylename=title_style_botleft)
-        jury_tc.addElement(P(text=_("Juree")))
+        jury_tc = TableCell(valuetype="string", value="Juré⋅e", stylename=title_style_botleft)
+        jury_tc.addElement(P(text="Juré⋅e"))
         jury_tc.setAttribute('numbercolumnsspanned', "2")
         header_notes.addElement(jury_tc)
         header_notes.addElement(CoveredTableCell())
 
         for i in range(pool_size):
-            reporter_w_tc = TableCell(valuetype="string", stylename=title_style_botleft)
-            reporter_w_tc.addElement(P(text=f"{_('Writing')} (/{20 if settings.TFJM_APP == 'TFJM' else 10})"))
-            header_notes.addElement(reporter_w_tc)
+            defender_w_tc = TableCell(valuetype="string", stylename=title_style_botleft)
+            defender_w_tc.addElement(P(text="Écrit (/20)"))
+            header_notes.addElement(defender_w_tc)
 
-            reporter_o_tc = TableCell(valuetype="string", stylename=title_style_bot)
-            reporter_o_tc.addElement(P(text=f"{_('Oral')} (/{20 if settings.TFJM_APP == 'TFJM' else 10})"))
-            header_notes.addElement(reporter_o_tc)
+            defender_o_tc = TableCell(valuetype="string", stylename=title_style_bot)
+            defender_o_tc.addElement(P(text="Oral (/20)"))
+            header_notes.addElement(defender_o_tc)
 
             opponent_w_tc = TableCell(valuetype="string", stylename=title_style_bot)
-            opponent_w_tc.addElement(P(text=f"{_('Writing')} (/10)"))
+            opponent_w_tc.addElement(P(text="Écrit (/10)"))
             header_notes.addElement(opponent_w_tc)
 
             opponent_o_tc = TableCell(valuetype="string", stylename=title_style_bot)
-            opponent_o_tc.addElement(P(text=f"{_('Oral')} (/10)"))
+            opponent_o_tc.addElement(P(text="Oral (/10)"))
             header_notes.addElement(opponent_o_tc)
 
-            reviewer_w_tc = TableCell(valuetype="string", stylename=title_style_bot)
-            reviewer_w_tc.addElement(P(text=f"{_('Writing')} (/10)"))
-            header_notes.addElement(reviewer_w_tc)
+            reporter_w_tc = TableCell(valuetype="string", stylename=title_style_bot)
+            reporter_w_tc.addElement(P(text="Écrit (/10)"))
+            header_notes.addElement(reporter_w_tc)
 
-            reviewer_o_tc = TableCell(valuetype="string",
-                                      stylename=title_style_bot if has_observer else title_style_botright)
-            reviewer_o_tc.addElement(P(text=f"{_('Oral')} (/10)"))
-            header_notes.addElement(reviewer_o_tc)
-
-            if has_observer:
-                observer_w_tc = TableCell(valuetype="string", stylename=title_style_bot)
-                observer_w_tc.addElement(P(text=f"{_('Writing')} (/10)"))
-                header_notes.addElement(observer_w_tc)
-
-                observer_o_tc = TableCell(valuetype="string", stylename=title_style_botright)
-                observer_o_tc.addElement(P(text=f"{_('Oral')} (/10)"))
-                header_notes.addElement(observer_o_tc)
+            reporter_o_tc = TableCell(valuetype="string", stylename=title_style_botright)
+            reporter_o_tc.addElement(P(text="Oral (/10)"))
+            header_notes.addElement(reporter_o_tc)
 
         # Add a notation line for each jury
         for jury in self.object.juries.all():
@@ -1602,7 +1571,7 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
         average_row = TableRow()
         table.addElement(average_row)
         average_tc = TableCell(valuetype="string", stylename=title_style_topleftright)
-        average_tc.addElement(P(text=_("Average")))
+        average_tc.addElement(P(text="Moyenne"))
         average_tc.setAttribute('numbercolumnsspanned', "2")
         average_row.addElement(average_tc)
         average_row.addElement(CoveredTableCell())
@@ -1621,62 +1590,52 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
         coeff_row = TableRow()
         table.addElement(coeff_row)
         coeff_tc = TableCell(valuetype="string", stylename=title_style_leftright)
-        coeff_tc.addElement(P(text=_("Coefficient")))
+        coeff_tc.addElement(P(text="Coefficient"))
         coeff_tc.setAttribute('numbercolumnsspanned', "2")
         coeff_row.addElement(coeff_tc)
         coeff_row.addElement(CoveredTableCell())
         for passage in self.object.passages.all():
-            reporter_w_tc = TableCell(valuetype="float", value=passage.coeff_reporter_writing, stylename=style_left)
-            reporter_w_tc.addElement(P(text=str(passage.coeff_reporter_writing)))
-            coeff_row.addElement(reporter_w_tc)
+            defender_w_tc = TableCell(valuetype="float", value=1, stylename=style_left)
+            defender_w_tc.addElement(P(text="1"))
+            coeff_row.addElement(defender_w_tc)
 
-            reporter_o_tc = TableCell(valuetype="float", value=passage.coeff_reporter_oral, stylename=style)
-            reporter_o_tc.addElement(P(text=str(passage.coeff_reporter_oral)))
-            coeff_row.addElement(reporter_o_tc)
+            defender_o_tc = TableCell(valuetype="float", value=1.6 - 0.4 * passage.defender_penalties, stylename=style)
+            defender_o_tc.addElement(P(text=str(2 - 0.4 * passage.defender_penalties)))
+            coeff_row.addElement(defender_o_tc)
 
-            opponent_w_tc = TableCell(valuetype="float", value=passage.coeff_opponent_writing, stylename=style)
-            opponent_w_tc.addElement(P(text=str(passage.coeff_opponent_writing)))
+            opponent_w_tc = TableCell(valuetype="float", value=0.9, stylename=style)
+            opponent_w_tc.addElement(P(text="1"))
             coeff_row.addElement(opponent_w_tc)
 
-            opponent_o_tc = TableCell(valuetype="float", value=passage.coeff_opponent_oral, stylename=style)
-            opponent_o_tc.addElement(P(text=str(passage.coeff_opponent_oral)))
+            opponent_o_tc = TableCell(valuetype="float", value=2, stylename=style)
+            opponent_o_tc.addElement(P(text="2"))
             coeff_row.addElement(opponent_o_tc)
 
-            reviewer_w_tc = TableCell(valuetype="float", value=passage.coeff_reviewer_writing, stylename=style)
-            reviewer_w_tc.addElement(P(text=str(passage.coeff_reviewer_writing)))
-            coeff_row.addElement(reviewer_w_tc)
+            reporter_w_tc = TableCell(valuetype="float", value=0.9, stylename=style)
+            reporter_w_tc.addElement(P(text="1"))
+            coeff_row.addElement(reporter_w_tc)
 
-            reviewer_o_tc = TableCell(valuetype="float", value=passage.coeff_reviewer_oral,
-                                      stylename=style if has_observer else style_right)
-            reviewer_o_tc.addElement(P(text=str(passage.coeff_reviewer_oral)))
-            coeff_row.addElement(reviewer_o_tc)
-
-            if has_observer:
-                observer_w_tc = TableCell(valuetype="float", value=passage.coeff_observer_writing, stylename=style)
-                observer_w_tc.addElement(P(text=str(passage.coeff_observer_writing)))
-                coeff_row.addElement(observer_w_tc)
-
-                observer_o_tc = TableCell(valuetype="float", value=passage.coeff_observer_oral, stylename=style_right)
-                observer_o_tc.addElement(P(text=str(passage.coeff_observer_oral)))
-                coeff_row.addElement(observer_o_tc)
+            reporter_o_tc = TableCell(valuetype="float", value=1, stylename=style_right)
+            reporter_o_tc.addElement(P(text="1"))
+            coeff_row.addElement(reporter_o_tc)
 
         # Add the subtotal on the next line
         subtotal_row = TableRow()
         table.addElement(subtotal_row)
         subtotal_tc = TableCell(valuetype="string", stylename=title_style_botleft)
-        subtotal_tc.addElement(P(text=_("Subtotal")))
+        subtotal_tc.addElement(P(text="Sous-total"))
         subtotal_tc.setAttribute('numbercolumnsspanned', "2")
         subtotal_row.addElement(subtotal_tc)
         subtotal_row.addElement(CoveredTableCell())
         for i, passage in enumerate(self.object.passages.all()):
             def_w_col = getcol(min_column + passage_width * i)
             def_o_col = getcol(min_column + passage_width * i + 1)
-            reporter_tc = TableCell(valuetype="float", value=passage.average_reporter, stylename=style_botleft)
-            reporter_tc.addElement(P(text=str(passage.average_reporter)))
-            reporter_tc.setAttribute('numbercolumnsspanned', "2")
-            reporter_tc.setAttribute("formula", f"of:=[.{def_w_col}{max_row + 1}] * [.{def_w_col}{max_row + 2}]"
+            defender_tc = TableCell(valuetype="float", value=passage.average_defender, stylename=style_botleft)
+            defender_tc.addElement(P(text=str(passage.average_defender)))
+            defender_tc.setAttribute('numbercolumnsspanned', "2")
+            defender_tc.setAttribute("formula", f"of:=[.{def_w_col}{max_row + 1}] * [.{def_w_col}{max_row + 2}]"
                                                 f" + [.{def_o_col}{max_row + 1}] * [.{def_o_col}{max_row + 2}]")
-            subtotal_row.addElement(reporter_tc)
+            subtotal_row.addElement(defender_tc)
             subtotal_row.addElement(CoveredTableCell())
 
             opp_w_col = getcol(min_column + passage_width * i + 2)
@@ -1691,26 +1650,14 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
 
             rep_w_col = getcol(min_column + passage_width * i + 4)
             rep_o_col = getcol(min_column + passage_width * i + 5)
-            reviewer_tc = TableCell(valuetype="float", value=passage.average_reviewer,
-                                    stylename=style_bot if has_observer else style_botright)
-            reviewer_tc.addElement(P(text=str(passage.average_reviewer)))
-            reviewer_tc.setAttribute('numbercolumnsspanned', "2")
-            reviewer_tc.setAttribute("formula", f"of:=[.{rep_w_col}{max_row + 1}] * [.{rep_w_col}{max_row + 2}]"
+            reporter_tc = TableCell(valuetype="float", value=passage.average_reporter, stylename=style_botright)
+            reporter_tc.addElement(P(text=str(passage.average_reporter)))
+            reporter_tc.setAttribute('numbercolumnsspanned', "2")
+            reporter_tc.setAttribute("formula", f"of:=[.{rep_w_col}{max_row + 1}] * [.{rep_w_col}{max_row + 2}]"
                                                 f" + [.{rep_o_col}{max_row + 1}] * [.{rep_o_col}{max_row + 2}]")
-            subtotal_row.addElement(reviewer_tc)
+            subtotal_row.addElement(reporter_tc)
             subtotal_row.addElement(CoveredTableCell())
 
-            if has_observer:
-                obs_w_col = getcol(min_column + passage_width * i + 6)
-                obs_o_col = getcol(min_column + passage_width * i + 7)
-                observer_tc = TableCell(valuetype="float", value=passage.average_observer, stylename=style_botright)
-                observer_tc.addElement(P(text=str(passage.average_observer)))
-                observer_tc.setAttribute('numbercolumnsspanned', "2")
-                observer_tc.setAttribute("formula", f"of:=[.{obs_w_col}{max_row + 1}] * [.{obs_w_col}{max_row + 2}]"
-                                                    f" + [.{obs_o_col}{max_row + 1}] * [.{obs_o_col}{max_row + 2}]")
-                subtotal_row.addElement(observer_tc)
-                subtotal_row.addElement(CoveredTableCell())
-
         table.addElement(TableRow())
 
         if self.object.participations.count() == 5:
@@ -1728,17 +1675,17 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
             scores_header = TableRow()
             table.addElement(scores_header)
             team_tc = TableCell(valuetype="string", stylename=title_style_topbotleft)
-            team_tc.addElement(P(text=_("Team")))
+            team_tc.addElement(P(text="Équipe"))
             team_tc.setAttribute('numbercolumnsspanned', "2")
             scores_header.addElement(team_tc)
             problem_tc = TableCell(valuetype="string", stylename=title_style_topbot)
-            problem_tc.addElement(P(text=_("Problem")))
+            problem_tc.addElement(P(text="Problème"))
             scores_header.addElement(problem_tc)
             total_tc = TableCell(valuetype="string", stylename=title_style_topbot)
-            total_tc.addElement(P(text=_("Total")))
+            total_tc.addElement(P(text="Total"))
             scores_header.addElement(total_tc)
             rank_tc = TableCell(valuetype="string", stylename=title_style_topbotright)
-            rank_tc.addElement(P(text=_("Rank")))
+            rank_tc.addElement(P(text="Rang"))
             scores_header.addElement(rank_tc)
 
             sorted_participations = sorted(self.object.participations.all(), key=lambda p: -self.object.average(p))
@@ -1748,42 +1695,36 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
 
                 team_tc = TableCell(valuetype="string",
                                     stylename=style_botleft if passage.position == pool_size else style_left)
-                team_tc.addElement(P(text=f"{passage.reporter.team.name} ({passage.reporter.team.trigram})"))
+                team_tc.addElement(P(text=f"{passage.defender.team.name} ({passage.defender.team.trigram})"))
                 team_tc.setAttribute('numbercolumnsspanned', "2")
                 team_row.addElement(team_tc)
 
                 problem_tc = TableCell(valuetype="string",
                                        stylename=style_bot if passage.position == pool_size else style)
-                problem_tc.addElement(P(text=_("Problem #{problem}").format(problem=passage.solution_number)))
+                problem_tc.addElement(P(text=f"Problème {passage.solution_number}"))
                 problem_tc.setAttribute("formula", f"of:=[.B{3 + passage_width * (passage.position - 1)}]")
                 team_row.addElement(problem_tc)
 
-                reporter_pos = passage.position - 1
-                opponent_pos = self.object.passages.get(opponent=passage.reporter).position - 1
-                reviewer_pos = self.object.passages.get(reviewer=passage.reporter).position - 1
-                observer_pos = self.object.passages.get(observer=passage.reporter).position - 1 \
-                    if has_observer else None
+                defender_pos = passage.position - 1
+                opponent_pos = self.object.passages.get(opponent=passage.defender).position - 1
+                reporter_pos = self.object.passages.get(reporter=passage.defender).position - 1
 
-                score_tc = TableCell(valuetype="float", value=self.object.average(passage.reporter),
+                score_tc = TableCell(valuetype="float", value=self.object.average(passage.defender),
                                      stylename=style_bot if passage.position == pool_size else style)
-                score_tc.addElement(P(text=self.object.average(passage.reporter)))
+                score_tc.addElement(P(text=self.object.average(passage.defender)))
                 formula = "of:="
-                formula += getcol(min_column + reporter_pos * passage_width) + str(max_row + 3)  # Reporter
+                formula += getcol(min_column + defender_pos * passage_width) + str(max_row + 3)  # Defender
                 formula += " + " + getcol(min_column + opponent_pos * passage_width + 2) + str(max_row + 3)  # Opponent
-                formula += " + " + getcol(min_column + reviewer_pos * passage_width + 4) + str(max_row + 3)  # Reviewer
-                if has_observer:
-                    # Observer
-                    formula += " + " + getcol(min_column + observer_pos * passage_width + 6) + str(max_row + 3)
+                formula += " + " + getcol(min_column + reporter_pos * passage_width + 4) + str(max_row + 3)  # Reporter
                 score_tc.setAttribute("formula", formula)
                 team_row.addElement(score_tc)
 
                 score_col = 'C'
-                rank_tc = TableCell(valuetype="float", value=sorted_participations.index(passage.reporter) + 1,
+                rank_tc = TableCell(valuetype="float", value=sorted_participations.index(passage.defender) + 1,
                                     stylename=style_botright if passage.position == pool_size else style_right)
-                rank_tc.addElement(P(text=str(sorted_participations.index(passage.reporter) + 1)))
+                rank_tc.addElement(P(text=str(sorted_participations.index(passage.defender) + 1)))
                 rank_tc.setAttribute("formula", f"of:=RANK([.{score_col}{max_row + 5 + passage.position}]; "
-                                                f"[.{score_col}${max_row + 6}]:"
-                                                f"[.{score_col}${max_row + 5 + pool_size}])")
+                                                f"[.{score_col}${max_row + 6}]:[.{score_col}${max_row + 5 + pool_size}])")
                 team_row.addElement(rank_tc)
 
         table.addElement(TableRow())
@@ -1808,8 +1749,8 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
 
         return FileResponse(streaming_content=open("/tmp/notes.ods", "rb"),
                             content_type="application/vnd.oasis.opendocument.spreadsheet",
-                            filename=f"{_('Notation sheet')} - {self.object.tournament.name} "
-                                     f"- {_('Pool')} {self.object.short_name}.ods")
+                            filename=f"Feuille de notes - {self.object.tournament.name} "
+                                     f"- Poule {self.object.short_name}.ods")
 
 
 class NotationSheetTemplateView(VolunteerMixin, DetailView):
@@ -1838,14 +1779,11 @@ class NotationSheetTemplateView(VolunteerMixin, DetailView):
         context['esp'] = passages.count() * '&'
         if self.request.user.registration in self.object.juries.all() and 'blank' not in self.request.GET:
             context['jury'] = self.request.user.registration
-        context['tfjm_number'] = timezone.now().year - settings.FIRST_EDITION + 1
+        context['tfjm_number'] = timezone.now().year - 2010
         return context
 
     def render_to_response(self, context, **response_kwargs):
-        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-
-        template_name = self.get_template_names()[0]
-        tex = render_to_string(template_name, context=context, request=self.request)
+        tex = render_to_string(self.template_name, context=context, request=self.request)
         temp_dir = mkdtemp()
         with open(os.path.join(temp_dir, "texput.tex"), "w") as f:
             f.write(tex)
@@ -1854,16 +1792,15 @@ class NotationSheetTemplateView(VolunteerMixin, DetailView):
         process.wait()
         return FileResponse(streaming_content=open(os.path.join(temp_dir, "texput.pdf"), "rb"),
                             content_type="application/pdf",
-                            filename=template_name.split("/")[-1][:-3] + "pdf")
+                            filename=self.template_name.split("/")[-1][:-3] + "pdf")
 
 
 class ScaleNotationSheetTemplateView(NotationSheetTemplateView):
-    def get_template_names(self):
-        return [f"participation/tex/scale_{settings.TFJM_APP.lower()}.tex"]
+    template_name = 'participation/tex/bareme.tex'
 
 
 class FinalNotationSheetTemplateView(NotationSheetTemplateView):
-    template_name = "participation/tex/final_sheet.tex"
+    template_name = 'participation/tex/finale.tex'
 
 
 class NotationSheetsArchiveView(VolunteerMixin, DetailView):
@@ -1895,8 +1832,6 @@ class NotationSheetsArchiveView(VolunteerMixin, DetailView):
         return self.handle_no_permission()
 
     def get(self, request, *args, **kwargs):
-        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-
         if 'pool_id' in kwargs:
             pool = self.get_object()
             tournament = pool.tournament
@@ -1912,15 +1847,15 @@ class NotationSheetsArchiveView(VolunteerMixin, DetailView):
         with ZipFile(output, "w") as zf:
             for pool in pools:
                 prefix = f"{pool.short_name}/" if len(pools) > 1 else ""
-                for template_name in [f"scale_{settings.TFJM_APP.lower()}", "final_sheet"]:
+                for template_name in ['bareme', 'finale']:
                     juries = list(pool.juries.all()) + [None]
 
                     for jury in juries:
-                        if jury is not None and template_name.startswith("scale"):
+                        if jury is not None and template_name == "bareme":
                             continue
 
                         context = {'jury': jury, 'pool': pool,
-                                   'tfjm_number': timezone.now().year - settings.FIRST_EDITION + 1}
+                                   'tfjm_number': timezone.now().year - 2010}
 
                         passages = pool.passages.all()
                         context['passages'] = passages
@@ -1937,7 +1872,7 @@ class NotationSheetsArchiveView(VolunteerMixin, DetailView):
                              os.path.join(temp_dir, "texput.tex"), ])
                         process.wait()
 
-                        sheet_name = f"Barème pour la poule {pool.short_name}" if template_name.startswith("scale") \
+                        sheet_name = f"Barème pour la poule {pool.short_name}" if template_name == "bareme" \
                             else (f"Feuille de notation pour la poule {pool.short_name}"
                                   f" - {str(jury) if jury else 'Vierge'}")
 
@@ -1990,7 +1925,7 @@ class PassageDetailView(LoginRequiredMixin, DetailView):
                      or reg in passage.pool.juries.all()
                      or reg.pools_presided.filter(tournament=passage.pool.tournament).exists()) \
                 or reg.participates and reg.team \
-                and reg.team.participation in [passage.reporter, passage.opponent, passage.reviewer, passage.observer]:
+                and reg.team.participation in [passage.defender, passage.opponent, passage.reporter]:
             return super().dispatch(request, *args, **kwargs)
         return self.handle_no_permission()
 
@@ -2011,12 +1946,12 @@ class PassageDetailView(LoginRequiredMixin, DetailView):
         if 'notes' in context and not self.request.user.registration.is_admin:
             context['notes']._sequence.remove('update')
 
-            context['notes'].columns['reporter_writing'].column.verbose_name += f" ({passage.reporter.team.trigram})"
-            context['notes'].columns['reporter_oral'].column.verbose_name += f" ({passage.reporter.team.trigram})"
+            context['notes'].columns['defender_writing'].column.verbose_name += f" ({passage.defender.team.trigram})"
+            context['notes'].columns['defender_oral'].column.verbose_name += f" ({passage.defender.team.trigram})"
             context['notes'].columns['opponent_writing'].column.verbose_name += f" ({passage.opponent.team.trigram})"
             context['notes'].columns['opponent_oral'].column.verbose_name += f" ({passage.opponent.team.trigram})"
-            context['notes'].columns['reviewer_writing'].column.verbose_name += f" ({passage.reviewer.team.trigram})"
-            context['notes'].columns['reviewer_oral'].column.verbose_name += f" ({passage.reviewer.team.trigram})"
+            context['notes'].columns['reporter_writing'].column.verbose_name += f" ({passage.reporter.team.trigram})"
+            context['notes'].columns['reporter_oral'].column.verbose_name += f" ({passage.reporter.team.trigram})"
 
         return context
 
@@ -2037,9 +1972,9 @@ class PassageUpdateView(VolunteerMixin, UpdateView):
         return self.handle_no_permission()
 
 
-class WrittenReviewUploadView(LoginRequiredMixin, FormView):
-    template_name = "participation/upload_written_review.html"
-    form_class = WrittenReviewForm
+class SynthesisUploadView(LoginRequiredMixin, FormView):
+    template_name = "participation/upload_synthesis.html"
+    form_class = SynthesisForm
 
     def dispatch(self, request, *args, **kwargs):
         if not request.user.is_authenticated or not request.user.registration.participates:
@@ -2051,8 +1986,7 @@ class WrittenReviewUploadView(LoginRequiredMixin, FormView):
         self.participation = self.request.user.registration.team.participation
         self.passage = qs.get()
 
-        if self.participation \
-                and self.participation not in [self.passage.opponent, self.passage.reviewer, self.passage.observer]:
+        if self.participation not in [self.passage.opponent, self.passage.reporter]:
             return self.handle_no_permission()
 
         return super().dispatch(request, *args, **kwargs)
@@ -2064,16 +1998,15 @@ class WrittenReviewUploadView(LoginRequiredMixin, FormView):
         It is discriminating whenever the team is selected for the final tournament or not.
         """
         form_syn = form.instance
-        form_syn.type = 1 if self.participation == self.passage.opponent \
-            else 2 if self.participation == self.passage.reviewer else 3
-        syn_qs = WrittenReview.objects.filter(participation=self.participation,
-                                              passage=self.passage,
-                                              type=form_syn.type).all()
+        form_syn.type = 1 if self.participation == self.passage.opponent else 2
+        syn_qs = Synthesis.objects.filter(participation=self.participation,
+                                          passage=self.passage,
+                                          type=form_syn.type).all()
 
-        deadline = self.passage.pool.tournament.reviews_first_phase_limit if self.passage.pool.round == 1 \
-            else self.passage.pool.tournament.reviews_second_phase_limit
+        deadline = self.passage.pool.tournament.syntheses_first_phase_limit if self.passage.pool.round == 1 \
+            else self.passage.pool.tournament.syntheses_second_phase_limit
         if syn_qs.exists() and timezone.now() > deadline:
-            form.add_error(None, _("You can't upload a written review after the deadline."))
+            form.add_error(None, _("You can't upload a synthesis after the deadline."))
             return self.form_invalid(form)
 
         # Drop previous solution if existing
@@ -2107,14 +2040,12 @@ class NoteUpdateView(VolunteerMixin, UpdateView):
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
-        form.fields['reporter_writing'].label += f" ({self.object.passage.reporter.team.trigram})"
-        form.fields['reporter_oral'].label += f" ({self.object.passage.reporter.team.trigram})"
+        form.fields['defender_writing'].label += f" ({self.object.passage.defender.team.trigram})"
+        form.fields['defender_oral'].label += f" ({self.object.passage.defender.team.trigram})"
         form.fields['opponent_writing'].label += f" ({self.object.passage.opponent.team.trigram})"
         form.fields['opponent_oral'].label += f" ({self.object.passage.opponent.team.trigram})"
-        form.fields['reviewer_writing'].label += f" ({self.object.passage.reviewer.team.trigram})"
-        form.fields['reviewer_oral'].label += f" ({self.object.passage.reviewer.team.trigram})"
-        form.fields['observer_writing'].label += f" ({self.object.passage.observer.team.trigram})"
-        form.fields['observer_oral'].label += f" ({self.object.passage.observer.team.trigram})"
+        form.fields['reporter_writing'].label += f" ({self.object.passage.reporter.team.trigram})"
+        form.fields['reporter_oral'].label += f" ({self.object.passage.reporter.team.trigram})"
         return form
 
     def form_valid(self, form):

registration/api/urls.py

@@ -10,4 +10,4 @@ def register_registration_urls(router, path):
     """
     router.register(path + "/payment", PaymentViewSet)
     router.register(path + "/registration", RegistrationViewSet)
-    router.register(path + "/volunteers", VolunteersViewSet, basename="volunteers")
+    router.register(path + "/volunteers", VolunteersViewSet)

registration/forms.py

@@ -2,13 +2,10 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django import forms
-from django.conf import settings
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.forms import FileInput
-from django.utils import timezone
-from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy as _
 
 from .models import CoachRegistration, ParticipantRegistration, Payment, \
@@ -38,19 +35,6 @@ class SignupForm(UserCreationForm):
             self.add_error("email", _("This email address is already used."))
         return email
 
-    def clean(self):
-        # Check that registrations are opened
-        now = timezone.now()
-        if now < settings.REGISTRATION_DATES['open']:
-            self.add_error(None, format_lazy(_("Registrations are not opened yet. "
-                                               "They will open on the {opening_date:%Y-%m-%d %H:%M}."),
-                                             opening_date=settings.REGISTRATION_DATES['open']))
-        elif now > settings.REGISTRATION_DATES['close']:
-            self.add_error(None, format_lazy(_("Registrations for this year are closed since "
-                                               "{closing_date:%Y-%m-%d %H:%M}."),
-                                             closing_date=settings.REGISTRATION_DATES['close']))
-        return super().clean()
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["first_name"].required = True
@@ -119,15 +103,12 @@ class StudentRegistrationForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["birth_date"].widget = forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d')
-        if not settings.SUGGEST_ANIMATH:
-            del self.fields["give_contact_to_animath"]
 
     class Meta:
         model = StudentRegistration
-        fields = ('team', 'student_class', 'birth_date', 'gender', 'address', 'zip_code', 'city', 'country',
-                  'phone_number', 'school', 'health_issues', 'housing_constraints',
-                  'responsible_name', 'responsible_phone', 'responsible_email', 'give_contact_to_animath',
-                  'email_confirmed',)
+        fields = ('team', 'student_class', 'birth_date', 'gender', 'address', 'zip_code', 'city', 'phone_number',
+                  'school', 'health_issues', 'housing_constraints', 'responsible_name', 'responsible_phone',
+                  'responsible_email', 'give_contact_to_animath', 'email_confirmed',)
 
 
 class PhotoAuthorizationForm(forms.ModelForm):
@@ -266,14 +247,9 @@ class CoachRegistrationForm(forms.ModelForm):
     """
     A coach can tell its professional activity.
     """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not settings.SUGGEST_ANIMATH:
-            del self.fields["give_contact_to_animath"]
-
     class Meta:
         model = CoachRegistration
-        fields = ('team', 'gender', 'address', 'zip_code', 'city', 'country', 'phone_number',
+        fields = ('team', 'gender', 'address', 'zip_code', 'city', 'phone_number',
                   'last_degree', 'professional_activity', 'health_issues', 'housing_constraints',
                   'give_contact_to_animath', 'email_confirmed',)
 
@@ -282,11 +258,6 @@ class VolunteerRegistrationForm(forms.ModelForm):
     """
     A volunteer can also tell its professional activity.
     """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        if not settings.SUGGEST_ANIMATH:
-            del self.fields["give_contact_to_animath"]
-
     class Meta:
         model = VolunteerRegistration
         fields = ('professional_activity', 'admin', 'give_contact_to_animath', 'email_confirmed',)

registration/management/commands/check_hello_asso.py

@@ -3,7 +3,6 @@
 
 import json
 
-from django.conf import settings
 from django.core.management import BaseCommand
 
 from ...models import Payment
@@ -16,9 +15,6 @@ class Command(BaseCommand):
     help = "Vérifie si les paiements Hello Asso initiés sont validés ou non. Si oui, valide les inscriptions."
 
     def handle(self, *args, **options):
-        if not settings.PAYMENT_MANAGEMENT:
-            return
-
         for payment in Payment.objects.exclude(valid=True).filter(checkout_intent_id__isnull=False).all():
             checkout_intent = payment.get_checkout_intent()
             if checkout_intent is not None and 'order' in checkout_intent:

registration/management/commands/export_photo_authorizations.py

@@ -1,37 +0,0 @@
-# Copyright (C) 2024 by Animath
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from pathlib import Path
-
-from django.core.management import BaseCommand
-from participation.models import Team
-
-
-class Command(BaseCommand):
-    help = """Cette commande permet d'exporter dans le dossier output/photo_authorizations l'ensemble des
-    autorisations de droit à l'image des participant⋅es, triées par équipe, incluant aussi celles de la finale."""
-
-    def handle(self, *args, **kwargs):
-        base_dir = Path(__file__).parent.parent.parent.parent
-        base_dir /= "output"
-        if not base_dir.is_dir():
-            base_dir.mkdir()
-        base_dir /= "photo_authorizations"
-        if not base_dir.is_dir():
-            base_dir.mkdir()
-
-        for team in Team.objects.filter(participation__valid=True).all():
-            team_dir = base_dir / f"{team.trigram} - {team.name}"
-            if not team_dir.is_dir():
-                team_dir.mkdir()
-
-            for participant in team.participants.all():
-                if participant.photo_authorization:
-                    with participant.photo_authorization.file as file_input:
-                        with open(team_dir / f"{participant}.pdf", 'wb') as file_output:
-                            file_output.write(file_input.read())
-
-                if participant.photo_authorization_final:
-                    with participant.photo_authorization_final.file as file_input:
-                        with open(team_dir / f"{participant} (finale).pdf", 'wb') as file_output:
-                            file_output.write(file_input.read())

registration/management/commands/remind_payments.py

@@ -1,7 +1,6 @@
 # Copyright (C) 2024 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.conf import settings
 from django.core.management import BaseCommand
 
 from ...models import Payment
@@ -14,8 +13,5 @@ class Command(BaseCommand):
     help = "Envoie un mail de rappel à toustes les participant⋅es qui n'ont pas encore payé ou déclaré de paiement."
 
     def handle(self, *args, **options):
-        if not settings.PAYMENT_MANAGEMENT:
-            return
-
         for payment in Payment.objects.filter(valid=False).filter(registrations__team__participation__valid=True).all():
             payment.send_remind_mail()

registration/migrations/0014_participantregistration_country.py

@@ -1,23 +0,0 @@
-# Generated by Django 5.0.6 on 2024-06-07 12:46
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        (
-            "registration",
-            "0013_participantregistration_photo_authorization_final_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="participantregistration",
-            name="country",
-            field=models.CharField(
-                default="France", max_length=255, verbose_name="country"
-            ),
-        ),
-    ]

registration/models.py

@@ -1,9 +1,8 @@
 # Copyright (C) 2020 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from datetime import date
+from datetime import date, datetime
 
-from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.mail import send_mail
 from django.core.validators import MaxValueValidator, MinValueValidator
@@ -50,7 +49,7 @@ class Registration(PolymorphicModel):
         The account got created or the email got changed.
         Send an email that contains a link to validate the address.
         """
-        subject = f"[{settings.APP_NAME}] " + str(_("Activate your account"))
+        subject = "[TFJM²] " + str(_("Activate your TFJM² account"))
         token = email_validation_token.make_token(self.user)
         uid = urlsafe_base64_encode(force_bytes(self.user.pk))
         site = Site.objects.first()
@@ -184,12 +183,6 @@ class ParticipantRegistration(Registration):
         verbose_name=_("city"),
     )
 
-    country = models.CharField(
-        max_length=255,
-        verbose_name=_("country"),
-        default="France",
-    )
-
     phone_number = PhoneNumberField(
         verbose_name=_("phone number"),
         blank=True,
@@ -308,8 +301,8 @@ class ParticipantRegistration(Registration):
         """
         The team is selected for final.
         """
-        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-        subject = f"[{settings.APP_NAME}] " + str(_("Team selected for the final tournament"))
+        translation.activate('fr')
+        subject = "[TFJM²] " + str(_("Team selected for the final tournament"))
         site = Site.objects.first()
         from participation.models import Tournament
         tournament = Tournament.final_tournament()
@@ -426,7 +419,7 @@ class StudentRegistration(ParticipantRegistration):
                     'priority': 5,
                     'content': content,
                 })
-            if settings.HEALTH_SHEET_REQUIRED and not self.health_sheet:
+            if not self.health_sheet:
                 text = _("You have not uploaded your health sheet. "
                          "You can do it by clicking on <a href=\"{health_url}\">this link</a>.")
                 health_url = reverse_lazy("registration:upload_user_health_sheet", args=(self.id,))
@@ -437,7 +430,7 @@ class StudentRegistration(ParticipantRegistration):
                     'priority': 5,
                     'content': content,
                 })
-            if settings.VACCINE_SHEET_REQUIRED and not self.vaccine_sheet:
+            if not self.vaccine_sheet:
                 text = _("You have not uploaded your vaccine sheet. "
                          "You can do it by clicking on <a href=\"{vaccine_url}\">this link</a>.")
                 vaccine_url = reverse_lazy("registration:upload_user_vaccine_sheet", args=(self.id,))
@@ -774,7 +767,7 @@ class Payment(models.Model):
             return checkout_intent
 
         tournament = self.tournament
-        year = timezone.now().year
+        year = datetime.now().year
         base_site = "https://" + Site.objects.first().domain
         checkout_intent = helloasso.create_checkout_intent(
             amount=100 * self.amount,
@@ -802,8 +795,8 @@ class Payment(models.Model):
         return checkout_intent
 
     def send_remind_mail(self):
-        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-        subject = f"[{settings.APP_NAME}] " + str(_("Reminder for your payment"))
+        translation.activate('fr')
+        subject = "[TFJM²] " + str(_("Reminder for your payment"))
         site = Site.objects.first()
         for registration in self.registrations.all():
             message = loader.render_to_string('registration/mails/payment_reminder.txt',
@@ -813,8 +806,8 @@ class Payment(models.Model):
             registration.user.email_user(subject, message, html_message=html)
 
     def send_helloasso_payment_confirmation_mail(self):
-        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-        subject = f"[{settings.APP_NAME}] " + str(_("Payment confirmation"))
+        translation.activate('fr')
+        subject = "[TFJM²] " + str(_("Payment confirmation"))
         site = Site.objects.first()
         for registration in self.registrations.all():
             message = loader.render_to_string('registration/mails/payment_confirmation.txt',

registration/templates/registration/mails/add_organizer.html

@@ -24,7 +24,8 @@
 
 <p>
     En cas de problème, merci de nous contacter soit par mail à l'adresse
-    <a href="mailto:contact@tfjm.org">contact@tfjm.org</a>.
+    <a href="mailto:contact@tfjm.org">contact@tfjm.org</a>, soit sur la plateforme de chat accessible sur
+    <a href="https://element.tfjm.org/">https://element.tfjm.org/</a> en vous connectant avec les mêmes identifiants.
 </p>
 
 <p>

registration/templates/registration/signup.html

@@ -9,42 +9,30 @@
 {% endblock %}
 
 {% block content %}
-    {% now "c" as now %}
-    {% if now < TFJM.REGISTRATION_DATES.open.isoformat %}
-        <div class="alert alert-warning">
-            {% trans "Thank you for your great interest, but registrations are not opened yet!" %}
-            {% trans "They will open on:" %} {{ TFJM.REGISTRATION_DATES.open|date:'DATETIME_FORMAT' }}.
-            {% trans "Please come back at this time to register!" %}
+    <h2>{% trans "Sign up" %}</h2>
+
+    <form method="post">
+        {% csrf_token %}
+        {{ form|crispy }}
+        <div id="registration_form"></div>
+
+        <div class="py-2 text-muted">
+            <i class="fas fa-info-circle"></i>
+            {% trans "By registering, you certify that you have read and accepted our" %}
+            <a href="{% url 'about' %}#politique-confidentialite">{% trans "privacy policy" %}</a>.
         </div>
-    {% elif now > TFJM.REGISTRATION_DATES.close.isoformat %}
-        <div class="alert alert-danger">
-            {% trans "Registrations are closed for this year. We hope to see you next year!" %}
-            {% trans "If needed, you can contact us by mail." %}
-        </div>
-    {% else %}
-        <form method="post">
-            {% csrf_token %}
-            {{ form|crispy }}
-            <div id="registration_form"></div>
-    
-            <div class="py-2 text-muted">
-                <i class="fas fa-info-circle"></i>
-                {% trans "By registering, you certify that you have read and accepted our" %}
-                <a href="{% url 'about' %}#politique-confidentialite">{% trans "privacy policy" %}</a>.
-            </div>
-    
-            <button class="btn btn-success" type="submit">
-                {% trans "Sign up" %}
-            </button>
-        </form>
-    
-        <div id="student_registration_form" class="d-none">
-            {{ student_registration_form|crispy }}
-        </div>
-        <div id="coach_registration_form" class="d-none">
-            {{ coach_registration_form|crispy }}
-        </div>
-    {% endif %}
+
+        <button class="btn btn-success" type="submit">
+            {% trans "Sign up" %}
+        </button>
+    </form>
+
+    <div id="student_registration_form" class="d-none">
+        {{ student_registration_form|crispy }}
+    </div>
+    <div id="coach_registration_form" class="d-none">
+        {{ coach_registration_form|crispy }}
+    </div>
 {% endblock %}
 
 {% block extrajavascript %}

registration/templates/registration/tex/Autorisation_droit_image_majeur.tex

@@ -17,7 +17,6 @@
 
 % Specials
 \newcommand{\writingsep}{\vrule height 4ex width 0pt}
-\newcommand{\cdt}{\kern-0.5pt\ensuremath\cdot\kern-0.5pt}
 
 % Page formating
 \hoffset -1in
@@ -38,7 +37,7 @@
 
 \begin{document}
 
-\includegraphics[height=2cm]{/code/static/tfjm/img/logo_animath.png}\hfill{\fontsize{55pt}{55pt}{$\mathbb{TFJM}^2$}}
+\includegraphics[height=2cm]{/code/static/logo_animath.png}\hfill{\fontsize{55pt}{55pt}{$\mathbb{TFJM}^2$}}
 
 \vfill
 
@@ -57,23 +56,19 @@ Autorisation d'enregistrement et de diffusion de l'image ({{ tournament.name }})
 
 
 
-Je soussign\'e\cdt{}e {{ registration|safe|default:"\dotfill" }}\\
+Je soussign\'e {{ registration|safe|default:"\dotfill" }}\\
 demeurant au {{ registration.address|safe|default:"\dotfill" }}
 
 \medskip
 Cochez la/les cases correspondantes.\\
 \medskip
 
-\fbox{\textcolor{white}{A}}  Autorise l'association Animath, \`a l'occasion du $\mathbb{TFJM}^2$
-{% if tournament.unified_registration %} dans
-l'un des tournois d'Île-de-France (selon sélection : du 26 au 27 avril 2025, du 3 au 4 mai 2025, ou du 10 au 11 mai 2025)
-{% else %} de
-{{ tournament.name }} du {{ tournament.date_start }} au {{ tournament.date_end }} à : {{ tournament.place }},
-{% endif %} \`a
-me photographier ou \`a me filmer et \`a diffuser les photos et/ou les vid\'eos r\'ealis\'ees \`a cette occasion
-sur son site et sur les sites partenaires. D\'eclare c\'eder \`a titre gracieux \`a Animath le droit d’utiliser mon
-image sur tous ses supports d'information : brochures, sites web, r\'eseaux sociaux. Animath devient, par la pr\'esente,
-cessionnaire des droits pendant toute la dur\'ee pour laquelle ont \'et\'e acquis les droits d'auteur de ces photographies.\\
+\fbox{\textcolor{white}{A}}  Autorise l'association Animath, \`a l'occasion du $\mathbb{TFJM}^2$ de {{ tournament.name }}
+du {{ tournament.date_start }} au {{ tournament.date_end }} à : {{ tournament.place }}, \`a me photographier ou \`a me
+filmer et \`a diffuser les photos et/ou les vid\'eos r\'ealis\'ees \`a cette occasion sur son site et sur les sites
+partenaires. D\'eclare c\'eder \`a titre gracieux \`a Animath le droit d’utiliser mon image sur tous ses supports
+d'information : brochures, sites web, r\'eseaux sociaux. Animath devient, par la pr\'esente, cessionnaire des droits
+pendant toute la dur\'ee pour laquelle ont \'et\'e acquis les droits d'auteur de ces photographies.\\
  
 \medskip
 Animath s'engage, conform\'ement aux dispositions l\'egales en vigueur relatives au droit \`a l'image, \`a ce que la
@@ -103,7 +98,7 @@ Animath, IHP, 11 rue Pierre et Marie Curie, 75231 Paris cedex 05.\\
 
 \bigskip
 
-Signature pr\'ec\'ed\'ee de la mention « lu et approuv\'e »
+Signature pr\'ec\'ed\'ee de la mention \og lu et approuv\'e \fg{}
 
 \medskip
 
@@ -111,7 +106,7 @@ Signature pr\'ec\'ed\'ee de la mention « lu et approuv\'e »
 
 \begin{minipage}[c]{0.5\textwidth}
 
-\underline{La/le participant\cdt{}e :}\\
+\underline{Le participant :}\\
 
 Fait \`a  :\\
 le

registration/templates/registration/tex/Autorisation_droit_image_mineur.tex

@@ -17,7 +17,6 @@
 
 % Specials
 \newcommand{\writingsep}{\vrule height 4ex width 0pt}
-\newcommand{\cdt}{\kern-0.5pt\ensuremath\cdot\kern-0.5pt}
 
 % Page formating
 \hoffset -1in
@@ -38,7 +37,7 @@
 
 \begin{document}
 
-\includegraphics[height=2cm]{/code/static/tfjm/img/logo_animath.png}\hfill{\fontsize{55pt}{55pt}{$\mathbb{TFJM}^2$}}
+\includegraphics[height=2cm]{/code/static/logo_animath.png}\hfill{\fontsize{55pt}{55pt}{$\mathbb{TFJM}^2$}}
 
 \vfill
 
@@ -58,25 +57,20 @@ Autorisation d'enregistrement et de diffusion de l'image
 
 
 
-Je soussign\'e\cdt{}e  \dotfill (p\`ere, m\`ere, responsable l\'egal) \\
-agissant en qualit\'e de repr\'esentant\cdt{}e de {{ registration|safe|default:"\dotfill" }}\\
+Je soussign\'e  \dotfill (p\`ere, m\`ere, responsable l\'egal) \\
+agissant en qualit\'e de repr\'esentant de {{ registration|safe|default:"\dotfill" }}\\
 demeurant au {{ registration.address|safe|default:"\dotfill" }}
 
 \medskip
 Cochez la/les cases correspondantes.\\
 \medskip
 
- \fbox{\textcolor{white}{A}}  Autorise l'association Animath, \`a l'occasion du $\mathbb{TFJM}^2$
- {% if tournament.unified_registration %} dans
- l'un des tournois d'Île-de-France (selon sélection : du 26 au 27 avril 2025, du 3 au 4 mai 2025, ou du 10 au 11 mai 2025)
- {% else %} de
- {{ tournament.name }} du {{ tournament.date_start }} au {{ tournament.date_end }} à : {{ tournament.place }},
- {% endif %} \`a
- photographier ou \`a filmer l'enfant et \`a diffuser les photos et/ou les vid\'eos r\'ealis\'ees \`a cette occasion
- sur son site et sur les sites partenaires. D\'eclare c\'eder \`a titre gracieux \`a Animath le droit d’utiliser l'image
- de l'enfant sur tous ses supports d'information : brochures, sites web, r\'eseaux sociaux. Animath devient, par la
- pr\'esente, cessionnaire des droits pendant toute la dur\'ee pour laquelle ont \'et\'e acquis les droits d'auteur de
-ces photographies.\\
+ \fbox{\textcolor{white}{A}}  Autorise l'association Animath, \`a l'occasion du $\mathbb{TFJM}^2$ de {{ tournament.name }}
+ du {{ tournament.date_start }} au {{ tournament.date_end }} à : {{ tournament.place }}, \`a photographier ou \`a filmer
+ l'enfant et \`a diffuser les photos et/ou les vid\'eos r\'ealis\'ees \`a cette occasion sur son site et sur les sites
+ partenaires. D\'eclare c\'eder \`a titre gracieux \`a Animath le droit d’utiliser l'image de l'enfant sur tous ses
+ supports d'information : brochures, sites web, r\'eseaux sociaux. Animath devient, par la pr\'esente, cessionnaire des
+ droits pendant toute la dur\'ee pour laquelle ont \'et\'e acquis les droits d'auteur de ces photographies.\\
  
 \medskip
 Animath s'engage, conform\'ement aux dispositions l\'egales en vigueur relatives au droit \`a l'image, \`a ce que la
@@ -106,14 +100,14 @@ Animath, IHP, 11 rue Pierre et Marie Curie, 75231 Paris cedex 05.\\
  
  \bigskip
 
-Signatures pr\'ec\'ed\'ees de la mention « lu et approuv\'e »
+Signatures pr\'ec\'ed\'ees de la mention \og lu et approuv\'e \fg{}
 
 \medskip
 
 
 \begin{minipage}[c]{0.5\textwidth}
 
-\underline{La/le responsable l\'egal\cdt{}e :}\\
+\underline{Le responsable l\'egal :}\\
 
 Fait \`a  :\\
 le :

registration/templates/registration/tex/Autorisation_parentale.tex

@@ -17,7 +17,6 @@
 
 % Specials
 \newcommand{\writingsep}{\vrule height 4ex width 0pt}
-\newcommand{\cdt}{\kern-0.5pt\ensuremath\cdot\kern-0.5pt}
 
 % Page formating
 \hoffset -1in
@@ -38,7 +37,7 @@
 
 \begin{document}
 
-\includegraphics[height=2cm]{/code/static/tfjm/img/logo_animath.png}\hfill{\fontsize{55pt}{55pt}{$\mathbb{TFJM}^2$}}
+\includegraphics[height=2cm]{/code/static/logo_animath.png}\hfill{\fontsize{55pt}{55pt}{$\mathbb{TFJM}^2$}}
 
 \vfill
 
@@ -46,25 +45,16 @@
 \Large \bf Autorisation parentale pour les mineurs ({{ tournament.name }})
 \end{center}
 
-Je soussigné\cdt{}e \hrulefill,\\
-responsable légal\cdt{}e, demeurant \writingsep\hrulefill\\
+Je soussigné(e) \hrulefill,\\
+responsable légal, demeurant \writingsep\hrulefill\\
 \writingsep\hrulefill,\\
 \writingsep autorise {{ registration|default:"\hrulefill" }},\\
-né\cdt{}e le {{ registration.birth_date|default:"\underline{\phantom{dd/mm/aaaa} }" }},
-à participer au Tournoi Français des Jeunes Mathématiciennes et Mathématiciens ($\mathbb{TFJM}^2$)
-{% if tournament.unified_registration %} dans l'un des tournois d'Île-de-France selon sélection :
-\begin{itemize}
-    \item Île-de-France 1, du 26 au 27 avril 2025 ;
-    \item Île-de-France 2, du 3 au 4 mai 2025 ;
-    \item Île-de-France 3, du 10 au 11 mai 2025. 
-\end{itemize}
-{% else %}
-organisé \`a :
+né(e) le {{ registration.birth_date }},
+à participer au Tournoi Français des Jeunes Mathématiciennes et Mathématiciens ($\mathbb{TFJM}^2$) organisé \`a :
 {{ tournament.place }}, du {{ tournament.date_start }} au {{ tournament.date_end }}.
-{% endif %}
 
 Iel se rendra au lieu indiqu\'e ci-dessus le samedi matin et quittera les lieux l'après-midi du dimanche par
-ses propres moyens et sous la responsabilité du/de la représentant\cdt{}e légal\cdt{}e.
+ses propres moyens et sous la responsabilité du représentant légal.
 
 
 

registration/templates/registration/tex/parental_authorization_eteam.tex

@@ -1,66 +0,0 @@
-\documentclass[a4paper,11pt]{article}
-
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage{lmodern}
-\usepackage[english]{babel}
-
-\usepackage{fancyhdr}
-\usepackage{graphicx}
-\usepackage{amsmath}
-\usepackage{amssymb}
-%\usepackage{anyfontsize}
-\usepackage{fancybox}
-\usepackage{eso-pic,graphicx}
-\usepackage{xcolor}
-
-
-% Specials
-\newcommand{\writingsep}{\vrule height 4ex width 0pt}
-
-% Page formating
-\hoffset -1in
-\voffset -1in
-\textwidth 180 mm
-\textheight 250 mm
-\oddsidemargin 15mm
-\evensidemargin 15mm
-\pagestyle{fancy}
-
-% Headers and footers
-\fancyfoot{}
-\lhead{}
-\rhead{}
-\renewcommand{\headrulewidth}{0pt}
-% \lfoot{\footnotesize Address}
-% \rfoot{\footnotesize todo association}
-
-\begin{document}
-
-\includegraphics[height=2cm]{/code/static/tfjm/img/eteam.png}\hfill{\fontsize{55pt}{55pt}ETEAM Tournament}
-
-\vfill
-
-\begin{center}
-\Large \bf Parental authorisation for minors
-\end{center}
-
-I, \hrulefill,\\
-legal representative, residing at \writingsep\hrulefill\\
-\writingsep\hrulefill,\\
-\writingsep autorise {{ registration|default:"\hrulefill" }},\\
-born on {{ registration.birth_date }},
-to participate in the European Tournament of Enthusiastic Apprentice Mathematicians (ETEAM) organised in:
-{{ tournament.place }}, from {{ tournament.date_start }} to {{ tournament.date_end }}.
-
-The participant will travel to the abovementioned location on Monday morning and will leave the premises on Friday afternoon by independant means and under the responsibility of the legal representative.
-
-
-\vspace{8ex}
-
-Signature:
-
-\vfill
-\vfill
-
-\end{document}

registration/templates/registration/tex/photo_authorization_eteam_adult.tex

@@ -1,112 +0,0 @@
-\documentclass[a4paper,11pt]{article}
-
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage{lmodern}
-\usepackage[english]{babel}
-
-\usepackage{fancyhdr}
-\usepackage{graphicx}
-\usepackage{amsmath}
-\usepackage{amssymb}
-%\usepackage{anyfontsize}
-\usepackage{fancybox}
-\usepackage{eso-pic,graphicx}
-\usepackage{xcolor}
-
-
-% Specials
-\newcommand{\writingsep}{\vrule height 4ex width 0pt}
-
-% Page formating
-\hoffset -1in
-\voffset -1in
-\textwidth 180 mm
-\textheight 250 mm
-\oddsidemargin 15mm
-\evensidemargin 15mm
-\pagestyle{fancy}
-
-% Headers and footers
-\fancyfoot{}
-\lhead{}
-\rhead{}
-\renewcommand{\headrulewidth}{0pt}
-%\lfoot{\footnotesize Address}
-%\rfoot{\footnotesize todo association}
-
-\begin{document}
-
-\includegraphics[height=2cm]{/code/static/tfjm/img/eteam.png}\hfill{\fontsize{55pt}{55pt}{ETEAM Tournament}}
-
-\vfill
-
-\begin{center}
-
-
-\LARGE 
-Video and interview consent and release form
-\end{center}
-\normalsize
-
-
-\thispagestyle{empty}
-
-\bigskip
-
-
-
-I, {{ registration|safe|default:"\dotfill" }}\\
-residing at {{ registration.address|safe|default:"\dotfill" }} {{ registration.zip_code|safe|default:"" }} {{ registration.city|safe|default:"" }}
-{{ registration.country|safe|default:"" }},\\
-
-\medskip
-Tick the appropriate box(es).\\
-
-\medskip
-
-\fbox{\textcolor{white}{A}}  Authorise the ETEAM organizers, for the ETEAM tournament from {{ tournament.date_start }} to {{ tournament.date_end }} in: {{ tournament.place }}, to photograph or film me and to distribute the photos and/or videos taken on this occasion on its website and on partner websites. I hereby grant ETEAM the right to use my image free of charge on all its information media: brochures, websites, social networks. ETEAM hereby becomes the assignee of the rights for these photographs. There is no time limit on the validity of this release nor are there any geographic limitations on where these materials may be distributed.\\
-
-\medskip
-ETEAM commits itself, in accordance with the legal regulations in force relating to image rights, to ensuring that the publication and distribution of the image as well as the accompanying comments do not infringe on the private life, dignity and reputation of the person photographed.\\
-
-\medskip
- \fbox{\textcolor{white}{A}}  Authorise the broadcasting in the media (Press, Television, Internet) of photographs taken during any media coverage of this event.\\
- \medskip
- 
-\medskip
- \fbox{\textcolor{white}{A}} By signing this form, I acknowledge that I have completely read and fully understand the above consent and release and agree to be bound thereby. I hereby release any and all claims against any person or organisation utilising this material for marketing, educational, promotional, and/or any other lawful purpose whatsoever.\\
- 
- \medskip
- \fbox{\textcolor{white}{A}} I agree to be kept informed of other activities organised by ETEAM and its partners.\\
-\bigskip
-
-Signature preceded by the words "read and approved"
-\medskip
-
-
-\begin{minipage}[c]{0.5\textwidth}
-
-\underline{Legal representative:}\\
-
-\end{minipage}
-\begin{minipage}[c]{0.5\textwidth}
-
-\underline{The participant:}\\
-
-
-\end{minipage}
-
-
-\vfill
-\vfill
-\begin{minipage}[c]{0.5\textwidth}
-% \footnotesize Address
-\end{minipage}
-\begin{minipage}[c]{0.5\textwidth}
-\footnotesize
-% \begin{flushright}
-% todo association
-% \end{flushright}
-\end{minipage}
-\end{document}

registration/templates/registration/tex/photo_authorization_eteam_child.tex

@@ -1,112 +0,0 @@
-\documentclass[a4paper,11pt]{article}
-
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage{lmodern}
-\usepackage[english]{babel}
-
-\usepackage{fancyhdr}
-\usepackage{graphicx}
-\usepackage{amsmath}
-\usepackage{amssymb}
-%\usepackage{anyfontsize}
-\usepackage{fancybox}
-\usepackage{eso-pic,graphicx}
-\usepackage{xcolor}
-
-
-% Specials
-\newcommand{\writingsep}{\vrule height 4ex width 0pt}
-
-% Page formating
-\hoffset -1in
-\voffset -1in
-\textwidth 180 mm
-\textheight 250 mm
-\oddsidemargin 15mm
-\evensidemargin 15mm
-\pagestyle{fancy}
-
-% Headers and footers
-\fancyfoot{}
-\lhead{}
-\rhead{}
-\renewcommand{\headrulewidth}{0pt}
-%\lfoot{\footnotesize Address}
-%\rfoot{\footnotesize todo association}
-
-\begin{document}
-
-\includegraphics[height=2cm]{/code/static/tfjm/img/eteam.png}\hfill{\fontsize{55pt}{55pt}{ETEAM Tournament}}
-
-\vfill
-
-\begin{center}
-
-
-\LARGE 
-Video and interview consent and release form
-\end{center}
-\normalsize
-
-
-\thispagestyle{empty}
-
-\bigskip
-
-
-
-I, {{ registration|safe|default:"\dotfill" }}\\
-residing at {{ registration.address|safe|default:"\dotfill" }} {{ registration.zip_code|safe|default:"" }} {{ registration.city|safe|default:"" }}
-{{ registration.country|safe|default:"" }},\\
-
-\medskip
-Tick the appropriate box(es).\\
-
-\medskip
-
-\fbox{\textcolor{white}{A}}  Authorise the ETEAM organizers, for the ETEAM tournament from {{ tournament.date_start }} to {{ tournament.date_end }} in: {{ tournament.place }}, to photograph or film me and to distribute the photos and/or videos taken on this occasion on its website and on partner websites. I hereby grant ETEAM the right to use my image free of charge on all its information media: brochures, websites, social networks. ETEAM hereby becomes the assignee of the rights for these photographs. There is no time limit on the validity of this release nor are there any geographic limitations on where these materials may be distributed.\\
-
-\medskip
-ETEAM commits itself, in accordance with the legal regulations in force relating to image rights, to ensuring that the publication and distribution of the image as well as the accompanying comments do not infringe on the private life, dignity and reputation of the person photographed.\\
-
-\medskip
- \fbox{\textcolor{white}{A}}  Authorise the broadcasting in the media (Press, Television, Internet) of photographs taken during any media coverage of this event.\\
- \medskip
- 
-\medskip
- \fbox{\textcolor{white}{A}} By signing this form, I acknowledge that I have completely read and fully understand the above consent and release and agree to be bound thereby. I hereby release any and all claims against any person or organisation utilising this material for marketing, educational, promotional, and/or any other lawful purpose whatsoever.\\
- 
- \medskip
- \fbox{\textcolor{white}{A}} I agree to be kept informed of other activities organised by ETEAM and its partners.\\
-\bigskip
-
-Signature preceded by the words "read and approved"
-\medskip
-
-
-\begin{minipage}[c]{0.5\textwidth}
-
-\underline{Legal representative:}\\
-
-\end{minipage}
-\begin{minipage}[c]{0.5\textwidth}
-
-\underline{The participant:}\\
-
-
-\end{minipage}
-
-
-\vfill
-\vfill
-\begin{minipage}[c]{0.5\textwidth}
-% \footnotesize Address
-\end{minipage}
-\begin{minipage}[c]{0.5\textwidth}
-\footnotesize
-% \begin{flushright}
-% todo association
-% \end{flushright}
-\end{minipage}
-\end{document}

registration/templates/registration/upload_health_sheet.html

@@ -9,7 +9,7 @@
         <div id="form-content">
             <div class="alert alert-info">
                 {% trans "Health sheet template:" %}
-                <a class="alert-link" href="{% static "tfjm/Fiche_sanitaire.pdf" %}">{% trans "Download" %}</a>
+                <a class="alert-link" href="{% static "Fiche_sanitaire.pdf" %}">{% trans "Download" %}</a>
             </div>
             {% csrf_token %}
             {{ form|crispy }}

registration/templates/registration/user_detail.html

@@ -11,18 +11,18 @@
         </div>
     <div class="card-body">
         <dl class="row">
-            <dt class="col-sm-6 text-sm-end">{% trans "Last name:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Last name:" %}</dt>
             <dd class="col-sm-6">{{ user_object.last_name }}</dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "First name:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "First name:" %}</dt>
             <dd class="col-sm-6">{{ user_object.first_name }}</dd>
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Email:" %}</dt>
+            <dt class="col-sm-6 text-end">{% trans "Email:" %}</dt>
             <dd class="col-sm-6"><a href="mailto:{{ user_object.email }}">{{ user_object.email }}</a>
                 {% if not user_object.registration.email_confirmed %} (<em>{% trans "Not confirmed" %}, <a href="{% url "registration:email_validation_resend" pk=user_object.pk %}">{% trans "resend the validation link" %}</a></em>){% endif %}</dd>
 
             {% if user_object == user %}
-                <dt class="col-sm-6 text-sm-end">{% trans "Password:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Password:" %}</dt>
                 <dd class="col-sm-6">
                     <a href="{% url 'password_change' %}" class="btn btn-sm btn-secondary">
                         <i class="fas fa-edit"></i> {% trans "Change password" %}
@@ -31,7 +31,7 @@
             {% endif %}
 
             {% if user_object.registration.participates %}
-                <dt class="col-sm-6 text-sm-end">{% trans "Team:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Team:" %}</dt>
                 {% trans "any" as any %}
                 <dd class="col-sm-6">
                     <a href="{% if user_object.registration.team %}{% url "participation:team_detail" pk=user_object.registration.team.pk %}{% else %}#{% endif %}">
@@ -40,33 +40,30 @@
                 </dd>
 
                 {% if user_object.registration.studentregistration %}
-                    <dt class="col-sm-6 text-sm-end">{% trans "Birth date:" %}</dt>
+                    <dt class="col-sm-6 text-end">{% trans "Birth date:" %}</dt>
                     <dd class="col-sm-6">{{ user_object.registration.birth_date }}</dd>
                 {% endif %}
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Gender:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Gender:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.get_gender_display }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Address:" %}</dt>
-                <dd class="col-sm-6">
-                    {{ user_object.registration.address }},
-                    {{ user_object.registration.zip_code|stringformat:'05d' }} {{ user_object.registration.city }} ({{ user_object.registration.country }})
-                </dd>
+                <dt class="col-sm-6 text-end">{% trans "Address:" %}</dt>
+                <dd class="col-sm-6">{{ user_object.registration.address }}, {{ user_object.registration.zip_code|stringformat:'05d' }} {{ user_object.registration.city }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Phone number:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Phone number:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.phone_number }}</dd>
 
                 {% if user_object.registration.health_issues %}
-                    <dt class="col-sm-6 text-sm-end">{% trans "Health issues:" %}</dt>
+                    <dt class="col-sm-6 text-end">{% trans "Health issues:" %}</dt>
                     <dd class="col-sm-6">{{ user_object.registration.health_issues }}</dd>
                 {% endif %}
 
                 {% if user_object.registration.housing_constraints %}
-                    <dt class="col-sm-6 text-sm-end">{% trans "Housing constraints:" %}</dt>
+                    <dt class="col-sm-6 text-end">{% trans "Housing constraints:" %}</dt>
                     <dd class="col-sm-6">{{ user_object.registration.housing_constraints }}</dd>
                 {% endif %}
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Photo authorization:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Photo authorization:" %}</dt>
                 <dd class="col-sm-6">
                     {% if user_object.registration.photo_authorization %}
                         <a href="{{ user_object.registration.photo_authorization.url }}">{% trans "Download" %}</a>
@@ -77,7 +74,7 @@
                 </dd>
 
                 {% if user_object.registration.team.participation.final %}
-                    <dt class="col-sm-6 text-sm-end">{% trans "Photo authorization (final):" %}</dt>
+                    <dt class="col-sm-6 text-end">{% trans "Photo authorization (final):" %}</dt>
                     <dd class="col-sm-6">
                         {% if user_object.registration.photo_authorization_final %}
                             <a href="{{ user_object.registration.photo_authorization_final.url }}">{% trans "Download" %}</a>
@@ -89,31 +86,27 @@
 
             {% if user_object.registration.studentregistration %}
                 {% if user_object.registration.under_18 and user_object.registration.team.participation.tournament and not user_object.registration.team.participation.tournament.remote %}
-                    {% if TFJM.HEALTH_SHEET_REQUIRED %}
-                        <dt class="col-sm-6 text-sm-end">{% trans "Health sheet:" %}</dt>
-                        <dd class="col-sm-6">
-                            {% if user_object.registration.health_sheet %}
-                                <a href="{{ user_object.registration.health_sheet.url }}">{% trans "Download" %}</a>
-                            {% endif %}
-                            {% if user_object.registration.team and not user_object.registration.team.participation.valid %}
-                                <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadHealthSheetModal">{% trans "Replace" %}</button>
-                            {% endif %}
-                        </dd>
-                    {% endif %}
+                    <dt class="col-sm-6 text-end">{% trans "Health sheet:" %}</dt>
+                    <dd class="col-sm-6">
+                        {% if user_object.registration.health_sheet %}
+                            <a href="{{ user_object.registration.health_sheet.url }}">{% trans "Download" %}</a>
+                        {% endif %}
+                        {% if user_object.registration.team and not user_object.registration.team.participation.valid %}
+                            <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadHealthSheetModal">{% trans "Replace" %}</button>
+                        {% endif %}
+                    </dd>
 
-                    {% if TFJM.VACCINE_SHEET_REQUIRED %}
-                        <dt class="col-sm-6 text-sm-end">{% trans "Vaccine sheet:" %}</dt>
-                        <dd class="col-sm-6">
-                            {% if user_object.registration.vaccine_sheet %}
-                                <a href="{{ user_object.registration.vaccine_sheet.url }}">{% trans "Download" %}</a>
-                            {% endif %}
-                            {% if user_object.registration.team and not user_object.registration.team.participation.valid %}
-                                <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadVaccineSheetModal">{% trans "Replace" %}</button>
-                            {% endif %}
-                        </dd>
-                    {% endif %}
+                    <dt class="col-sm-6 text-end">{% trans "Vaccine sheet:" %}</dt>
+                    <dd class="col-sm-6">
+                        {% if user_object.registration.vaccine_sheet %}
+                            <a href="{{ user_object.registration.vaccine_sheet.url }}">{% trans "Download" %}</a>
+                        {% endif %}
+                        {% if user_object.registration.team and not user_object.registration.team.participation.valid %}
+                            <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadVaccineSheetModal">{% trans "Replace" %}</button>
+                        {% endif %}
+                    </dd>
 
-                    <dt class="col-sm-6 text-sm-end">{% trans "Parental authorization:" %}</dt>
+                    <dt class="col-sm-6 text-end">{% trans "Parental authorization:" %}</dt>
                     <dd class="col-sm-6">
                         {% if user_object.registration.parental_authorization %}
                             <a href="{{ user_object.registration.parental_authorization.url }}">{% trans "Download" %}</a>
@@ -124,7 +117,7 @@
                     </dd>
 
                     {% if user_object.registration.team.participation.final %}
-                        <dt class="col-sm-6 text-sm-end">{% trans "Parental authorization (final):" %}</dt>
+                        <dt class="col-sm-6 text-end">{% trans "Parental authorization (final):" %}</dt>
                         <dd class="col-sm-6">
                             {% if user_object.registration.parental_authorization_final %}
                                 <a href="{{ user_object.registration.parental_authorization_final.url }}">{% trans "Download" %}</a>
@@ -134,48 +127,46 @@
                     {% endif %}
                 {% endif %}
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Student class:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Student class:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.get_student_class_display }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "School:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "School:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.school }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Responsible name:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Responsible name:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.responsible_name }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Responsible phone number:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Responsible phone number:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.responsible_phone }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Responsible email address:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Responsible email address:" %}</dt>
                 {% with user_object.registration.responsible_email as email %}
                     <dd class="col-sm-6"><a href="mailto:{{ email }}">{{ email }}</a></dd>
                 {% endwith %}
             {% elif user_object.registration.coachregistration %}
-                <dt class="col-sm-6 text-sm-end">{% trans "Most recent degree:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Most recent degree:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.last_degree }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Professional activity:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Professional activity:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.professional_activity }}</dd>
 
             {% elif user_object.registration.is_volunteer %}
-                <dt class="col-sm-6 text-sm-end">{% trans "Professional activity:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Professional activity:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.professional_activity }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Admin:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Admin:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.is_admin|yesno }}</dd>
             {% endif %}
 
-            {% if TFJM.SUGGEST_ANIMATH %}
-                <dt class="col-sm-6 text-sm-end">{% trans "Grant Animath to contact me in the future about other actions:" %}</dt>
-                <dd class="col-sm-6">{{ user_object.registration.give_contact_to_animath|yesno }}</dd>
-            {% endif %}
+            <dt class="col-sm-6 text-end">{% trans "Grant Animath to contact me in the future about other actions:" %}</dt>
+            <dd class="col-sm-6">{{ user_object.registration.give_contact_to_animath|yesno }}</dd>
         </dl>
 
-        {% if TFJM.PAYMENT_MANAGEMENT and user_object.registration.participates and user_object.registration.team.participation.valid %}
+        {% if user_object.registration.participates and user_object.registration.team.participation.valid %}
             <hr>
             {% for payment in user_object.registration.payments.all %}
                 <dl class="row">
-                    <dt class="col-sm-6 text-sm-end">
+                    <dt class="col-sm-6 text-end">
                         {% if payment.final %}
                             {% trans "Payment information (final):" %}
                         {% else %}
@@ -232,19 +223,15 @@
         {% include "base_modal.html" with modal_id="uploadPhotoAuthorization" modal_enctype="multipart/form-data" %}
 
         {% if user_object.registration.under_18 %}
-            {% if TFJM.HEALTH_SHEET_REQUIRED %}
-                {% trans "Upload health sheet" as modal_title %}
-                {% trans "Upload" as modal_button %}
-                {% url "registration:upload_user_health_sheet" pk=user_object.registration.pk as modal_action %}
-                {% include "base_modal.html" with modal_id="uploadHealthSheet" modal_enctype="multipart/form-data" %}
-            {% endif %}
+            {% trans "Upload health sheet" as modal_title %}
+            {% trans "Upload" as modal_button %}
+            {% url "registration:upload_user_health_sheet" pk=user_object.registration.pk as modal_action %}
+            {% include "base_modal.html" with modal_id="uploadHealthSheet" modal_enctype="multipart/form-data" %}
 
-            {% if TFJM.VACCINE_SHEET_REQUIRED %}
-                {% trans "Upload vaccine sheet" as modal_title %}
-                {% trans "Upload" as modal_button %}
-                {% url "registration:upload_user_vaccine_sheet" pk=user_object.registration.pk as modal_action %}
-                {% include "base_modal.html" with modal_id="uploadVaccineSheet" modal_enctype="multipart/form-data" %}
-            {% endif %}
+            {% trans "Upload vaccine sheet" as modal_title %}
+            {% trans "Upload" as modal_button %}
+            {% url "registration:upload_user_vaccine_sheet" pk=user_object.registration.pk as modal_action %}
+            {% include "base_modal.html" with modal_id="uploadVaccineSheet" modal_enctype="multipart/form-data" %}
 
             {% trans "Upload parental authorization" as modal_title %}
             {% trans "Upload" as modal_button %}

registration/tests.py

@@ -1,17 +1,14 @@
 # Copyright (C) 2020 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from datetime import timedelta
 import os
 
-from django.conf import settings
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.sites.models import Site
 from django.core.files.uploadedfile import SimpleUploadedFile
-from django.test import override_settings, TestCase
+from django.test import TestCase
 from django.urls import reverse
-from django.utils import timezone
 from django.utils.encoding import force_bytes
 from django.utils.http import urlsafe_base64_encode
 from participation.models import Team
@@ -117,9 +114,6 @@ class TestRegistration(TestCase):
         self.assertRedirects(response, "http://" + Site.objects.get().domain +
                              str(self.coach.registration.get_absolute_url()), 302, 200)
 
-    # Ensure that we are between registration dates
-    @override_settings(REGISTRATION_DATES={'open': timezone.now() - timedelta(days=1),
-                                           'close': timezone.now() + timedelta(days=1)})
     def test_registration(self):
         """
         Ensure that the signup form is working successfully.
@@ -152,7 +146,6 @@ class TestRegistration(TestCase):
             address="1 Rue de Rivoli",
             zip_code=75001,
             city="Paris",
-            country="France",
             phone_number="0123456789",
             responsible_name="Toto",
             responsible_phone="0123456789",
@@ -201,7 +194,6 @@ class TestRegistration(TestCase):
             address="1 Rue de Rivoli",
             zip_code=75001,
             city="Paris",
-            country="France",
             phone_number="0123456789",
             professional_activity="God",
             last_degree="Master",
@@ -229,52 +221,6 @@ class TestRegistration(TestCase):
         response = self.client.get(reverse("registration:email_validation_resend", args=(user.pk,)))
         self.assertRedirects(response, reverse("registration:email_validation_sent"), 302, 200)
 
-    def test_registration_dates(self):
-        """
-        Test that registrations are working only between registration dates.
-        """
-        self.client.logout()
-
-        # Test that registration between open and close dates are working
-        with override_settings(REGISTRATION_DATES={'open': timezone.now() - timedelta(days=2),
-                                                   'close': timezone.now() + timedelta(days=2)}):
-            response = self.client.get(reverse("registration:signup"))
-            self.assertEqual(response.status_code, 200)
-            self.assertIn("<i class=\"fas fa-user-plus\"></i> Register", response.content.decode())
-            self.assertNotIn("registrations are not opened", response.content.decode())
-            self.assertNotIn("Registrations are closed", response.content.decode())
-
-            response = self.client.post(reverse("registration:signup"))
-            self.assertFormError(response.context['form'], None, [])
-
-        # Test that registration before open date is not working
-        with override_settings(REGISTRATION_DATES={'open': timezone.now() + timedelta(days=1),
-                                                   'close': timezone.now() + timedelta(days=2)}):
-            response = self.client.get(reverse("registration:signup"))
-            self.assertEqual(response.status_code, 200)
-            self.assertNotIn("<i class=\"fas fa-user-plus\"></i> Register", response.content.decode())
-            self.assertIn("registrations are not opened", response.content.decode())
-
-            response = self.client.post(reverse("registration:signup"))
-            self.assertEqual(response.status_code, 200)
-            self.assertFormError(response.context['form'], None,
-                                 "Registrations are not opened yet. They will open on the "
-                                 f"{settings.REGISTRATION_DATES['open']:%Y-%m-%d %H:%M}.")
-
-        # Test that registration after close date is not working
-        with override_settings(REGISTRATION_DATES={'open': timezone.now() - timedelta(days=2),
-                                                   'close': timezone.now() - timedelta(days=1)}):
-            response = self.client.get(reverse("registration:signup"))
-            self.assertEqual(response.status_code, 200)
-            self.assertNotIn("<i class=\"fas fa-user-plus\"></i> Register", response.content.decode())
-            self.assertIn("Registrations are closed", response.content.decode())
-
-            response = self.client.post(reverse("registration:signup"))
-            self.assertEqual(response.status_code, 200)
-            self.assertFormError(response.context['form'], None,
-                                 "Registrations for this year are closed since "
-                                 f"{settings.REGISTRATION_DATES['close']:%Y-%m-%d %H:%M}.")
-
     def test_login(self):
         """
         With a registered user, try to log in
@@ -328,13 +274,11 @@ class TestRegistration(TestCase):
         for user, data in [(self.user, dict(professional_activity="Bot", admin=True)),
                            (self.student, dict(student_class=11, school="Sky", birth_date="2001-01-01",
                                                gender="female", address="1 Rue de Rivoli", zip_code=75001,
-                                               city="Paris", country="France",
-                                               responsible_name="Toto",
+                                               city="Paris", responsible_name="Toto",
                                                responsible_phone="0123456789",
                                                responsible_email="toto@example.com")),
                            (self.coach, dict(professional_activity="God", last_degree="Médaille Fields", gender="male",
-                                             address="1 Rue de Rivoli", zip_code=75001,
-                                             city="Paris", country="France"))]:
+                                             address="1 Rue de Rivoli", zip_code=75001, city="Paris"))]:
             response = self.client.get(reverse("registration:update_user", args=(user.pk,)))
             self.assertEqual(response.status_code, 200)
 
@@ -389,7 +333,7 @@ class TestRegistration(TestCase):
 
             response = self.client.post(reverse(f"registration:upload_user_{auth_type}",
                                                 args=(self.student.registration.pk,)), data={
-                auth_type: open("tfjm/static/tfjm/Fiche_sanitaire.pdf", "rb"),
+                auth_type: open("tfjm/static/Fiche_sanitaire.pdf", "rb"),
             })
             self.assertRedirects(response, reverse("registration:user_detail", args=(self.student.pk,)), 302, 200)
 
@@ -412,7 +356,7 @@ class TestRegistration(TestCase):
         old_authoratization = self.student.registration.photo_authorization.path
         response = self.client.post(reverse("registration:upload_user_photo_authorization",
                                             args=(self.student.registration.pk,)), data=dict(
-            photo_authorization=open("tfjm/static/tfjm/Fiche_sanitaire.pdf", "rb"),
+            photo_authorization=open("tfjm/static/Fiche_sanitaire.pdf", "rb"),
         ))
         self.assertRedirects(response, reverse("registration:user_detail", args=(self.student.pk,)), 302, 200)
         self.assertFalse(os.path.isfile(old_authoratization))

registration/views.py

@@ -18,7 +18,7 @@ from django.http import FileResponse, Http404
 from django.shortcuts import redirect, resolve_url
 from django.template.loader import render_to_string
 from django.urls import reverse_lazy
-from django.utils import translation
+from django.utils import timezone, translation
 from django.utils.crypto import get_random_string
 from django.utils.http import urlsafe_base64_decode
 from django.utils.text import format_lazy
@@ -26,7 +26,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, DetailView, RedirectView, TemplateView, UpdateView, View
 from django_tables2 import SingleTableView
 from magic import Magic
-from participation.models import Passage, Solution, Tournament, WrittenReview
+from participation.models import Passage, Solution, Synthesis, Tournament
 from tfjm.tokens import email_validation_token
 from tfjm.views import UserMixin, UserRegistrationMixin, VolunteerMixin
 
@@ -121,7 +121,7 @@ class AddOrganizerView(VolunteerMixin, CreateView):
         form.instance.set_password(password)
         form.instance.save()
 
-        subject = f"[{settings.APP_NAME}] " + str(_("New organizer account"))
+        subject = "[TFJM²] " + str(_("New TFJM² organizer account"))
         site = Site.objects.first()
         message = render_to_string('registration/mails/add_organizer.txt', dict(user=registration.user,
                                                                                 inviter=self.request.user,
@@ -436,19 +436,13 @@ class AuthorizationTemplateView(TemplateView):
             if not Tournament.objects.filter(name__iexact=self.request.GET.get("tournament_name")).exists():
                 raise PermissionDenied("Ce tournoi n'existe pas.")
             context["tournament"] = Tournament.objects.get(name__iexact=self.request.GET.get("tournament_name"))
-        elif settings.SINGLE_TOURNAMENT:
-            # One single tournament (for ETEAM)
-            context["tournament"] = Tournament.objects.first()
         else:
             raise PermissionDenied("Merci d'indiquer un tournoi.")
 
         return context
 
     def render_to_response(self, context, **response_kwargs):
-        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
-
-        template_name = self.get_template_names()[0]
-        tex = render_to_string(template_name, context=context, request=self.request)
+        tex = render_to_string(self.template_name, context=context, request=self.request)
         temp_dir = mkdtemp()
         with open(os.path.join(temp_dir, "texput.tex"), "w") as f:
             f.write(tex)
@@ -457,34 +451,20 @@ class AuthorizationTemplateView(TemplateView):
         process.wait()
         return FileResponse(open(os.path.join(temp_dir, "texput.pdf"), "rb"),
                             content_type="application/pdf",
-                            filename=template_name.split("/")[-1][:-3] + "pdf")
+                            filename=self.template_name.split("/")[-1][:-3] + "pdf")
 
 
 class AdultPhotoAuthorizationTemplateView(AuthorizationTemplateView):
-    def get_template_names(self):
-        if settings.TFJM_APP == "TFJM":
-            return ["registration/tex/Autorisation_droit_image_majeur.tex"]
-        elif settings.TFJM_APP == "ETEAM":
-            return ["registration/tex/photo_authorization_eteam_adult.tex"]
+    template_name = "registration/tex/Autorisation_droit_image_majeur.tex"
 
 
 class ChildPhotoAuthorizationTemplateView(AuthorizationTemplateView):
-    def get_template_names(self):
-        if settings.TFJM_APP == "TFJM":
-            return ["registration/tex/Autorisation_droit_image_mineur.tex"]
-        elif settings.TFJM_APP == "ETEAM":
-            return ["registration/tex/photo_authorization_eteam_child.tex"]
+    template_name = "registration/tex/Autorisation_droit_image_mineur.tex"
 
 
 class ParentalAuthorizationTemplateView(AuthorizationTemplateView):
     template_name = "registration/tex/Autorisation_parentale.tex"
 
-    def get_template_names(self):
-        if settings.TFJM_APP == "TFJM":
-            return ["registration/tex/Autorisation_parentale.tex"]
-        elif settings.TFJM_APP == "ETEAM":
-            return ["registration/tex/parental_authorization_eteam.tex"]
-
 
 class InstructionsTemplateView(AuthorizationTemplateView):
     template_name = "registration/tex/Instructions.tex"
@@ -836,12 +816,11 @@ class SolutionView(LoginRequiredMixin, View):
             raise Http404
         solution = Solution.objects.get(file__endswith=filename)
         user = request.user
-        if user.registration.participates and user.registration.team.participation:
-            passage_participant_qs = Passage.objects.filter(Q(reporter=user.registration.team.participation)
+        if user.registration.participates:
+            passage_participant_qs = Passage.objects.filter(Q(defender=user.registration.team.participation)
                                                             | Q(opponent=user.registration.team.participation)
-                                                            | Q(reviewer=user.registration.team.participation)
-                                                            | Q(observer=user.registration.team.participation),
-                                                            reporter=solution.participation,
+                                                            | Q(reporter=user.registration.team.participation),
+                                                            defender=solution.participation,
                                                             solution_number=solution.problem)
         else:
             passage_participant_qs = Passage.objects.none()
@@ -853,13 +832,12 @@ class SolutionView(LoginRequiredMixin, View):
                 or user.registration.is_volunteer
                 and Passage.objects.filter(Q(pool__juries=user.registration)
                                            | Q(pool__tournament__in=user.registration.organized_tournaments.all()),
-                                           reporter=solution.participation,
+                                           defender=solution.participation,
                                            solution_number=solution.problem).exists()
                 or user.registration.participates and user.registration.team
                 and (solution.participation.team == user.registration.team or
                      any(passage.pool.round == 1
-                         or (passage.pool.round == 2 and passage.pool.tournament.solutions_available_second_phase)
-                         or (passage.pool.round == 3 and passage.pool.tournament.solutions_available_third_phase)
+                         or timezone.now() >= passage.pool.tournament.solutions_available_second_phase
                          for passage in passage_participant_qs.all()))):
             raise PermissionDenied
         # Guess mime type of the file
@@ -871,30 +849,30 @@ class SolutionView(LoginRequiredMixin, View):
         return FileResponse(open(path, "rb"), content_type=mime_type, filename=true_file_name)
 
 
-class WrittenReviewView(LoginRequiredMixin, View):
+class SynthesisView(LoginRequiredMixin, View):
     """
-    Display the sent written reviews.
+    Display the sent synthesis.
     """
 
     def get(self, request, *args, **kwargs):
         filename = kwargs["filename"]
-        path = f"media/reviews/{filename}"
+        path = f"media/syntheses/{filename}"
         if not os.path.exists(path):
             raise Http404
-        review = WrittenReview.objects.get(file__endswith=filename)
+        synthesis = Synthesis.objects.get(file__endswith=filename)
         user = request.user
         if not (user.registration.is_admin or user.registration.is_volunteer
-                and (user.registration in review.passage.pool.juries.all()
-                     or user.registration in review.passage.pool.tournament.organizers.all()
-                     or user.registration.pools_presided.filter(tournament=review.passage.pool.tournament).exists())
-                or user.registration.participates and user.registration.team == review.participation.team):
+                and (user.registration in synthesis.passage.pool.juries.all()
+                     or user.registration in synthesis.passage.pool.tournament.organizers.all()
+                     or user.registration.pools_presided.filter(tournament=synthesis.passage.pool.tournament).exists())
+                or user.registration.participates and user.registration.team == synthesis.participation.team):
             raise PermissionDenied
         # Guess mime type of the file
         mime = Magic(mime=True)
         mime_type = mime.from_file(path)
         ext = mime_type.split("/")[1].replace("jpeg", "jpg")
         # Replace file name
-        true_file_name = str(review) + f".{ext}"
+        true_file_name = str(synthesis) + f".{ext}"
         return FileResponse(open(path, "rb"), content_type=mime_type, filename=true_file_name)
 
 

requirements.txt

@@ -1,29 +1,28 @@
-channels[daphne]~=4.1.0
+channels[daphne]~=4.0.0
 channels-redis~=4.2.0
-crispy-bootstrap5~=2024.10
-Django>=5.1.2,<6.0
-django-crispy-forms~=2.3
+crispy-bootstrap5~=2023.10
+Django>=5.0.3,<6.0
+django-crispy-forms~=2.1
 django-extensions~=3.2.3
-django-filter~=24.3
-django-haystack~=3.3.0
-django-mailer~=2.3.2
-django-phonenumber-field~=8.0.0
-django-pipeline~=3.1.0
+django-filter~=23.5
+elasticsearch~=7.17.9
+git+https://github.com/django-haystack/django-haystack.git#v3.3b1
+django-mailer~=2.3.1
+django-phonenumber-field~=7.3.0
 django-polymorphic~=3.1.0
 django-tables2~=2.7.0
-djangorestframework~=3.15.2
+djangorestframework~=3.14.0
 django-rest-polymorphic~=0.1.10
-elasticsearch~=7.17.9
-gspread~=6.1.4
-gunicorn~=23.0.0
+gspread~=6.1.0
+gunicorn~=21.2.0
 odfpy~=1.4.1
-pandas~=2.2.3
-phonenumbers~=8.13.47
-psycopg~=3.2.3
-pypdf~=5.0.1
-ipython~=8.28.0
+pandas~=2.2.1
+phonenumbers~=8.13.27
+psycopg2-binary~=2.9.9
+pypdf~=3.17.4
+ipython~=8.20.0
 python-magic~=0.4.27
-requests~=2.32.3
+requests~=2.31.0
 sympasoap~=1.1
-uvicorn~=0.32.0
-websockets~=13.1
+uvicorn~=0.25.0
+websockets~=12.0

tfjm.cron

@@ -8,7 +8,7 @@
 */2     *       *       *       *       cd /code && python manage.py update_index &> /dev/null
 
 # Recreate sympa lists
-7       3       *       *      *        cd /code && python manage.py fix_sympa_lists &> /dev/null
+*/2     *       *       *       *       cd /code && python manage.py fix_sympa_lists &> /dev/null
 
 # Check payments from Hello Asso
 */6     *       *       *       *       cd /code && python manage.py check_hello_asso &> /dev/null

tfjm/context_processors.py

@@ -1,30 +0,0 @@
-# Copyright (C) 2024 by Animath
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.conf import settings
-from participation.models import Tournament
-
-
-def tfjm_context(request):
-    return {
-        'TFJM': {
-            'APP': settings.TFJM_APP,
-            'APP_NAME': settings.APP_NAME,
-            'HAS_OBSERVER': settings.HAS_OBSERVER,
-            'HAS_FINAL': settings.HAS_FINAL,
-            'HOME_PAGE_LINK': settings.HOME_PAGE_LINK,
-            'LOGO_PATH': "tfjm/img/" + settings.LOGO_FILE,
-            'NB_ROUNDS': settings.NB_ROUNDS,
-            'ML_MANAGEMENT': settings.ML_MANAGEMENT,
-            'PAYMENT_MANAGEMENT': settings.PAYMENT_MANAGEMENT,
-            'RECOMMENDED_SOLUTIONS_COUNT': settings.RECOMMENDED_SOLUTIONS_COUNT,
-            'REGISTRATION_DATES': settings.REGISTRATION_DATES,
-            'SINGLE_TOURNAMENT': settings.SINGLE_TOURNAMENT,
-            'HEALTH_SHEET_REQUIRED': settings.HEALTH_SHEET_REQUIRED,
-            'VACCINE_SHEET_REQUIRED': settings.VACCINE_SHEET_REQUIRED,
-            'MOTIVATION_LETTER_REQUIRED': settings.MOTIVATION_LETTER_REQUIRED,
-            'SUGGEST_ANIMATH': settings.SUGGEST_ANIMATH,
-        },
-        'TFJM_TOURNAMENT':
-            Tournament.objects.first() if Tournament.objects.exists() and settings.SINGLE_TOURNAMENT else None,
-    }

tfjm/settings.py

@@ -7,13 +7,12 @@ Django settings for tfjm project.
 Generated by 'django-admin startproject' using Django 3.0.5.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/5.0/topics/settings/
+https://docs.djangoproject.com/en/3.0/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/5.0/ref/settings/
+https://docs.djangoproject.com/en/3.0/ref/settings/
 """
 
-from datetime import datetime
 import os
 import sys
 
@@ -26,7 +25,7 @@ PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 ADMINS = [("Emmy D'Anello", "emmy.danello@animath.fr")]
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/5.0/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/3.0/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS')
@@ -64,7 +63,6 @@ INSTALLED_APPS = [
     'haystack',
     'logs',
     'phonenumber_field',
-    'pipeline',
     'polymorphic',
     'rest_framework',
     'rest_framework.authtoken',
@@ -97,8 +95,6 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.contrib.sites.middleware.CurrentSiteMiddleware',
-    'django.middleware.gzip.GZipMiddleware',
-    'pipeline.middleware.MinifyHTMLMiddleware',
     'tfjm.middlewares.SessionMiddleware',
     'tfjm.middlewares.FetchMiddleware',
 ]
@@ -106,7 +102,6 @@ MIDDLEWARE = [
 ROOT_URLCONF = 'tfjm.urls'
 
 LOGIN_REDIRECT_URL = "index"
-LOGOUT_REDIRECT_URL = "login"
 
 TEMPLATES = [
     {
@@ -119,7 +114,6 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
-                'tfjm.context_processors.tfjm_context',
             ],
         },
     },
@@ -131,7 +125,7 @@ ASGI_APPLICATION = 'tfjm.asgi.application'
 WSGI_APPLICATION = 'tfjm.wsgi.application'
 
 # Password validation
-# https://docs.djangoproject.com/en/5.0/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/3.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -166,7 +160,7 @@ REST_FRAMEWORK = {
 }
 
 # Internationalization
-# https://docs.djangoproject.com/en/5.0/topics/i18n/
+# https://docs.djangoproject.com/en/3.0/topics/i18n/
 
 LANGUAGE_CODE = 'en'
 
@@ -186,7 +180,7 @@ USE_TZ = True
 LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")]
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/5.0/howto/static-files/
+# https://docs.djangoproject.com/en/3.0/howto/static-files/
 
 STATIC_URL = '/static/'
 
@@ -196,52 +190,6 @@ STATICFILES_DIRS = [
 
 STATIC_ROOT = os.path.join(BASE_DIR, "static")
 
-STORAGES = {
-    "default": {
-        "BACKEND": "django.core.files.storage.FileSystemStorage",
-    },
-    'staticfiles': {
-        'BACKEND': 'pipeline.storage.PipelineStorage',
-    },
-}
-
-STATICFILES_FINDERS = (
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
-    'pipeline.finders.PipelineFinder',
-)
-
-PIPELINE = {
-    'DISABLE_WRAPPER': True,
-    'JAVASCRIPT': {
-        'main': {
-            'source_filenames': (
-              'tfjm/js/main.js',
-              'tfjm/js/theme.js',
-            ),
-            'output_filename': 'tfjm/js/main.min.js',
-        },
-        'theme': {
-            'source_filenames': (
-              'tfjm/js/theme.js',
-            ),
-            'output_filename': 'tfjm/js/theme.min.js',
-        },
-        'chat': {
-            'source_filenames': (
-              'tfjm/js/chat.js',
-            ),
-            'output_filename': 'tfjm/js/chat.min.js',
-        },
-        'draw': {
-            'source_filenames': (
-              'tfjm/js/draw.js',
-            ),
-            'output_filename': 'tfjm/js/draw.min.js',
-        },
-    },
-}
-
 MEDIA_URL = '/media/'
 
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
@@ -270,7 +218,7 @@ _db_type = os.getenv('DJANGO_DB_TYPE', 'sqlite').lower()
 if _db_type == 'mysql' or _db_type.startswith('postgres') or _db_type == 'psql':  # pragma: no cover
     DATABASES = {
         'default': {
-            'ENGINE': 'django.db.backends.mysql' if _db_type == 'mysql' else 'django.db.backends.postgresql',
+            'ENGINE': 'django.db.backends.mysql' if _db_type == 'mysql' else 'django.db.backends.postgresql_psycopg2',
             'NAME': os.environ.get('DJANGO_DB_NAME', 'tfjm'),
             'USER': os.environ.get('DJANGO_DB_USER', 'tfjm'),
             'PASSWORD': os.environ.get('DJANGO_DB_PASSWORD', 'CHANGE_ME_IN_ENV_SETTINGS'),
@@ -290,12 +238,6 @@ else:
         }
     }
 
-CHANNEL_LAYERS = {
-    "default": {
-        "BACKEND": "channels.layers.InMemoryChannelLayer"
-    }
-}
-
 # Custom phone number format
 PHONENUMBER_DB_FORMAT = 'NATIONAL'
 PHONENUMBER_DEFAULT_REGION = 'FR'
@@ -323,6 +265,16 @@ GOOGLE_SERVICE_CLIENT = {
 NOTES_DRIVE_FOLDER_ID = os.getenv("NOTES_DRIVE_FOLDER_ID", "CHANGE_ME_IN_ENV_SETTINGS")
 
 # Custom parameters
+PROBLEMS = [
+    "Triominos",
+    "Rassemblements mathématiques",
+    "Tournoi de ping-pong",
+    "Dépollution de la Seine",
+    "Électron libre",
+    "Pièces truquées",
+    "Drôles de cookies",
+    "Création d'un jeu",
+]
 FORBIDDEN_TRIGRAMS = [
     "BIT",
     "CNO",
@@ -341,7 +293,11 @@ FORBIDDEN_TRIGRAMS = [
     "SEX",
 ]
 
-TFJM_APP = os.getenv("TFJM_APP", "TFJM")  # Change to ETEAM for the ETEAM tournament
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": "channels.layers.InMemoryChannelLayer"
+    }
+}
 
 if TFJM_STAGE == "prod":  # pragma: no cover
     from .settings_prod import *  # noqa: F401,F403
@@ -352,78 +308,3 @@ try:
     from .settings_local import *  # noqa: F401,F403
 except ImportError:
     pass
-
-if TFJM_APP == "TFJM":
-    PREFERRED_LANGUAGE_CODE = 'fr'
-    APP_NAME = "TFJM²"
-    TEAM_CODE_LENGTH = 3
-    RECOMMENDED_SOLUTIONS_COUNT = 5
-    NB_ROUNDS = 2
-    HAS_OBSERVER = False
-    HAS_FINAL = True
-    ML_MANAGEMENT = True
-    PAYMENT_MANAGEMENT = True
-    SINGLE_TOURNAMENT = False
-    HEALTH_SHEET_REQUIRED = True
-    VACCINE_SHEET_REQUIRED = True
-    MOTIVATION_LETTER_REQUIRED = True
-    SUGGEST_ANIMATH = True
-    FIRST_EDITION = 2011
-    HOME_PAGE_LINK = "https://tfjm.org/"
-    LOGO_FILE = "tfjm.svg"
-    RULES_LINK = "https://tfjm.org/reglement"
-
-    REGISTRATION_DATES = dict(
-        open=datetime.fromisoformat("2025-01-15T12:00:00+0100"),
-        close=datetime.fromisoformat("2025-03-02T22:00:00+0100"),
-    )
-
-    PROBLEMS = [
-        "Triominos",
-        "Rassemblements mathématiques",
-        "Tournoi de ping-pong",
-        "Dépollution de la Seine",
-        "Électron libre",
-        "Pièces truquées",
-        "Drôles de cookies",
-        "Création d'un jeu",
-    ]
-elif TFJM_APP == "ETEAM":
-    PREFERRED_LANGUAGE_CODE = 'en'
-    APP_NAME = "ETEAM"
-    TEAM_CODE_LENGTH = 4
-    RECOMMENDED_SOLUTIONS_COUNT = 6
-    NB_ROUNDS = 3
-    HAS_OBSERVER = True
-    HAS_FINAL = False
-    ML_MANAGEMENT = False
-    PAYMENT_MANAGEMENT = False
-    SINGLE_TOURNAMENT = True
-    HEALTH_SHEET_REQUIRED = False
-    VACCINE_SHEET_REQUIRED = False
-    MOTIVATION_LETTER_REQUIRED = False
-    SUGGEST_ANIMATH = False
-    FIRST_EDITION = 2024
-    HOME_PAGE_LINK = "https://eteam.tfjm.org/"
-    LOGO_FILE = "eteam.png"
-    RULES_LINK = "https://eteam.tfjm.org/rules/"
-
-    REGISTRATION_DATES = dict(
-        open=datetime.fromisoformat("2024-06-01T12:00:00+0200"),
-        close=datetime.fromisoformat("2024-07-04T20:00:00+0200"),
-    )
-
-    PROBLEMS = [
-        "Exploring Flatland",
-        "A Mazing Hive",
-        "Coin tossing",
-        "The rainbow bridge",
-        "Arithmetic and shopping",
-        "A fence for the goats",
-        "Generalized Tic-Tac-Toe",
-        "Polyhedral construction",
-        "Landing a probe",
-        "Catching the rabbit",
-    ]
-else:
-    raise ValueError(f"Unknown app: {TFJM_APP}")

tfjm/settings_prod.py

@@ -7,9 +7,7 @@ import os
 DEBUG = False
 
 # Mandatory !
-# TODO ETEAM Meilleur support, et meilleurs DNS surtout
-ALLOWED_HOSTS = ['inscription.tfjm.org', 'inscriptions.tfjm.org', 'plateforme.tfjm.org',
-                 'register.eteam.tfjm.org', 'registration.eteam.tfjm.org', 'platform.eteam.tfjm.org']
+ALLOWED_HOSTS = ['inscription.tfjm.org', 'plateforme.tfjm.org']
 
 # Emails
 EMAIL_BACKEND = 'mailer.backend.DbBackend'
@@ -29,7 +27,7 @@ SESSION_COOKIE_SECURE = False
 CSRF_COOKIE_SECURE = False
 CSRF_COOKIE_HTTPONLY = False
 X_FRAME_OPTIONS = 'DENY'
-SESSION_COOKIE_AGE = 60 * 60 * 24 * 7 * 2  # 2 weeks
+SESSION_COOKIE_AGE = 60 * 60 * 3
 
 CHANNEL_LAYERS = {
     "default": {