Translate GDPR warning

This reverts commit 1977ffdbc9.

.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 git  # Useful for django-haystack, remove when the newer versions are in PyPI
+    - apk add --no-cache gettext
     - 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,9 +1,10 @@
-FROM python:3.12-alpine
+FROM python:3.13-alpine
 
 ENV PYTHONUNBUFFERED 1
 ENV DJANGO_ALLOW_ASYNC_UNSAFE 1
 
-RUN apk add --no-cache gettext nginx gcc git libc-dev libffi-dev libxml2-dev libxslt-dev npm postgresql-dev libmagic texlive texmf-dist-fontsrecommended texmf-dist-lang texmf-dist-latexextra
+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 bash
 

docs/dev/transition.rst

@@ -0,0 +1,211 @@
+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,3 +21,4 @@ administrateur⋅rice.
 
    dev/index
    dev/install
+   dev/transition

draw/consumers.py

@@ -122,6 +122,8 @@ 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
@@ -233,8 +235,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': "Le tirage au sort du tournoi de "
+                                             'body': _("The draw of tournament {tournament} started!")
-                                                     f"{self.tournament.name} a commencé !"})
+                                            .format(tournament=self.tournament.name)})
 
     async def draw_start(self, content) -> None:
         """
@@ -403,8 +405,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': 'Votre score de dé est identique à celui de une ou plusieurs équipes. '
+                         'body': _("Your dice score is identical to the one of one or multiple teams. "
-                                 'Veuillez le relancer.'}
+                                   "Please relaunch it.")}
                     )
                 # Alert the tournament
                 await self.channel_layer.group_send(
@@ -448,7 +450,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:
+        if not self.tournament.final and settings.TFJM_APP == "TFJM":
             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()
@@ -502,12 +504,12 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         await self.tournament.draw.current_round.asave()
 
         # Display dice result in the header of the information alert
-        msg = "Les résultats des dés sont les suivants : "
+        trigrams = ", ".join(f"<strong>{td.participation.team.trigram}</strong> ({td.passage_dice})" for td in tds)
-        msg += ", ".join(f"<strong>{td.participation.team.trigram}</strong> ({td.passage_dice})" for td in tds)
+        msg = _("The dice results are the following: {trigrams}. "
-        msg += ". L'ordre de passage et les compositions des différentes poules sont affiché⋅es sur le côté. "
+                "The passage order and the compositions of the different pools are displayed on the side. "
-        msg += "Les ordres de passage pour le premier tour sont déterminés à partir des scores des dés, "
+                "The passage orders for the first round are determined from the dice scores, in increasing order. "
-        msg += "dans l'ordre croissant. Pour le deuxième tour, les ordres de passage sont déterminés à partir "
+                "For the second round, the passage orders are determined from the passage orders of the first round.") \
-        msg += "des ordres de passage du premier tour."
+            .format(trigrams=trigrams)
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
@@ -610,8 +612,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': "À votre tour !",
+                                             'title': _("Your turn!"),
-                                             'body': "C'est à vous de tirer un nouveau problème !"})
+                                             'body': _("It's your turn to draw a problem!")})
 
     async def select_problem(self, **kwargs):
         """
@@ -631,7 +633,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
@@ -702,19 +704,20 @@ 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 = f"L'équipe <strong>{trigram}</strong> a accepté le problème <strong>{td.accepted} : " \
+        msg = _("The team <strong>{trigram}</strong> accepted the problem <string>{problem}</strong>: "
-              f"{settings.PROBLEMS[td.accepted - 1]}</strong>. "
+                "{problem_name}. ").format(trigram=trigram, problem=td.accepted,
+                                           problem_name=settings.PROBLEMS[td.accepted - 1])
         if pool.size == 5 and await pool.teamdraw_set.filter(accepted=td.accepted).acount() < 2:
-            msg += "Une équipe peut encore l'accepter."
+            msg += _("One team more can accept this problem.")
         else:
-            msg += "Plus personne ne peut l'accepter."
+            msg += _("No team can accept this problem anymore.")
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
@@ -749,8 +752,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': "À votre tour !",
+                                                 'title': _("Your turn!"),
-                                                 'body': "C'est à vous de tirer un nouveau problème !"})
+                                                 'body': _("It's your turn to draw a problem!")})
         else:
             # Pool is ended
             await self.end_pool(pool)
@@ -808,8 +811,8 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 'problems': [td.accepted async for td in pool.team_draws],
             })
 
-        msg += f"<br><br>Le tirage de la poule {pool.get_letter_display()}{r.number} est terminé. " \
+        msg += "<br><br>" + _("The draw of the pool {pool} is ended. The summary is below.") \
-               f"Le tableau récapitulatif est en bas."
+            .format(pool=f"{pool.get_letter_display()}{r.number}")
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
@@ -826,8 +829,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': "À votre tour !",
+                                                     'title': _("Your turn!"),
-                                                     'body': "C'est à vous de lancer le dé !"})
+                                                     'body': _("It's your turn to launch the dice!")})
 
             await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
                                                 {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
@@ -843,11 +846,11 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
         """
         msg = self.tournament.draw.last_message
 
-        if r.number < settings.NB_ROUNDS and not self.tournament.final:
+        if r.number < settings.NB_ROUNDS and not self.tournament.final and settings.TFJM_APP == "TFJM":
             # Next round
             next_round = await self.tournament.draw.round_set.filter(number=r.number + 1).aget()
             self.tournament.draw.current_round = next_round
-            msg += f"<br><br>Le tirage au sort du tour {r.number} est terminé."
+            msg += "<br><br>" + _("The draw of the round {round} is ended.").format(round=r.number)
             self.tournament.draw.last_message = msg
             await self.tournament.draw.asave()
 
@@ -860,8 +863,8 @@ 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': "À votre tour !",
+                                                     'title': _("Your turn!"),
-                                                     'body': "C'est à vous de lancer le dé !"})
+                                                     'body': _("It's your turn to launch the dice!")})
 
             # Reorder dices
             await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
@@ -888,9 +891,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:
+        elif r.number == 1 and (self.tournament.final or not settings.HAS_FINAL):
             # For the final tournament, we wait for a manual update between the two rounds.
-            msg += "<br><br>Le tirage au sort du tour 1 est terminé."
+            msg += "<br><br>" + _("The draw of the first round is ended.")
             self.tournament.draw.last_message = msg
             await self.tournament.draw.asave()
 
@@ -919,7 +922,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
@@ -933,15 +936,16 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
 
         # Update messages
         trigram = td.participation.team.trigram
-        msg = f"L'équipe <strong>{trigram}</strong> a refusé le problème <strong>{problem} : " \
+        msg = _("The team <strong>{trigram}</strong> refused the problem <strong>{problem}</strong>: "
-              f"{settings.PROBLEMS[problem - 1]}</strong>. "
+                "{problem_name}.").format(trigram=trigram, problem=problem,
+                                          problem_name=settings.PROBLEMS[problem - 1]) + " "
         if remaining >= 0:
-            msg += f"Il lui reste {remaining} refus sans pénalité."
+            msg += _("It remains {remaining} refusals without penalty.").format(remaining=remaining)
         else:
             if already_refused:
-                msg += "Cela n'ajoute pas de pénalité."
+                msg += _("This problem was already refused by this team.")
             else:
-                msg += "Cela ajoute une pénalité de 25&nbsp;% sur le coefficient de l'oral de la défense."
+                msg += _("It adds a 25% penalty on the coefficient of the oral defense.")
         self.tournament.draw.last_message = msg
         await self.tournament.draw.asave()
 
@@ -984,8 +988,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': "À votre tour !",
+                                             'title': _("Your turn!"),
-                                             'body': "C'est à vous de tirer un nouveau problème !"})
+                                             'body': _("It's your turn to draw a problem!")})
 
     @ensure_orga
     async def export(self, **kwargs):
@@ -1017,44 +1021,49 @@ 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:
+        if not self.tournament.final and settings.TFJM_APP == "TFJM":
             return await self.alert(_("This is only available for the final tournament."), 'danger')
 
-        r2 = await self.tournament.draw.round_set.filter(number=2).aget()
+        r2 = await self.tournament.draw.round_set.filter(number=self.tournament.draw.current_round.number + 1).aget()
         self.tournament.draw.current_round = r2
-        msg = "Le tirage au sort pour le tour 2 va commencer. " \
+        if settings.TFJM_APP == "TFJM":
-              "L'ordre de passage est déterminé à partir du classement du premier tour, " \
+            msg = str(_("The draw of the round {round} is starting. "
-              "de sorte à mélanger les équipes entre les deux jours."
+                        "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))
         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': 'Tirage au sort du TFJM²',
+                                             'title': _("Draw") + " " + settings.APP_NAME,
-                                             'body': "Le tirage au sort pour le second tour de la finale a commencé !"})
+                                             'body': str(_("The draw of the second round is starting!"))})
 
-        # Set the first pool of the second round as the active pool
+        if settings.TFJM_APP == "TFJM":
-        pool = await Pool.objects.filter(round=self.tournament.draw.current_round, letter=1).aget()
+            # Set the first pool of the second round as the active pool
-        r2.current_pool = pool
+            pool = await Pool.objects.filter(round=self.tournament.draw.current_round, letter=1).aget()
-        await r2.asave()
+            r2.current_pool = pool
+            await r2.asave()
 
-        # Fetch notes from the first round
+            # Fetch notes from the first round
-        notes = dict()
+            notes = dict()
-        async for participation in self.tournament.participations.filter(valid=True).prefetch_related('team').all():
+            async for participation in self.tournament.participations.filter(valid=True).prefetch_related('team').all():
-            notes[participation] = sum([await pool.aaverage(participation)
+                notes[participation] = sum([await pool.aaverage(participation)
-                                        async for pool in self.tournament.pools.filter(participations=participation)
+                                            async for pool in self.tournament.pools.filter(participations=participation)
-                                        .prefetch_related('passages')])
+                                            .prefetch_related('passages')])
-        # Sort notes in a decreasing order
+            # Sort notes in a decreasing order
-        ordered_participations = sorted(notes.keys(), key=lambda x: -notes[x])
+            ordered_participations = sorted(notes.keys(), key=lambda x: -notes[x])
-        # Define pools and passage orders from the ranking of the first round
+            # Define pools and passage orders from the ranking of the first round
-        async for pool in r2.pool_set.order_by('letter').all():
+            async for pool in r2.pool_set.order_by('letter').all():
-            for i in range(pool.size):
+                for i in range(pool.size):
-                participation = ordered_participations.pop(0)
+                    participation = ordered_participations.pop(0)
-                td = await TeamDraw.objects.aget(round=r2, participation=participation)
+                    td = await TeamDraw.objects.aget(round=r2, participation=participation)
-                td.pool = pool
+                    td.pool = pool
-                td.passage_index = i
+                    td.passage_index = i
-                await td.asave()
+                    await td.asave()
 
         # Send pools to users
         await self.channel_layer.group_send(f"tournament-{self.tournament.id}",
@@ -1074,16 +1083,22 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                 f"tournament-{self.tournament.id}",
                 {'tid': self.tournament_id, 'type': 'draw.dice', 'team': participation.team.trigram, 'result': None})
 
-        async for td in r2.current_pool.team_draws.prefetch_related('participation__team'):
+        if settings.TFJM_APP == "TFJM":
-            await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
+            async for td in r2.current_pool.team_draws.prefetch_related('participation__team'):
-                                                {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
+                await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
-                                                 'visible': True})
+                                                    {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
+                                                     'visible': True})
 
-            # Notify the team that it can draw a problem
+                # Notify the team that it can draw a problem
-            await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
+                await self.channel_layer.group_send(f"team-{td.participation.team.trigram}",
-                                                {'tid': self.tournament_id, 'type': 'draw.notify',
+                                                    {'tid': self.tournament_id, 'type': 'draw.notify',
-                                                 'title': "À votre tour !",
+                                                     'title': _("Your turn!"),
-                                                 'body': "C'est à vous de tirer un nouveau problème !"})
+                                                     '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})
 
         await self.channel_layer.group_send(f"volunteer-{self.tournament.id}",
                                             {'tid': self.tournament_id, 'type': 'draw.dice_visibility',
@@ -1098,7 +1113,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()})
+                                             'pool': r2.current_pool.get_letter_display() if r2.current_pool else None})
 
     @ensure_orga
     async def cancel_last_step(self, **kwargs):
@@ -1372,7 +1387,7 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                                      'round': r.number,
                                                      'team': td.participation.team.trigram,
                                                      'problem': td.accepted})
-            elif r.number >= 2:
+            elif r.number >= 2 and settings.TFJM_APP == "TFJM":
                 if not self.tournament.final:
                     # Go to the previous round
                     previous_round = await self.tournament.draw.round_set \
@@ -1386,21 +1401,6 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                                                  'team': td.participation.team.trigram,
                                                                  'result': td.choice_dice})
 
-                    await self.channel_layer.group_send(
-                        f"tournament-{self.tournament.id}",
-                        {
-                            'tid': self.tournament_id,
-                            'type': 'draw.send_poules',
-                            'round': previous_round.number,
-                            'poules': [
-                                {
-                                    'letter': pool.get_letter_display(),
-                                    'teams': await pool.atrigrams(),
-                                }
-                                async for pool in previous_round.pool_set.order_by('letter').all()
-                            ]
-                        })
-
                     previous_pool = previous_round.current_pool
 
                     td = previous_pool.current_team
@@ -1464,17 +1464,31 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                                          'visible': True})
             else:
                 # Go to the dice order
-                async for r0 in self.tournament.draw.round_set.all():
+                async for td in r.teamdraw_set.all():
-                    async for td in r0.teamdraw_set.all():
+                    td.pool = None
-                        td.pool = None
+                    td.passage_index = None
-                        td.passage_index = None
+                    td.choose_index = None
-                        td.choose_index = None
+                    td.choice_dice = None
-                        td.choice_dice = None
+                    await td.asave()
-                        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
@@ -1544,8 +1558,45 @@ class DrawConsumer(AsyncJsonWebsocketConsumer):
                                                              'team': last_td.participation.team.trigram,
                                                              'result': None})
                     break
-        else:
+        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})
 
     async def draw_alert(self, content):
         """

draw/migrations/0005_alter_round_number_alter_teamdraw_accepted_and_more.py

@@ -0,0 +1,69 @@
+# 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

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

draw/static/tfjm/js/draw.js

@@ -4,8 +4,8 @@
     await Notification.requestPermission()
 })()
 
-// TODO ETEAM Mieux paramétriser (5 pour le TFJM², 6 pour l'ETEAM)
+const TFJM = JSON.parse(document.getElementById('TFJM_settings').textContent)
-const RECOMMENDED_SOLUTIONS_COUNT = 6
+const RECOMMENDED_SOLUTIONS_COUNT = TFJM.RECOMMENDED_SOLUTIONS_COUNT
 
 const problems_count = JSON.parse(document.getElementById('problems_count').textContent)
 
@@ -521,45 +521,45 @@ document.addEventListener('DOMContentLoaded', () => {
                 teamTd.innerText = team
                 teamTr.append(teamTd)
 
-                let defenderTd = document.createElement('td')
+                let reporterTd = document.createElement('td')
-                defenderTd.classList.add('text-center')
+                reporterTd.classList.add('text-center')
-                defenderTd.innerText = 'Déf'
+                reporterTd.innerText = 'Déf'
 
                 let opponentTd = document.createElement('td')
                 opponentTd.classList.add('text-center')
                 opponentTd.innerText = 'Opp'
 
-                let reporterTd = document.createElement('td')
+                let reviewerTd = document.createElement('td')
-                reporterTd.classList.add('text-center')
+                reviewerTd.classList.add('text-center')
-                reporterTd.innerText = 'Rap'
+                reviewerTd.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(defenderTd, reporterTd, opponentTd)
+                            teamTr.append(reporterTd, reviewerTd, opponentTd)
                             break
                         case 1:
-                            teamTr.append(opponentTd, defenderTd, reporterTd)
+                            teamTr.append(opponentTd, reporterTd, reviewerTd)
                             break
                         case 2:
-                            teamTr.append(reporterTd, opponentTd, defenderTd)
+                            teamTr.append(reviewerTd, opponentTd, reporterTd)
                             break
                     }
                 } else if (poule.teams.length === 4) {
                     let emptyTd = document.createElement('td')
                     switch (i) {
                         case 0:
-                            teamTr.append(defenderTd, emptyTd, reporterTd, opponentTd)
+                            teamTr.append(reporterTd, emptyTd, reviewerTd, opponentTd)
                             break
                         case 1:
-                            teamTr.append(opponentTd, defenderTd, emptyTd, reporterTd)
+                            teamTr.append(opponentTd, reporterTd, emptyTd, reviewerTd)
                             break
                         case 2:
-                            teamTr.append(reporterTd, opponentTd, defenderTd, emptyTd)
+                            teamTr.append(reviewerTd, opponentTd, reporterTd, emptyTd)
                             break
                         case 3:
-                            teamTr.append(emptyTd, reporterTd, opponentTd, defenderTd)
+                            teamTr.append(emptyTd, reviewerTd, opponentTd, reporterTd)
                             break
                     }
                 } else if (poule.teams.length === 5) {
@@ -567,19 +567,19 @@ document.addEventListener('DOMContentLoaded', () => {
                     let emptyTd2 = document.createElement('td')
                     switch (i) {
                         case 0:
-                            teamTr.append(defenderTd, emptyTd, opponentTd, reporterTd, emptyTd2)
+                            teamTr.append(reporterTd, emptyTd, opponentTd, reviewerTd, emptyTd2)
                             break
                         case 1:
-                            teamTr.append(emptyTd, defenderTd, reporterTd, emptyTd2, opponentTd)
+                            teamTr.append(emptyTd, reporterTd, reviewerTd, emptyTd2, opponentTd)
                             break
                         case 2:
-                            teamTr.append(opponentTd, emptyTd, defenderTd, emptyTd2, reporterTd)
+                            teamTr.append(opponentTd, emptyTd, reporterTd, emptyTd2, reviewerTd)
                             break
                         case 3:
-                            teamTr.append(reporterTd, opponentTd, emptyTd, defenderTd, emptyTd2)
+                            teamTr.append(reviewerTd, opponentTd, emptyTd, reporterTd, emptyTd2)
                             break
                         case 4:
-                            teamTr.append(emptyTd, reporterTd, emptyTd2, opponentTd, defenderTd)
+                            teamTr.append(emptyTd, reviewerTd, emptyTd2, opponentTd, reporterTd)
                             break
                     }
                 }
@@ -662,7 +662,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
         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 defender
+            // 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 (penaltyDiv === null) {
                 penaltyDiv = document.createElement('div')
@@ -700,6 +700,9 @@ 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/tournament_content.html

@@ -176,7 +176,7 @@
                                 📁 {% trans "Export" %}
                             </button>
                         </div>
-                        {% if tournament.final %}
+                        {% if tournament.final or not TFJM.HAS_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">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
                                                             {% elif forloop.counter == 2 %}
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
                                                             {% elif forloop.counter == 3 %}
-                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
                                                             {% endif %}
                                                         {% elif pool.size == 4 %}
                                                             {% if forloop.counter == 1 %}
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td></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">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
                                                             {% elif forloop.counter == 2 %}
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td></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">{% trans "Rev" context "Role abbreviation" %}</td>
                                                             {% elif forloop.counter == 3 %}
-                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td></td>
+                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
                                                             {% elif forloop.counter == 4 %}
-                                                                <td></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">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
                                                             {% endif %}
                                                         {% elif pool.size == 5 %}
                                                             {% if forloop.counter == 1 %}
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td></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">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td></td>
+                                                                <td class="text-center"></td>
                                                             {% elif forloop.counter == 2 %}
-                                                                <td></td>
+                                                                <td class="text-center"></td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td></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">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
                                                             {% elif forloop.counter == 3 %}
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td></td>
+                                                                <td class="text-center"></td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td></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">{% trans "Rev" context "Role abbreviation" %}</td>
                                                             {% elif forloop.counter == 4 %}
-                                                                <td class="text-center">Rap</td>
+                                                                <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td></td>
+                                                                <td class="text-center"></td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td></td>
+                                                                <td class="text-center">{% if TFJM.HAS_OBSERVER %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
                                                             {% elif forloop.counter == 5 %}
-                                                                <td></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">{% trans "Rev" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">Opp</td>
+                                                                <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td></td>
+                                                                <td class="text-center"></td>
-                                                                <td class="text-center">Déf</td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</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'], "The sum must be equal to the number of teams: expected 12, got 3")
+        self.assertEqual(resp['message'], "La somme doit être égale au nombre d'équipes : attendu 12, obtenu 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'], "The draw is already started.")
+        self.assertEqual(resp['message'], "Le tirage a déjà commencé.")
 
         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'], "You've already launched the dice.")
+                self.assertEqual(resp['message'], "Vous avez déjà lancé le dé.")
 
             # 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'], "You've already launched the dice.")
+                self.assertEqual(resp['message'], "Vous avez déjà lancé le dé.")
 
             # 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'], "This is not the time for this.")
+        self.assertEqual(resp['message'], "Ce n'est pas le moment pour cela.")
 
         # 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'], "This is not the time for this.")
+        self.assertEqual(resp['message'], "Ce n'est pas le moment pour cela.")
 
         # 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, Synthesis, Team, Tournament, Tweak
+from .models import Note, Participation, Passage, Pool, Solution, Team, Tournament, Tweak, WrittenReview
 
 
 class ParticipationInline(admin.StackedInline):
@@ -32,8 +32,8 @@ class SolutionInline(admin.TabularInline):
     show_change_link = True
 
 
-class SynthesisInline(admin.TabularInline):
+class WrittenReviewInline(admin.TabularInline):
-    model = Synthesis
+    model = WrittenReview
     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 = ('defender', 'opponent', 'reporter',)
+    autocomplete_fields = ('reporter', 'opponent', 'reviewer', 'observer',)
     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, SynthesisInline,)
+    inlines = (SolutionInline, WrittenReviewInline,)
 
 
 @admin.register(Pool)
@@ -113,25 +113,29 @@ class PoolAdmin(admin.ModelAdmin):
 
 @admin.register(Passage)
 class PassageAdmin(admin.ModelAdmin):
-    list_display = ('__str__', 'defender_trigram', 'solution_number', 'opponent_trigram', 'reporter_trigram',
+    list_display = ('__str__', 'reporter_trigram', 'solution_number', 'opponent_trigram', 'reviewer_trigram',
-                    'pool_abbr', 'position', 'tournament')
+                    'observer_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', 'defender', 'opponent', 'reporter',)
+    autocomplete_fields = ('pool', 'reporter', 'opponent', 'reviewer', 'observer',)
     inlines = (NoteInline,)
 
-    @admin.display(description=_("defender"), ordering='defender__team__trigram')
+    @admin.display(description=_("reporter"), ordering='reporter__team__trigram')
-    def defender_trigram(self, record: Passage):
+    def reporter_trigram(self, record: Passage):
-        return record.defender.team.trigram
+        return record.reporter.team.trigram
 
     @admin.display(description=_("opponent"), ordering='opponent__team__trigram')
     def opponent_trigram(self, record: Passage):
         return record.opponent.team.trigram
 
-    @admin.display(description=_("reporter"), ordering='reporter__team__trigram')
+    @admin.display(description=_("reviewer"), ordering='reviewer__team__trigram')
-    def reporter_trigram(self, record: Passage):
+    def reviewer_trigram(self, record: Passage):
-        return record.reporter.team.trigram
+        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=_("pool"), ordering='pool__letter')
     def pool_abbr(self, record):
@@ -144,12 +148,13 @@ class PassageAdmin(admin.ModelAdmin):
 
 @admin.register(Note)
 class NoteAdmin(admin.ModelAdmin):
-    list_display = ('passage', 'pool', 'jury', 'defender_writing', 'defender_oral',
+    list_display = ('passage', 'pool', 'jury', 'reporter_writing', 'reporter_oral',
-                    'opponent_writing', 'opponent_oral', 'reporter_writing', 'reporter_oral',)
+                    'opponent_writing', 'opponent_oral', 'reviewer_writing', 'reviewer_oral',
+                    'observer_writing', 'observer_oral',)
     list_filter = ('passage__pool__letter', 'passage__solution_number', 'jury',
-                   'defender_writing', 'defender_oral', 'opponent_writing', 'opponent_oral',
+                   'reporter_writing', 'reporter_oral', 'opponent_writing', 'opponent_oral',
-                   'reporter_writing', 'reporter_oral')
+                   'reviewer_writing', 'reviewer_oral', 'observer_writing', 'observer_oral')
-    search_fields = ('jury__user__last_name', 'jury__user__first_name', 'passage__defender__team__trigram',)
+    search_fields = ('jury__user__last_name', 'jury__user__first_name', 'passage__reporter__team__trigram',)
     autocomplete_fields = ('jury', 'passage',)
 
     @admin.display(description=_("pool"))
@@ -173,19 +178,19 @@ class SolutionAdmin(admin.ModelAdmin):
         return Tournament.final_tournament() if record.final_solution else record.participation.tournament
 
 
-@admin.register(Synthesis)
+@admin.register(WrittenReview)
-class SynthesisAdmin(admin.ModelAdmin):
+class WrittenReviewAdmin(admin.ModelAdmin):
-    list_display = ('participation', 'type', 'defender', 'passage',)
+    list_display = ('participation', 'type', 'reporter', 'passage',)
     list_filter = ('participation__tournament', 'type', 'passage__solution_number',)
     search_fields = ('participation__team__name', 'participation__team__trigram',)
     autocomplete_fields = ('participation', 'passage',)
 
-    @admin.display(description=_("defender"))
+    @admin.display(description=_("reporter"))
-    def defender(self, record: Synthesis):
+    def reporter(self, record: WrittenReview):
-        return record.passage.defender
+        return record.passage.reporter
 
     @admin.display(description=_("problem"))
-    def problem(self, record: Synthesis):
+    def problem(self, record: WrittenReview):
         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, Synthesis, Team, Tournament
+from ..models import Note, Participation, Passage, Pool, Solution, Team, Tournament, WrittenReview
 
 
 class NoteSerializer(serializers.ModelSerializer):
@@ -38,9 +38,9 @@ class SolutionSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 
-class SynthesisSerializer(serializers.ModelSerializer):
+class WrittenReviewSerializer(serializers.ModelSerializer):
     class Meta:
-        model = Synthesis
+        model = WrittenReview
         fields = '__all__'
 
 
@@ -58,9 +58,9 @@ 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', 'syntheses_first_phase_limit',
+                  'inscription_limit', 'solution_limit', 'solutions_draw', 'reviews_first_phase_limit',
-                  'solutions_available_second_phase', 'syntheses_second_phase_limit',
+                  'solutions_available_second_phase', 'reviews_second_phase_limit',
-                  'solutions_available_third_phase', 'syntheses_third_phase_limit',
+                  'solutions_available_third_phase', 'reviews_third_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, SynthesisViewSet, TeamViewSet, TournamentViewSet, TweakViewSet
+    SolutionViewSet, TeamViewSet, TournamentViewSet, TweakViewSet, WrittenReviewViewSet
 
 
 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, SynthesisSerializer, TeamSerializer, TournamentSerializer, TweakSerializer
+    SolutionSerializer, TeamSerializer, TournamentSerializer, TweakSerializer, WrittenReviewSerializer
-from ..models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament, Tweak
+from ..models import Note, Participation, Passage, Pool, Solution, Team, Tournament, Tweak, WrittenReview
 
 
 class NoteViewSet(ModelViewSet):
     queryset = Note.objects.all()
     serializer_class = NoteSerializer
     filter_backends = [DjangoFilterBackend]
-    filterset_fields = ['jury', 'passage', 'defender_writing', 'defender_oral', 'opponent_writing',
+    filterset_fields = ['jury', 'passage', 'reporter_writing', 'reporter_oral', 'opponent_writing',
-                        'opponent_oral', 'reporter_writing', 'reporter_oral', ]
+                        'opponent_oral', 'reviewer_writing', 'reviewer_oral', 'observer_writing', 'observer_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', 'defender', 'opponent', 'reporter', 'pool_tournament', ]
+    filterset_fields = ['pool', 'solution_number', 'reporter', 'opponent', 'reviewer', 'observer', 'pool_tournament', ]
 
 
 class PoolViewSet(ModelViewSet):
@@ -44,9 +44,9 @@ class SolutionViewSet(ModelViewSet):
     filterset_fields = ['participation', 'number', 'problem', 'final_solution', ]
 
 
-class SynthesisViewSet(ModelViewSet):
+class WrittenReviewViewSet(ModelViewSet):
-    queryset = Synthesis.objects.all()
+    queryset = WrittenReview.objects.all()
-    serializer_class = SynthesisSerializer
+    serializer_class = WrittenReviewSerializer
     filter_backends = [DjangoFilterBackend]
     filterset_fields = ['participation', 'number', 'passage', 'type', ]
 
@@ -64,9 +64,9 @@ 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', 'syntheses_first_phase_limit',
+                        'inscription_limit', 'solution_limit', 'solutions_draw', 'reviews_first_phase_limit',
-                        'solutions_available_second_phase', 'syntheses_second_phase_limit',
+                        'solutions_available_second_phase', 'reviews_second_phase_limit',
-                        'solutions_available_third_phase', 'syntheses_third_phase_limit',
+                        'solutions_available_third_phase', 'reviews_third_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, Submit
+from crispy_forms.layout import Div, Field, HTML, Layout, Submit
 from django import forms
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
@@ -16,7 +16,7 @@ from pypdf import PdfReader
 from registration.models import VolunteerRegistration
 from tfjm import settings
 
-from .models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament
+from .models import Note, Participation, Passage, Pool, Solution, Team, Tournament, WrittenReview
 
 
 class TeamForm(forms.ModelForm):
@@ -77,9 +77,30 @@ class ParticipationForm(forms.ModelForm):
     """
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if settings.TFJM_APP == "ETEAM":
+        if settings.SINGLE_TOURNAMENT:
-            # One single tournament only
             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
@@ -137,7 +158,7 @@ class TournamentForm(forms.ModelForm):
         if settings.NB_ROUNDS < 3:
             del self.fields['date_third_phase']
             del self.fields['solutions_available_third_phase']
-            del self.fields['syntheses_third_phase_limit']
+            del self.fields['reviews_third_phase_limit']
         if not settings.PAYMENT_MANAGEMENT:
             del self.fields['price']
 
@@ -151,14 +172,14 @@ class TournamentForm(forms.ModelForm):
             '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'),
-            'syntheses_first_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
+            'reviews_first_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
-                                                               format='%Y-%m-%d %H:%M'),
+                                                             format='%Y-%m-%d %H:%M'),
             'date_second_phase': forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d'),
-            'syntheses_second_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
+            'reviews_second_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
-                                                                format='%Y-%m-%d %H:%M'),
+                                                              format='%Y-%m-%d %H:%M'),
             'date_third_phase': forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d'),
-            'syntheses_third_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
+            'reviews_third_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
-                                                               format='%Y-%m-%d %H:%M'),
+                                                             format='%Y-%m-%d %H:%M'),
             'organizers': forms.SelectMultiple(attrs={
                 'class': 'selectpicker',
                 'data-live-search': 'true',
@@ -302,25 +323,26 @@ 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] == 'Problème':
+            if line and line[0] in ["Problème", "Problem"]:
                 pool_size = len(line) - 1
-                line_length = 2 + 6 * pool_size
+                line_length = 2 + (8 if df.iat[1, 8] == "Observer" else 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"]:
+            if name.lower() in ["rôle", "juré⋅e", "juré?e", "moyenne", "coefficient", "sous-total", "équipe", "equipe",
+                                "role", "juree", "average", "coefficient", "subtotal", "team"]:
                 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, 20, 10, 10, 10, 10]
+            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]
             for n, max_n in zip(notes, max_notes):
                 if n > max_n:
                     self.add_error('file',
@@ -344,21 +366,21 @@ class UploadNotesForm(forms.Form):
 class PassageForm(forms.ModelForm):
     def clean(self):
         cleaned_data = super().clean()
-        if "defender" in cleaned_data and "opponent" in cleaned_data and "reporter" in cleaned_data \
+        if "reporter" in cleaned_data and "opponent" in cleaned_data and "reviewer" in cleaned_data \
-                and len({cleaned_data["defender"], cleaned_data["opponent"], cleaned_data["reporter"]}) < 3:
+                and len({cleaned_data["reporter"], cleaned_data["opponent"], cleaned_data["reviewer"]}) < 3:
-            self.add_error(None, _("The defender, the opponent and the reporter must be different."))
+            self.add_error(None, _("The reporter, the opponent and the reviewer must be different."))
-        if "defender" in self.cleaned_data and "solution_number" in self.cleaned_data \
+        if "reporter" in self.cleaned_data and "solution_number" in self.cleaned_data \
-                and not Solution.objects.filter(participation=cleaned_data["defender"],
+                and not Solution.objects.filter(participation=cleaned_data["reporter"],
                                                 problem=cleaned_data["solution_number"]).exists():
-            self.add_error("solution_number", _("This defender did not work on this problem."))
+            self.add_error("solution_number", _("This reporter did not work on this problem."))
         return cleaned_data
 
     class Meta:
         model = Passage
-        fields = ('position', 'solution_number', 'defender', 'opponent', 'reporter', 'defender_penalties',)
+        fields = ('position', 'solution_number', 'reporter', 'opponent', 'reviewer', 'opponent', 'reporter_penalties',)
 
 
-class SynthesisForm(forms.ModelForm):
+class WrittenReviewForm(forms.ModelForm):
     def clean_file(self):
         if "file" in self.files:
             file = self.files["file"]
@@ -374,16 +396,16 @@ class SynthesisForm(forms.ModelForm):
 
     def save(self, commit=True):
         """
-        Don't save a synthesis with this way. Use a view instead
+        Don't save a written review with this way. Use a view instead
         """
 
     class Meta:
-        model = Synthesis
+        model = WrittenReview
         fields = ('file',)
 
 
 class NoteForm(forms.ModelForm):
     class Meta:
         model = Note
-        fields = ('defender_writing', 'defender_oral', 'opponent_writing',
+        fields = ('reporter_writing', 'reporter_oral', 'opponent_writing',
-                  'opponent_oral', 'reporter_writing', 'reporter_oral', )
+                  'opponent_oral', 'reviewer_writing', 'reviewer_oral', 'observer_writing', 'observer_oral', )

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(settings.PROBLEMS)
-
         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/generate_seconds_sheet.py

@@ -51,25 +51,25 @@ class Command(BaseCommand):
             team3, score3 = sorted_notes[2]
 
             pool1 = tournament.pools.filter(round=1, participations=team2).first()
-            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)
             reporter_passage_1 = Passage.objects.get(pool__tournament=tournament, pool__round=1, reporter=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)
             pool2 = tournament.pools.filter(round=2, participations=team2).first()
-            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)
             reporter_passage_2 = Passage.objects.get(pool__tournament=tournament, pool__round=2, reporter=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)
 
             line.append(team2.team.trigram)
             line.append(str(pool1.jury_president or ""))
-            line.append(f"Pb. {defender_passage_1.solution_number}")
+            line.append(f"Pb. {reporter_passage_1.solution_number}")
-            line.extend([defender_passage_1.average_defender_writing, defender_passage_1.average_defender_oral,
+            line.extend([reporter_passage_1.average_reporter_writing, reporter_passage_1.average_reporter_oral,
                          opponent_passage_1.average_opponent_writing, opponent_passage_1.average_opponent_oral,
-                         reporter_passage_1.average_reporter_writing, reporter_passage_1.average_reporter_oral])
+                         reviewer_passage_1.average_reviewer_writing, reviewer_passage_1.average_reviewer_oral])
             line.append(str(pool2.jury_president or ""))
-            line.append(f"Pb. {defender_passage_2.solution_number}")
+            line.append(f"Pb. {reporter_passage_2.solution_number}")
-            line.extend([defender_passage_2.average_defender_writing, defender_passage_2.average_defender_oral,
+            line.extend([reporter_passage_2.average_reporter_writing, reporter_passage_2.average_reporter_oral,
                          opponent_passage_2.average_opponent_writing, opponent_passage_2.average_opponent_oral,
-                         reporter_passage_2.average_reporter_writing, reporter_passage_2.average_reporter_oral])
+                         reviewer_passage_2.average_reviewer_writing, reviewer_passage_2.average_reviewer_oral])
             line.extend([score2, f"{score1:.1f} ({team1.team.trigram})",
                          f"{score3:.1f} ({team3.team.trigram})"])
 

participation/migrations/0017_alter_passage_solution_number_alter_pool_round_and_more.py

@@ -0,0 +1,77 @@
+# 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

@@ -0,0 +1,91 @@
+# 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

@@ -0,0 +1,86 @@
+# 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

@@ -0,0 +1,75 @@
+# 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

@@ -0,0 +1,133 @@
+# 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

@@ -0,0 +1,44 @@
+# 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

@@ -0,0 +1,21 @@
+# 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/tables.py

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

participation/templates/participation/mails/request_validation.html

@@ -2,28 +2,28 @@
 <html lang="fr">
 <head>
     <meta charset="UTF-8">
-    <title>Validation request - ETEAM</title>
+    <title>Demande de validation - TFJM²</title>
 </head>
 <body>
 <p>
-Hi,
+Bonjour,
 </p>
 
 <p>
-The team "{{ team.name }}" ({{ team.trigram }}) has just asked to validate his team to take part
+L'équipe « {{ team.name }} » ({{ team.trigram }}) vient de demander à valider son équipe pour participer
-in ETEAM.
+au {{ team.participation.get_problem_display }} du TFJM².
-You can decide whether or not to accept the team by going to the team page:
+Vous pouvez décider d'accepter ou de refuser l'équipe en vous rendant sur la page de l'équipe :
 <a href="https://{{ domain }}{% url "participation:team_detail" pk=team.pk %}">
     https://{{ domain }}{% url "participation:team_detail" pk=team.pk %}
 </a>
 </p>
 
 <p>
-Sincerely yours,
+Cordialement,
 </p>
 
 <p>
-The ETEAM team
+L'organisation du TFJM²
 </p>
 </body>
 </html>

participation/templates/participation/mails/request_validation.txt

@@ -1,10 +1,10 @@
-Hi {{ user }},
+Bonjour {{ user }},
 
-The team "{{ team.name }}" ({{ team.trigram }}) has just asked to validate his team to take part
+L'équipe « {{ team.name }} » ({{ team.trigram }}) vient de demander à valider son équipe pour participer
-in ETEAM.
+au {{ team.participation.get_problem_display }} du TFJM².
-You can decide whether or not to accept the team by going to the team page:
+Vous pouvez décider d'accepter ou de refuser l'équipe en vous rendant sur la page de l'équipe :
 https://{{ domain }}{% url "participation:team_detail" pk=team.pk %}
 
-Sincerely yours,
+Cordialement,
 
-The ETEAM team
+L'organisation du TFJM²

participation/templates/participation/mails/team_not_validated.html

@@ -2,21 +2,21 @@
 <html lang="fr">
 <head>
     <meta charset="UTF-8">
-    <title>Team not validated – ETEAM</title>
+    <title>Équipe non validée – TFJM²</title>
 </head>
 <body>
-Hi,<br/>
+Bonjour,<br/>
 <br />
-Unfortunately, your team "{{ team.name }}" ({{ team.trigram }}) has not been validated.
+Maleureusement, votre équipe « {{ team.name }} » ({{ team.trigram }}) n'a pas été validée. Veuillez vérifier que vos autorisations
-Please check that your authorisations are correctly filled in.
+de droit à l'image sont correctes. Les organisateurs vous adressent ce message :<br />
-The organisers are sending you this message:<br />
 <br />
 {{ message }}<br />
 <br />
-Please contact us at <a href="mailto:eteam_moc@proton.me">eteam_moc@proton.me</a> if you need further information.
+N'hésitez pas à nous contacter à l'adresse <a href="mailto:contact@tfjm.org">contact@tfjm.org</a>
+pour plus d'informations.
 <br/>
-Sincerely yours,<br/>
+Cordialement,<br/>
 <br/>
-The ETEAM team
+Le comité d'organisation du TFJM²
 </body>
 </html>

participation/templates/participation/mails/team_not_validated.txt

@@ -1,13 +1,12 @@
-Hi,
+Bonjour,
 
-Unfortunately, your team "{{ team.name }}" ({{ team.trigram }}) has not been validated.
+Maleureusement, votre équipe « {{ team.name }} » ({{ team.trigram }}) n'a pas été validée. Veuillez vérifier que vos
-Please check that your authorisations are correctly filled in.
+autorisations de droit à l'image sont correctes. Les organisateurs vous adressent ce message :
-The organisers are sending you this message:<br />
 
 {{ message }}
 
-Please contact us at eteam_moc@proton.me if you need further information.
+N'hésitez pas à nous contacter à l'adresse contact@tfjm.org pour plus d'informations.
 
-Sincerely yours,
+Cordialement,
 
-The ETEAM team
+Le comité d'organisation du TFJM²

participation/templates/participation/mails/team_validated.html

@@ -2,36 +2,37 @@
 <html lang="fr">
 <head>
     <meta charset="UTF-8">
-    <title>Team validated – ETEAM</title>
+    <title>Équipe validée – TFJM²</title>
 </head>
 <body>
 <p>
-    Hello {{ registration }},
+    Bonjour {{ registration }},
 </p>
 <p>
-    Congratulations! Your team "{{ team.name }}" ({{ team.trigram }}) is now validated! You are now ready to
+    Félicitations ! Votre équipe « {{ team.name }} » ({{ team.trigram }}) est désormais validée ! Vous êtes désormais
-    to work on your problems. You can then upload your solutions to the platform.
+    apte à travailler sur vos problèmes. Vous pourrez ensuite envoyer vos solutions sur la plateforme.
 </p>
 
 {% if payment %}
     <p>
-        You must now pay your participation fee of € {{ payment.amount }}.
+        Vous devez désormais vous acquitter de vos frais de participation, de {{ payment.amount }} € par élève.
-        You can pay by credit card or bank transfer. You'll find information
+        Vous pouvez payer par carte bancaire ou par virement bancaire. Vous trouverez les informations
-        on the payment page which you can find on
+        sur <a href="https://{{ domain }}{% url 'registration:update_payment' pk=payment.pk %}">la page de paiement</a>.
-        <a href="https://{{ domain }}{% url 'registration:my_account_detail' %}">your account</a>.
+        Si vous disposez d'une bourse, l'inscription est gratuite, mais vous devez soumettre un justificatif
-        If you have a scholarship, registration is free, but you must submit a justification on the same page.
+        sur la même page.
     </p>
 {% elif registration.is_coach and team.participation.tournament.price %}
     <p>
-        Your team must now pay a participation fee of {{ team.participation.tournament.price }} € per student (supervisors are exempt). Students with scholarships are exempt⋅es from these fees.
+        Votre équipe doit désormais s'acquitter des frais de participation de {{ team.participation.tournament.price }} €
-        You can track the status of payments on 
+        par élève (les encadrant⋅es sont exonéré⋅es). Les élèves qui disposent d'une bourse sont exonéré⋅es de ces frais.
-        <a href="https://{{ domain }}{% url 'participation:team_detail' pk=team.pk %}">your team page</a>.
+        Vous pouvez suivre l'état des paiements sur
+        <a href="https://{{ domain }}{% url 'participation:team_detail' pk=team.pk %}">la page de votre équipe</a>.
     </p>
 {% endif %}
 
 {% if message %}
     <p>
-        The organisers send you this message:
+        Les organisateur⋅ices vous adressent ce message :
     </p>
     <p>
         {{ message }}
@@ -39,7 +40,7 @@
 {% endif %}
 
 <p>
-    The ETEAM team
+    Le comité d'organisation du TFJM²
 </p>
 </body>
 </html>

participation/templates/participation/mails/team_validated.txt

@@ -1,21 +1,23 @@
-Hello {{registration }},
+Bonjour {{ registration }},
 
-Congratulations! Your team "{{ team.name }}" ({{ team.trigram }}) is now validated! You are now ready to
+Félicitations ! Votre équipe « {{ team.name }} » ({{ team.trigram }}) est désormais validée ! Vous êtes désormais apte
-to work on your problems. You can then upload your solutions to the platform.
+à travailler sur vos problèmes. Vous pourrez ensuite envoyer vos solutions sur la plateforme.
-{% if payment %}
+{% if team.participation.amount %}
-You must now pay your participation fee of € {{ payment.amount }}.
+Vous devez désormais vous acquitter de vos frais de participation, de {{ team.participation.amount }} €.
-You can pay by credit card or bank transfer. You'll find information
+Vous pouvez payer par carte bancaire ou par virement bancaire. Vous trouverez les informations
-on the payment page which you can find on your account:
+sur la page de paiement que vous pouvez retrouver sur votre compte :
 https://{{ domain }}{% url 'registration:my_account_detail' %}
-If you have a scholarship, registration is free, but you must submit a justification on the same page.
+Si vous disposez d'une bourse, l'inscription est gratuite, mais vous devez soumettre un justificatif
+sur la même page.
 {% elif registration.is_coach and team.participation.tournament.price %}
-Your team must now pay a participation fee of {{ team.participation.tournament.price }} € per student (supervisors are exempt). Students with scholarships are exempt⋅es from these fees.
+Votre équipe doit désormais s'acquitter des frais de participation de {{ team.participation.tournament.price }} €
-You can track the status of payments on your team page:
+par élève (les encadrant⋅es sont exonéré⋅es). Les élèves qui disposent d'une bourse sont exonéré⋅es de ces frais.
+Vous pouvez suivre l'état des paiements sur la page de votre équipe :
 https://{{ domain }}{% url 'participation:team_detail' pk=team.pk %}
 {% endif %}
 {% if message %}
-The organisers send you this message:
+Les organisateurices vous adressent ce message :
 
 {{ message }}
 {% endif %}
-The ETEAM team
+Le comité d'organisation du TFJM²

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.defender.team.trigram }}, {% trans "Pb." %} {{ note.passage.solution_number }}</h5>
+            <h5>{% trans "Defense of" %} {{ note.passage.reporter.team.trigram }}, {% trans "Pb." %} {{ note.passage.solution_number }}</h5>
             <hr>
             {% csrf_token %}
             {{ form|crispy }}

participation/templates/participation/passage_detail.html

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

participation/templates/participation/pool_detail.html

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

@@ -0,0 +1,88 @@
+{% 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

@@ -1,74 +0,0 @@
-\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_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.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

@@ -0,0 +1,151 @@
+{% 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/tex/scale_tfjm.tex

@@ -17,13 +17,15 @@
 \usepackage{array}
 \usepackage{multirow}
 \usepackage{footnote}
-\usepackage{xintexpr}
+\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}
@@ -41,7 +43,7 @@
 \begin{center}
 \begin{itemize}
 {% for passage in passages.all %}
-\item D\'efenseur\textperiodcentered{}se au passage {{ forloop.counter }} : \underline{\texttt{~{{ passage.defender.team.trigram }}~}} $\qquad$ probl\`eme \underline{~{{ passage.solution_number }}~}
+\item D\'efenseur⋅se au passage {{ forloop.counter }} : \underline{\texttt{~{{ passage.reporter.team.trigram }}~}} $\qquad$ probl\`eme \underline{~{{ passage.solution_number }}~}
 {% endfor %}
 \end{itemize}
 \end{center}
@@ -50,24 +52,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\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
+\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
 
 %ECRIT
-\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 }}}
+\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 }}}
 && 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}{20mm}{Forme}& Clarté du raisonnement (explications, exemples, illustrations, schémas, etc.) & [0,3]{{ esp|safe }} \\ \cline{3-{{ 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 }}}
 && 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{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 }}}
+\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 }}}
 && 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{2}{20mm}{Débats} & Réponses correctes aux questions posées & [0,5] {{ esp|safe }} \\ \cline{3-{{ 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 }}}
 && 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}{20mm}{Malus} & Attitude irrespectueuse ? & [--6,0] {{ esp|safe }} \\ \cline{3-{{ passages.count|add:4 }}}
+&\multirow{2}{24mm}{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
 
@@ -77,21 +79,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\textperiodcentered{}e} \normalsize fournit une analyse critique de la solution et de la pr\'esentation.}
+\multicolumn{4}{|l|}{L' {\bf Opposant⋅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{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 }}}
+\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 }}}
 && 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{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 }}}
+\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 }}}
 && 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\textperiodcentered{}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⋅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}
@@ -100,20 +102,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\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
+\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
 
 %ECRIT
-\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 }}}
+\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 }}}
 && 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{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 }}}
+\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 }}}
 && \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\textperiodcentered{}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⋅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/tournament_detail.html

@@ -38,15 +38,15 @@
                 <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-sm-6 text-sm-end">{% trans 'date of maximal syntheses submission for the first round'|capfirst %}</dt>
+                <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.syntheses_first_phase_limit }}</dd>
+                <dd class="col-sm-6">{{ tournament.reviews_first_phase_limit }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal syntheses submission for the second round'|capfirst %}</dt>
+                <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.syntheses_second_phase_limit }}</dd>
+                <dd class="col-sm-6">{{ tournament.reviews_second_phase_limit }}</dd>
 
                 {% if TFJM.APP == "ETEAM" %}
-                    <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal syntheses submission for the third round'|capfirst %}</dt>
+                    <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.syntheses_third_phase_limit }}</dd>
+                    <dd class="col-sm-6">{{ tournament.reviews_third_phase_limit }}</dd>
                 {% endif %}
 
                 <dt class="col-sm-6 text-sm-end">{% trans 'description'|capfirst %}</dt>
@@ -151,6 +151,12 @@
                             <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">
@@ -177,6 +183,19 @@
                                 {% 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 %}
@@ -189,22 +208,26 @@
         <h3>{% trans "Files available for download" %}</h3>
 
         <div class="alert alert-warning fade show files-to-download-collapse" id="files-to-download-popup">
-            <h4>IMPORTANT</h4>
+            <h4>{% trans "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, 
+                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 %}
             </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 %}
             </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">
-                        I agree not to divulge participants' data and to delete them at the end of the tournament.
+                        {% trans "I agree not to divulge participants data and to delete them at the end of the tournament." %}
                 </button>
             </p>
         </div>
@@ -214,48 +237,48 @@
                 <ul>
                     <li>
                         <a href="{% url "participation:tournament_csv" pk=tournament.pk %}">
-                            Validated team participant data spreadsheet
+                            {% trans "Validated team participant data spreadsheet" %}
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_csv" pk=tournament.pk %}?all">
-                            All teams participant data spreadsheet
+                            {% trans "All teams participant data spreadsheet" %}
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_authorizations" tournament_id=tournament.id %}">
-                            Archive of all authorisations sorted by team and person
+                            {% trans "Archive of all authorisations sorted by team and person" %}
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}">
-                            Archive of all submitted solutions sorted by team
+                            {% trans "Archive of all submitted solutions sorted by team" %}
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}?sort_by=problem">
-                            Archive of all sent solutions sorted by problem
+                            {% trans "Archive of all sent solutions sorted by problem" %}
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_solutions" tournament_id=tournament.id %}?sort_by=pool">
-                            Archive of all sent solutions sorted by pool
+                            {% trans "Archive of all sent solutions sorted by pool" %}
                         </a>
                     </li>
                     <li>
-                        <a href="{% url "participation:tournament_syntheses" tournament_id=tournament.id %}?sort_by=pool">
+                        <a href="{% url "participation:tournament_written_reviews" tournament_id=tournament.id %}?sort_by=pool">
-                            Archive of all summary notes sorted by pool and passage
+                            {% trans "Archive of all summary notes sorted by pool and passage" %}
                         </a>
                     </li>
                     <li>
                         <a href="https://docs.google.com/spreadsheets/d/{{ tournament.notes_sheet_id }}/edit">
                             <i class="fas fa-table"></i>
-                            Note spreadsheet on Google Sheets
+                            {% trans "Note spreadsheet on Google Sheets" %}
                         </a>
                     </li>
                     <li>
                         <a href="{% url "participation:tournament_notation_sheets" tournament_id=tournament.id %}">
-                            Archive of all printable note sheets sorted by pool
+                            {% trans "Archive of all printable note sheets sorted by pool" %}
                         </a>
                     </li>
                 </ul>

participation/templates/participation/update_team.html

@@ -1,15 +1,37 @@
 {% extends request.content_only|yesno:"empty.html,base.html" %}
 
-{% load crispy_forms_filters i18n %}
+{% load crispy_forms_filters crispy_forms_tags i18n %}
 
 {% block content %}
     <form method="post">
         <div id="form-content">
             {% csrf_token %}
             {{ form|crispy }}
-            {{ participation_form|crispy }}
+            {% crispy participation_form %}
         </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

@@ -1,20 +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:" %}
-                <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>
-            </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

@@ -0,0 +1,25 @@
+{% 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/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, SynthesisUploadView, \
+    SolutionsDownloadView, SolutionUploadView, \
     TeamAuthorizationsView, TeamDetailView, TeamLeaveView, TeamListView, TeamUpdateView, \
     TeamUploadMotivationLetterView, TournamentCreateView, TournamentDetailView, TournamentExportCSVView, \
     TournamentHarmonizeNoteView, TournamentHarmonizeView, TournamentListView, TournamentPaymentsView, \
-    TournamentPublishNotesView, TournamentUpdateView
+    TournamentPublishNotesView, TournamentUpdateView, WrittenReviewUploadView
 
 
 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>/syntheses/", SolutionsDownloadView.as_view(),
+    path("tournament/<int:tournament_id>/written_reviews/", SolutionsDownloadView.as_view(),
-         name="tournament_syntheses"),
+         name="tournament_written_reviews"),
     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>/syntheses/", SolutionsDownloadView.as_view(), name="pool_download_syntheses"),
+    path("pools/<int:pool_id>/written_reviews/", SolutionsDownloadView.as_view(), name="pool_download_written_reviews"),
     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>/solution/", SynthesisUploadView.as_view(), name="upload_synthesis"),
+    path("pools/passages/<int:pk>/written_review/", WrittenReviewUploadView.as_view(), name="upload_written_review"),
     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
+from django.utils import timezone, translation
 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, SynthesisForm, TeamForm, TournamentForm, \
+    PoolForm, RequestValidationForm, SolutionForm, TeamForm, TournamentForm, UploadNotesForm, \
-    UploadNotesForm, ValidateParticipationForm
+    ValidateParticipationForm, WrittenReviewForm
-from .models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament, Tweak
+from .models import Note, Participation, Passage, Pool, Solution, Team, Tournament, Tweak, WrittenReview
 from .tables import NoteTable, ParticipationTable, PassageTable, PoolTable, TeamTable, TournamentTable
 
 
@@ -626,8 +626,9 @@ 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 not self.object.final and notes and context["available_notes_2"] \
+        if settings.HAS_FINAL and 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)
@@ -685,7 +686,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', 'Téléphone',
+                                       'Adresse', 'Code postal', 'Ville', 'Pays', 'Téléphone',
                                        'Classe', 'Établissement',
                                        'Nom responsable légal⋅e', 'Téléphone responsable légal⋅e',
                                        'Email responsable légal⋅e',
@@ -774,7 +775,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 (1, 2):
+        if self.kwargs['round'] not in range(1, settings.NB_ROUNDS + 1):
             raise Http404
         return super().dispatch(request, *args, **kwargs)
 
@@ -807,7 +808,8 @@ 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 (1, 2) or self.kwargs['action'] not in ('add', 'remove') \
+        if self.kwargs['round'] not in range(1, settings.NB_ROUNDS + 1) \
+                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
@@ -829,7 +831,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
+        column = 3 if kwargs['round'] == 1 else 5 if kwargs['round'] == 2 else 8
         row = worksheet.find(f"{participation.team.name} ({participation.team.trigram})", in_column=1).row
         worksheet.update_cell(row, column, new_diff)
 
@@ -975,7 +977,7 @@ class PoolUpdateView(VolunteerMixin, UpdateView):
 
 class SolutionsDownloadView(VolunteerMixin, View):
     """
-    Download all solutions or syntheses as a ZIP archive.
+    Download all solutions or written reviews as a ZIP archive.
     """
 
     def dispatch(self, request, *args, **kwargs):
@@ -1016,11 +1018,12 @@ 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()
-            syntheses = Synthesis.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 _("Syntheses of team {trigram}.zip")
+            filename = _("Solutions of team {trigram}.zip") if is_solution \
+                else _("Written reviews of team {trigram}.zip")
             filename = filename.format(trigram=team.trigram)
 
-            def prefix(s: Solution | Synthesis) -> str:
+            def prefix(s: Solution | WrittenReview) -> str:
                 return ""
         elif 'tournament_id' in kwargs:
             tournament = Tournament.objects.get(pk=kwargs["tournament_id"])
@@ -1033,11 +1036,12 @@ class SolutionsDownloadView(VolunteerMixin, View):
                     for sol in pool.solutions:
                         sol.pool = pool
                         solutions.append(sol)
-                syntheses = Synthesis.objects.filter(passage__pool__tournament=tournament).all()
+                written_reviews = WrittenReview.objects.filter(passage__pool__tournament=tournament).all()
-                filename = _("Solutions of {tournament}.zip") if is_solution else _("Syntheses of {tournament}.zip")
+                filename = _("Solutions of {tournament}.zip") if is_solution \
+                    else _("Written reviews of {tournament}.zip")
                 filename = filename.format(tournament=tournament.name)
 
-                def prefix(s: Solution | Synthesis) -> str:
+                def prefix(s: Solution | WrittenReview) -> str:
                     pool = s.pool if is_solution else s.passage.pool
                     p = f"Poule {pool.short_name}/"
                     if not is_solution:
@@ -1048,27 +1052,28 @@ class SolutionsDownloadView(VolunteerMixin, View):
                     solutions = Solution.objects.filter(participation__tournament=tournament).all()
                 else:
                     solutions = Solution.objects.filter(final_solution=True).all()
-                syntheses = Synthesis.objects.filter(passage__pool__tournament=tournament).all()
+                written_reviews = WrittenReview.objects.filter(passage__pool__tournament=tournament).all()
-                filename = _("Solutions of {tournament}.zip") if is_solution else _("Syntheses of {tournament}.zip")
+                filename = _("Solutions of {tournament}.zip") if is_solution \
+                    else _("Written reviews of {tournament}.zip")
                 filename = filename.format(tournament=tournament.name)
 
-                def prefix(s: Solution | Synthesis) -> str:
+                def prefix(s: Solution | WrittenReview) -> 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
-            syntheses = Synthesis.objects.filter(passage__pool=pool).all()
+            written_reviews = WrittenReview.objects.filter(passage__pool=pool).all()
             filename = _("Solutions for pool {pool} of tournament {tournament}.zip") \
-                if is_solution else _("Syntheses for pool {pool} of tournament {tournament}.zip")
+                if is_solution else _("Written reviews for pool {pool} of tournament {tournament}.zip")
             filename = filename.format(pool=pool.short_name,
                                        tournament=pool.tournament.name)
 
-            def prefix(s: Solution | Synthesis) -> str:
+            def prefix(s: Solution | WrittenReview) -> str:
                 return ""
 
         output = BytesIO()
         zf = ZipFile(output, "w")
-        for s in (solutions if is_solution else syntheses):
+        for s in (solutions if is_solution else written_reviews):
             if s.file.storage.exists(s.file.path):
                 zf.write("media/" + s.file.name, prefix(s) + f"{s}.pdf")
 
@@ -1254,7 +1259,7 @@ class PoolUploadNotesView(VolunteerMixin, FormView, DetailView):
             return self.form_invalid(form)
 
         for vr, notes in parsed_notes.items():
-            notes_count = 6
+            notes_count = 6 + (2 if pool.participations.count() >= 4 and settings.HAS_OBSERVER else 0)
             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)]
@@ -1289,8 +1294,11 @@ 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()
-        passage_width = 6
+        has_observer = self.object.participations.count() >= 4 and settings.HAS_OBSERVER
+        passage_width = 6 + (2 if has_observer else 0)
         line_length = pool_size * passage_width
 
         def getcol(number: int) -> str:
@@ -1475,78 +1483,95 @@ 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="Problème"))
+        problems_tc.addElement(P(text=_("Problem")))
         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=f"Problème {passage.solution_number}"))
+            tc.addElement(P(text=_("Problem #{problem}").format(problem=passage.solution_number)))
-            tc.setAttribute('numbercolumnsspanned', "6")
+            tc.setAttribute('numbercolumnsspanned', str(passage_width))
             header_pb.addElement(tc)
-            header_pb.addElement(CoveredTableCell(numbercolumnsrepeated=5))
+            header_pb.addElement(CoveredTableCell(numbercolumnsrepeated=passage_width - 1))
 
         # 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="Rôle"))
+        role_tc.addElement(P(text=_("Role")))
         role_tc.setAttribute('numbercolumnsspanned', "2")
         header_role.addElement(role_tc)
         header_role.addElement(CoveredTableCell())
         for i in range(pool_size):
-            defender_tc = TableCell(valuetype="string", stylename=title_style_left)
+            reporter_tc = TableCell(valuetype="string", stylename=title_style_left)
-            defender_tc.addElement(P(text="Défenseur⋅se"))
+            reporter_tc.addElement(P(text=_("Reporter")))
-            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="Opposant⋅e"))
-            opponent_tc.setAttribute('numbercolumnsspanned', "2")
-            header_role.addElement(opponent_tc)
-            header_role.addElement(CoveredTableCell())
-
-            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())
 
+            opponent_tc = TableCell(valuetype="string", stylename=title_style)
+            opponent_tc.addElement(P(text=_("Opponent")))
+            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)
+            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="Juré⋅e", stylename=title_style_botleft)
+        jury_tc = TableCell(valuetype="string", value=_("Juree"), stylename=title_style_botleft)
-        jury_tc.addElement(P(text="Juré⋅e"))
+        jury_tc.addElement(P(text=_("Juree")))
         jury_tc.setAttribute('numbercolumnsspanned', "2")
         header_notes.addElement(jury_tc)
         header_notes.addElement(CoveredTableCell())
 
         for i in range(pool_size):
-            defender_w_tc = TableCell(valuetype="string", stylename=title_style_botleft)
+            reporter_w_tc = TableCell(valuetype="string", stylename=title_style_botleft)
-            defender_w_tc.addElement(P(text="Écrit (/20)"))
+            reporter_w_tc.addElement(P(text=f"{_('Writing')} (/{20 if settings.TFJM_APP == 'TFJM' else 10})"))
-            header_notes.addElement(defender_w_tc)
+            header_notes.addElement(reporter_w_tc)
 
-            defender_o_tc = TableCell(valuetype="string", stylename=title_style_bot)
+            reporter_o_tc = TableCell(valuetype="string", stylename=title_style_bot)
-            defender_o_tc.addElement(P(text="Oral (/20)"))
+            reporter_o_tc.addElement(P(text=f"{_('Oral')} (/{20 if settings.TFJM_APP == 'TFJM' else 10})"))
-            header_notes.addElement(defender_o_tc)
+            header_notes.addElement(reporter_o_tc)
 
             opponent_w_tc = TableCell(valuetype="string", stylename=title_style_bot)
-            opponent_w_tc.addElement(P(text="Écrit (/10)"))
+            opponent_w_tc.addElement(P(text=f"{_('Writing')} (/10)"))
             header_notes.addElement(opponent_w_tc)
 
             opponent_o_tc = TableCell(valuetype="string", stylename=title_style_bot)
-            opponent_o_tc.addElement(P(text="Oral (/10)"))
+            opponent_o_tc.addElement(P(text=f"{_('Oral')} (/10)"))
             header_notes.addElement(opponent_o_tc)
 
-            reporter_w_tc = TableCell(valuetype="string", stylename=title_style_bot)
+            reviewer_w_tc = TableCell(valuetype="string", stylename=title_style_bot)
-            reporter_w_tc.addElement(P(text="Écrit (/10)"))
+            reviewer_w_tc.addElement(P(text=f"{_('Writing')} (/10)"))
-            header_notes.addElement(reporter_w_tc)
+            header_notes.addElement(reviewer_w_tc)
 
-            reporter_o_tc = TableCell(valuetype="string", stylename=title_style_botright)
+            reviewer_o_tc = TableCell(valuetype="string",
-            reporter_o_tc.addElement(P(text="Oral (/10)"))
+                                      stylename=title_style_bot if has_observer else title_style_botright)
-            header_notes.addElement(reporter_o_tc)
+            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)
 
         # Add a notation line for each jury
         for jury in self.object.juries.all():
@@ -1577,7 +1602,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="Moyenne"))
+        average_tc.addElement(P(text=_("Average")))
         average_tc.setAttribute('numbercolumnsspanned', "2")
         average_row.addElement(average_tc)
         average_row.addElement(CoveredTableCell())
@@ -1596,52 +1621,62 @@ 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():
-            defender_w_tc = TableCell(valuetype="float", value=1, stylename=style_left)
+            reporter_w_tc = TableCell(valuetype="float", value=passage.coeff_reporter_writing, stylename=style_left)
-            defender_w_tc.addElement(P(text="1"))
+            reporter_w_tc.addElement(P(text=str(passage.coeff_reporter_writing)))
-            coeff_row.addElement(defender_w_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=0.9, stylename=style)
-            opponent_w_tc.addElement(P(text="1"))
-            coeff_row.addElement(opponent_w_tc)
-
-            opponent_o_tc = TableCell(valuetype="float", value=2, stylename=style)
-            opponent_o_tc.addElement(P(text="2"))
-            coeff_row.addElement(opponent_o_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)
 
-            reporter_o_tc = TableCell(valuetype="float", value=1, stylename=style_right)
+            reporter_o_tc = TableCell(valuetype="float", value=passage.coeff_reporter_oral, stylename=style)
-            reporter_o_tc.addElement(P(text="1"))
+            reporter_o_tc.addElement(P(text=str(passage.coeff_reporter_oral)))
             coeff_row.addElement(reporter_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)))
+            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)))
+            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)
+
+            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)
+
         # 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="Sous-total"))
+        subtotal_tc.addElement(P(text=_("Subtotal")))
         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)
-            defender_tc = TableCell(valuetype="float", value=passage.average_defender, stylename=style_botleft)
+            reporter_tc = TableCell(valuetype="float", value=passage.average_reporter, stylename=style_botleft)
-            defender_tc.addElement(P(text=str(passage.average_defender)))
+            reporter_tc.addElement(P(text=str(passage.average_reporter)))
-            defender_tc.setAttribute('numbercolumnsspanned', "2")
+            reporter_tc.setAttribute('numbercolumnsspanned', "2")
-            defender_tc.setAttribute("formula", f"of:=[.{def_w_col}{max_row + 1}] * [.{def_w_col}{max_row + 2}]"
+            reporter_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(defender_tc)
+            subtotal_row.addElement(reporter_tc)
             subtotal_row.addElement(CoveredTableCell())
 
             opp_w_col = getcol(min_column + passage_width * i + 2)
@@ -1656,14 +1691,26 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
 
             rep_w_col = getcol(min_column + passage_width * i + 4)
             rep_o_col = getcol(min_column + passage_width * i + 5)
-            reporter_tc = TableCell(valuetype="float", value=passage.average_reporter, stylename=style_botright)
+            reviewer_tc = TableCell(valuetype="float", value=passage.average_reviewer,
-            reporter_tc.addElement(P(text=str(passage.average_reporter)))
+                                    stylename=style_bot if has_observer else style_botright)
-            reporter_tc.setAttribute('numbercolumnsspanned', "2")
+            reviewer_tc.addElement(P(text=str(passage.average_reviewer)))
-            reporter_tc.setAttribute("formula", f"of:=[.{rep_w_col}{max_row + 1}] * [.{rep_w_col}{max_row + 2}]"
+            reviewer_tc.setAttribute('numbercolumnsspanned', "2")
+            reviewer_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(reporter_tc)
+            subtotal_row.addElement(reviewer_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:
@@ -1681,17 +1728,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="Équipe"))
+            team_tc.addElement(P(text=_("Team")))
             team_tc.setAttribute('numbercolumnsspanned', "2")
             scores_header.addElement(team_tc)
             problem_tc = TableCell(valuetype="string", stylename=title_style_topbot)
-            problem_tc.addElement(P(text="Problème"))
+            problem_tc.addElement(P(text=_("Problem")))
             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="Rang"))
+            rank_tc.addElement(P(text=_("Rank")))
             scores_header.addElement(rank_tc)
 
             sorted_participations = sorted(self.object.participations.all(), key=lambda p: -self.object.average(p))
@@ -1701,36 +1748,42 @@ 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.defender.team.name} ({passage.defender.team.trigram})"))
+                team_tc.addElement(P(text=f"{passage.reporter.team.name} ({passage.reporter.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=f"Problème {passage.solution_number}"))
+                problem_tc.addElement(P(text=_("Problem #{problem}").format(problem=passage.solution_number)))
                 problem_tc.setAttribute("formula", f"of:=[.B{3 + passage_width * (passage.position - 1)}]")
                 team_row.addElement(problem_tc)
 
-                defender_pos = passage.position - 1
+                reporter_pos = passage.position - 1
-                opponent_pos = self.object.passages.get(opponent=passage.defender).position - 1
+                opponent_pos = self.object.passages.get(opponent=passage.reporter).position - 1
-                reporter_pos = self.object.passages.get(reporter=passage.defender).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
 
-                score_tc = TableCell(valuetype="float", value=self.object.average(passage.defender),
+                score_tc = TableCell(valuetype="float", value=self.object.average(passage.reporter),
                                      stylename=style_bot if passage.position == pool_size else style)
-                score_tc.addElement(P(text=self.object.average(passage.defender)))
+                score_tc.addElement(P(text=self.object.average(passage.reporter)))
                 formula = "of:="
-                formula += getcol(min_column + defender_pos * passage_width) + str(max_row + 3)  # Defender
+                formula += getcol(min_column + reporter_pos * passage_width) + str(max_row + 3)  # Reporter
                 formula += " + " + getcol(min_column + opponent_pos * passage_width + 2) + str(max_row + 3)  # Opponent
-                formula += " + " + getcol(min_column + reporter_pos * passage_width + 4) + str(max_row + 3)  # Reporter
+                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)
                 score_tc.setAttribute("formula", formula)
                 team_row.addElement(score_tc)
 
                 score_col = 'C'
-                rank_tc = TableCell(valuetype="float", value=sorted_participations.index(passage.defender) + 1,
+                rank_tc = TableCell(valuetype="float", value=sorted_participations.index(passage.reporter) + 1,
                                     stylename=style_botright if passage.position == pool_size else style_right)
-                rank_tc.addElement(P(text=str(sorted_participations.index(passage.defender) + 1)))
+                rank_tc.addElement(P(text=str(sorted_participations.index(passage.reporter) + 1)))
                 rank_tc.setAttribute("formula", f"of:=RANK([.{score_col}{max_row + 5 + passage.position}]; "
-                                                f"[.{score_col}${max_row + 6}]:[.{score_col}${max_row + 5 + pool_size}])")
+                                                f"[.{score_col}${max_row + 6}]:"
+                                                f"[.{score_col}${max_row + 5 + pool_size}])")
                 team_row.addElement(rank_tc)
 
         table.addElement(TableRow())
@@ -1755,8 +1808,8 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
 
         return FileResponse(streaming_content=open("/tmp/notes.ods", "rb"),
                             content_type="application/vnd.oasis.opendocument.spreadsheet",
-                            filename=f"Feuille de notes - {self.object.tournament.name} "
+                            filename=f"{_('Notation sheet')} - {self.object.tournament.name} "
-                                     f"- Poule {self.object.short_name}.ods")
+                                     f"- {_('Pool')} {self.object.short_name}.ods")
 
 
 class NotationSheetTemplateView(VolunteerMixin, DetailView):
@@ -1785,11 +1838,14 @@ 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 - 2010
+        context['tfjm_number'] = timezone.now().year - settings.FIRST_EDITION + 1
         return context
 
     def render_to_response(self, context, **response_kwargs):
-        tex = render_to_string(self.template_name, context=context, request=self.request)
+        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
+
+        template_name = self.get_template_names()[0]
+        tex = render_to_string(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)
@@ -1798,15 +1854,16 @@ class NotationSheetTemplateView(VolunteerMixin, DetailView):
         process.wait()
         return FileResponse(streaming_content=open(os.path.join(temp_dir, "texput.pdf"), "rb"),
                             content_type="application/pdf",
-                            filename=self.template_name.split("/")[-1][:-3] + "pdf")
+                            filename=template_name.split("/")[-1][:-3] + "pdf")
 
 
 class ScaleNotationSheetTemplateView(NotationSheetTemplateView):
-    template_name = 'participation/tex/bareme.tex'
+    def get_template_names(self):
+        return [f"participation/tex/scale_{settings.TFJM_APP.lower()}.tex"]
 
 
 class FinalNotationSheetTemplateView(NotationSheetTemplateView):
-    template_name = 'participation/tex/finale.tex'
+    template_name = "participation/tex/final_sheet.tex"
 
 
 class NotationSheetsArchiveView(VolunteerMixin, DetailView):
@@ -1838,6 +1895,8 @@ 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
@@ -1853,15 +1912,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 ['bareme', 'finale']:
+                for template_name in [f"scale_{settings.TFJM_APP.lower()}", "final_sheet"]:
                     juries = list(pool.juries.all()) + [None]
 
                     for jury in juries:
-                        if jury is not None and template_name == "bareme":
+                        if jury is not None and template_name.startswith("scale"):
                             continue
 
                         context = {'jury': jury, 'pool': pool,
-                                   'tfjm_number': timezone.now().year - 2010}
+                                   'tfjm_number': timezone.now().year - settings.FIRST_EDITION + 1}
 
                         passages = pool.passages.all()
                         context['passages'] = passages
@@ -1878,7 +1937,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 == "bareme" \
+                        sheet_name = f"Barème pour la poule {pool.short_name}" if template_name.startswith("scale") \
                             else (f"Feuille de notation pour la poule {pool.short_name}"
                                   f" - {str(jury) if jury else 'Vierge'}")
 
@@ -1931,7 +1990,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.defender, passage.opponent, passage.reporter]:
+                and reg.team.participation in [passage.reporter, passage.opponent, passage.reviewer, passage.observer]:
             return super().dispatch(request, *args, **kwargs)
         return self.handle_no_permission()
 
@@ -1952,12 +2011,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['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['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['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})"
 
         return context
 
@@ -1978,9 +2037,9 @@ class PassageUpdateView(VolunteerMixin, UpdateView):
         return self.handle_no_permission()
 
 
-class SynthesisUploadView(LoginRequiredMixin, FormView):
+class WrittenReviewUploadView(LoginRequiredMixin, FormView):
-    template_name = "participation/upload_synthesis.html"
+    template_name = "participation/upload_written_review.html"
-    form_class = SynthesisForm
+    form_class = WrittenReviewForm
 
     def dispatch(self, request, *args, **kwargs):
         if not request.user.is_authenticated or not request.user.registration.participates:
@@ -1992,7 +2051,8 @@ class SynthesisUploadView(LoginRequiredMixin, FormView):
         self.participation = self.request.user.registration.team.participation
         self.passage = qs.get()
 
-        if self.participation not in [self.passage.opponent, self.passage.reporter]:
+        if self.participation \
+                and self.participation not in [self.passage.opponent, self.passage.reviewer, self.passage.observer]:
             return self.handle_no_permission()
 
         return super().dispatch(request, *args, **kwargs)
@@ -2004,15 +2064,16 @@ class SynthesisUploadView(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
+        form_syn.type = 1 if self.participation == self.passage.opponent \
-        syn_qs = Synthesis.objects.filter(participation=self.participation,
+            else 2 if self.participation == self.passage.reviewer else 3
-                                          passage=self.passage,
+        syn_qs = WrittenReview.objects.filter(participation=self.participation,
-                                          type=form_syn.type).all()
+                                              passage=self.passage,
+                                              type=form_syn.type).all()
 
-        deadline = self.passage.pool.tournament.syntheses_first_phase_limit if self.passage.pool.round == 1 \
+        deadline = self.passage.pool.tournament.reviews_first_phase_limit if self.passage.pool.round == 1 \
-            else self.passage.pool.tournament.syntheses_second_phase_limit
+            else self.passage.pool.tournament.reviews_second_phase_limit
         if syn_qs.exists() and timezone.now() > deadline:
-            form.add_error(None, _("You can't upload a synthesis after the deadline."))
+            form.add_error(None, _("You can't upload a written review after the deadline."))
             return self.form_invalid(form)
 
         # Drop previous solution if existing
@@ -2046,12 +2107,14 @@ class NoteUpdateView(VolunteerMixin, UpdateView):
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
-        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['reporter_writing'].label += f" ({self.object.passage.reporter.team.trigram})"
         form.fields['reporter_oral'].label += f" ({self.object.passage.reporter.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})"
         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)
+    router.register(path + "/volunteers", VolunteersViewSet, basename="volunteers")

registration/forms.py

@@ -7,6 +7,8 @@ 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, \
@@ -36,6 +38,19 @@ 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

registration/management/commands/export_photo_authorizations.py

@@ -0,0 +1,37 @@
+# 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/models.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2020 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from datetime import date, datetime
+from datetime import date
 
 from django.conf import settings
 from django.contrib.sites.models import Site
@@ -774,7 +774,7 @@ class Payment(models.Model):
             return checkout_intent
 
         tournament = self.tournament
-        year = datetime.now().year
+        year = timezone.now().year
         base_site = "https://" + Site.objects.first().domain
         checkout_intent = helloasso.create_checkout_intent(
             amount=100 * self.amount,

registration/templates/registration/mails/add_organizer.html

@@ -9,29 +9,29 @@
 <body>
 
 <p>
-    Hi {{ user.registration }},
+    Bonjour {{ user.registration }},
 </p>
 
 <p>
-    You have been invited by {{ inviter.registration }} to join the ETEAM platform, available at
+    Vous avez été invités par {{ inviter.registration }} à rejoindre la plateforme du TFJM², accessible à l'adresse
-    <a href="https://{{ domain }}/">https://{{ domain }}/</a>. You have a volunteer account.
+    <a href="https://{{ domain }}/">https://{{ domain }}/</a>. Vous disposez d'un compte de bénévole.
 </p>
 
 <p>
-    A random password has been set: <strong>{{ password }}</strong>.
+    Un mot de passe aléatoire a été défini : <strong>{{ password }}</strong>.
-    For security reasons, please change it as soon as you log in the first time.
+    Par sécurité, merci de le changer dès votre connexion.
 </p>
 
 <p>
-    In the event of a problem, please contact us by e-mail at the following address
+    En cas de problème, merci de nous contacter soit par mail à l'adresse
-    <a href="mailto:eteam_moc@proton.me">eteam_moc@proton.me</a>.
+    <a href="mailto:contact@tfjm.org">contact@tfjm.org</a>.
 </p>
 
 <p>
-    Sincerely yours,
+    Bien cordialement,
 </p>
 
 --
 <p>
-    {% trans "The ETEAM team." %}<br>
+    {% trans "The TFJM² team." %}<br>
 </p>

registration/templates/registration/mails/add_organizer.txt

@@ -1,14 +1,17 @@
 {% load i18n %}
 
-Hi {{ user.registration }},
+Bonjour {{ user.registration }},
 
-You have been invited by {{ inviter.registration }} to join the ETEAM platform, available at https://{{ domain }}. You have a volunteer account.
+Vous avez été invités par {{ inviter.registration }} à rejoindre la plateforme du TFJM², accessible à l'adresse
-A random password has been set: {{ password }}.
+https://{{ domain }}/. Vous disposez d'un compte de bénévole.
-For security reasons, please change it as soon as you log in the first time.
 
-In the event of a problem, please contact us by e-mail at the following address eteam_moc@proton.me.
+Un mot de passe aléatoire a été défini : {{ password }}.
+Par sécurité, merci de le changer dès votre connexion.
 
-Sincerely yours,
+En cas de problème, merci de nous contacter soit par mail à l'adresse contact@tfjm.org, soit sur la plateforme
+de chat accessible sur https://element.tfjm.org/ en vous connectant avec les mêmes identifiants.
+
+Bien cordialement,
 
 --
-{% trans "The ETEAM team." %}
+{% trans "The TFJM² team." %}

registration/templates/registration/mails/email_validation_email.html

@@ -13,7 +13,7 @@
 </p>
 
 <p>
-    {% trans "You recently registered on the ETEAM platform. Please click on the link below to confirm your registration." %}
+    {% trans "You recently registered on the TFJM² platform. Please click on the link below to confirm your registration." %}
 </p>
 
 <p>
@@ -36,5 +36,5 @@
 
 --
 <p>
-    {% trans "The ETEAM team." %}<br>
+    {% trans "The TFJM² team." %}<br>
 </p>

registration/templates/registration/mails/email_validation_email.txt

@@ -2,7 +2,7 @@
 
 {% trans "Hi" %} {{ user.registration }},
 
-{% trans "You recently registered on the ETEAM platform. Please click on the link below to confirm your registration." %}
+{% trans "You recently registered on the TFJM² platform. Please click on the link below to confirm your registration." %}
 
 https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %}
 
@@ -12,4 +12,4 @@ https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=toke
 
 {% trans "Thanks" %},
 
-{% trans "The ETEAM team." %}
+{% trans "The TFJM² team." %}

registration/templates/registration/mails/payment_confirmation.html

@@ -14,7 +14,7 @@
 
 <p>
     {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %}
-        We successfully received the payment of {{ amount }} € for your participation for the ETEAM in the team {{ team }}!
+        We successfully received the payment of {{ amount }} € for your participation for the TFJM² in the team {{ team }} for the tournament {{ tournament }}!
     {% endblocktrans %}
 </p>
 
@@ -32,13 +32,17 @@
     </ul>
 </p>
 
+<p>
+    {% trans "Please note that these dates may be subject to change. If your local organizers gave you different dates, trust them." %}
+</p>
+
 <p>
     {% trans "NB: This mail don't represent a payment receipt. The payer should receive a mail from Hello Asso. If it is not the case, please contact us if necessary" %}
 </p>
 
 --
 <p>
-    {% trans "The ETEAM team." %}<br>
+    {% trans "The TFJM² team." %}<br>
 </p>
 </body>
 </html>

registration/templates/registration/mails/payment_confirmation.txt

@@ -2,7 +2,7 @@
 {% trans "Hi" %} {{ registration|safe }},
 
 {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament.name %}
-We successfully received the payment of {{ amount }} € for your participation for the ETEAM in the team {{ team }}!
+We successfully received the payment of {{ amount }} € for your participation for the TFJM² in the team {{ team }} for the tournament {{ tournament }}!
 {% endblocktrans %}
 
 {% trans "Your registration is now fully completed, and you can work on your solutions." %}
@@ -13,8 +13,10 @@ We successfully received the payment of {{ amount }} € for your participation
 * {% trans "Problems draw:" %} {{ payment.tournament.solutions_draw|date }}
 * {% trans "Tournament dates:" %} {% trans "From" %} {{ payment.tournament.date_start|date }} {% trans "to" %} {{ payment.tournament.date_end|date }}
 
+{% trans "Please note that these dates may be subject to change. If your local organizers gave you different dates, trust them." %}
+
 {% trans "NB: This mail don't represent a payment receipt. The payer should receive a mail from Hello Asso. If it is not the case, please contact us if necessary" %}
 
 --
-{% trans "The ETEAM team" %}
+{% trans "The TFJM² team" %}
 

registration/templates/registration/mails/payment_reminder.html

@@ -14,7 +14,7 @@
 
 <p>
     {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %}
-    You are registered for the ETEAM. Your team {{ team }} has been successfully validated.
+    You are registered for the TFJM² of {{ tournament }}. Your team {{ team }} has been successfully validated.
     To end your inscription, you must pay the amount of {{ amount }} €.
     {% endblocktrans %}
 </p>
@@ -49,7 +49,7 @@
 
 --
 <p>
-    {% trans "The ETEAM team." %}<br>
+    {% trans "The TFJM² team." %}<br>
 </p>
 </body>
 </html>

registration/templates/registration/mails/payment_reminder.txt

@@ -2,7 +2,7 @@
 {% trans "Hi" %} {{ registration|safe }},
 
 {% blocktrans trimmed with amount=payment.amount team=payment.team.trigram tournament=payment.tournament %}
-You are registered for the ETEAM. Your team {{ team }} has been successfully validated.
+You are registered for the TFJM² of {{ tournament }}. Your team {{ team }} has been successfully validated.
 To end your inscription, you must pay the amount of {{ amount }} €.
 {% endblocktrans %}
 {% if payment.grouped %}
@@ -19,4 +19,4 @@ https://{{ domain }}{% url "registration:update_payment" pk=payment.pk %}
 {% trans "If you have any problem, feel free to contact us." %}
 
 --
-The ETEAM team
+The TFJM² team

registration/templates/registration/signup.html

@@ -9,30 +9,42 @@
 {% endblock %}
 
 {% block content %}
-    <h2>{% trans "Sign up" %}</h2>
+    {% now "c" as now %}
-
+    {% if now < TFJM.REGISTRATION_DATES.open.isoformat %}
-    <form method="post">
+        <div class="alert alert-warning">
-        {% csrf_token %}
+            {% trans "Thank you for your great interest, but registrations are not opened yet!" %}
-        {{ form|crispy }}
+            {% trans "They will open on:" %} {{ TFJM.REGISTRATION_DATES.open|date:'DATETIME_FORMAT' }}.
-        <div id="registration_form"></div>
+            {% trans "Please come back at this time to register!" %}
-
-        <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 %}
-        <button class="btn btn-success" type="submit">
+        <div class="alert alert-danger">
-            {% trans "Sign up" %}
+            {% trans "Registrations are closed for this year. We hope to see you next year!" %}
-        </button>
+            {% trans "If needed, you can contact us by mail." %}
-    </form>
+        </div>
-
+    {% else %}
-    <div id="student_registration_form" class="d-none">
+        <form method="post">
-        {{ student_registration_form|crispy }}
+            {% csrf_token %}
-    </div>
+            {{ form|crispy }}
-    <div id="coach_registration_form" class="d-none">
+            <div id="registration_form"></div>
-        {{ coach_registration_form|crispy }}
+    
-    </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 %}
 {% endblock %}
 
 {% block extrajavascript %}

registration/templates/registration/tex/Autorisation_droit_image_majeur.tex

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

registration/templates/registration/tex/Autorisation_droit_image_mineur.tex

@@ -17,6 +17,7 @@
 
 % Specials
 \newcommand{\writingsep}{\vrule height 4ex width 0pt}
+\newcommand{\cdt}{\kern-0.5pt\ensuremath\cdot\kern-0.5pt}
 
 % Page formating
 \hoffset -1in
@@ -57,20 +58,25 @@ Autorisation d'enregistrement et de diffusion de l'image
 
 
 
-Je soussign\'e  \dotfill (p\`ere, m\`ere, responsable l\'egal) \\
+Je soussign\'e\cdt{}e  \dotfill (p\`ere, m\`ere, responsable l\'egal) \\
-agissant en qualit\'e de repr\'esentant de {{ registration|safe|default:"\dotfill" }}\\
+agissant en qualit\'e de repr\'esentant\cdt{}e 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$ de {{ tournament.name }}
+ \fbox{\textcolor{white}{A}}  Autorise l'association Animath, \`a l'occasion du $\mathbb{TFJM}^2$
- du {{ tournament.date_start }} au {{ tournament.date_end }} à : {{ tournament.place }}, \`a photographier ou \`a filmer
+ {% if tournament.unified_registration %} dans
- 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
+ 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)
- partenaires. D\'eclare c\'eder \`a titre gracieux \`a Animath le droit d’utiliser l'image de l'enfant sur tous ses
+ {% else %} de
- supports d'information : brochures, sites web, r\'eseaux sociaux. Animath devient, par la pr\'esente, cessionnaire des
+ {{ tournament.name }} du {{ tournament.date_start }} au {{ tournament.date_end }} à : {{ tournament.place }},
- droits pendant toute la dur\'ee pour laquelle ont \'et\'e acquis les droits d'auteur de ces photographies.\\
+ {% 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.\\
  
 \medskip
 Animath s'engage, conform\'ement aux dispositions l\'egales en vigueur relatives au droit \`a l'image, \`a ce que la
@@ -100,14 +106,14 @@ Animath, IHP, 11 rue Pierre et Marie Curie, 75231 Paris cedex 05.\\
  
  \bigskip
 
-Signatures pr\'ec\'ed\'ees de la mention \og lu et approuv\'e \fg{}
+Signatures pr\'ec\'ed\'ees de la mention « lu et approuv\'e »
 
 \medskip
 
 
 \begin{minipage}[c]{0.5\textwidth}
 
-\underline{Le responsable l\'egal :}\\
+\underline{La/le responsable l\'egal\cdt{}e :}\\
 
 Fait \`a  :\\
 le :

registration/templates/registration/tex/Autorisation_parentale.tex

@@ -17,6 +17,7 @@
 
 % Specials
 \newcommand{\writingsep}{\vrule height 4ex width 0pt}
+\newcommand{\cdt}{\kern-0.5pt\ensuremath\cdot\kern-0.5pt}
 
 % Page formating
 \hoffset -1in
@@ -45,16 +46,25 @@
 \Large \bf Autorisation parentale pour les mineurs ({{ tournament.name }})
 \end{center}
 
-Je soussigné(e) \hrulefill,\\
+Je soussigné\cdt{}e \hrulefill,\\
-responsable légal, demeurant \writingsep\hrulefill\\
+responsable légal\cdt{}e, demeurant \writingsep\hrulefill\\
 \writingsep\hrulefill,\\
 \writingsep autorise {{ registration|default:"\hrulefill" }},\\
-né(e) le {{ registration.birth_date }},
+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$) organisé \`a :
+à 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 :
 {{ 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 représentant légal.
+ses propres moyens et sous la responsabilité du/de la représentant\cdt{}e légal\cdt{}e.
 
 
 

registration/tests.py

@@ -1,14 +1,17 @@
 # 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 TestCase
+from django.test import override_settings, 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
@@ -114,6 +117,9 @@ 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.
@@ -223,6 +229,52 @@ 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

registration/views.py

@@ -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, Synthesis, Tournament
+from participation.models import Passage, Solution, Tournament, WrittenReview
 from tfjm.tokens import email_validation_token
 from tfjm.views import UserMixin, UserRegistrationMixin, VolunteerMixin
 
@@ -436,8 +436,8 @@ 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.TFJM_APP == "ETEAM":
+        elif settings.SINGLE_TOURNAMENT:
-            # One single tournament
+            # One single tournament (for ETEAM)
             context["tournament"] = Tournament.objects.first()
         else:
             raise PermissionDenied("Merci d'indiquer un tournoi.")
@@ -836,11 +836,12 @@ class SolutionView(LoginRequiredMixin, View):
             raise Http404
         solution = Solution.objects.get(file__endswith=filename)
         user = request.user
-        if user.registration.participates:
+        if user.registration.participates and user.registration.team.participation:
-            passage_participant_qs = Passage.objects.filter(Q(defender=user.registration.team.participation)
+            passage_participant_qs = Passage.objects.filter(Q(reporter=user.registration.team.participation)
                                                             | Q(opponent=user.registration.team.participation)
-                                                            | Q(reporter=user.registration.team.participation),
+                                                            | Q(reviewer=user.registration.team.participation)
-                                                            defender=solution.participation,
+                                                            | Q(observer=user.registration.team.participation),
+                                                            reporter=solution.participation,
                                                             solution_number=solution.problem)
         else:
             passage_participant_qs = Passage.objects.none()
@@ -852,7 +853,7 @@ 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()),
-                                           defender=solution.participation,
+                                           reporter=solution.participation,
                                            solution_number=solution.problem).exists()
                 or user.registration.participates and user.registration.team
                 and (solution.participation.team == user.registration.team or
@@ -870,30 +871,30 @@ class SolutionView(LoginRequiredMixin, View):
         return FileResponse(open(path, "rb"), content_type=mime_type, filename=true_file_name)
 
 
-class SynthesisView(LoginRequiredMixin, View):
+class WrittenReviewView(LoginRequiredMixin, View):
     """
-    Display the sent synthesis.
+    Display the sent written reviews.
     """
 
     def get(self, request, *args, **kwargs):
         filename = kwargs["filename"]
-        path = f"media/syntheses/{filename}"
+        path = f"media/reviews/{filename}"
         if not os.path.exists(path):
             raise Http404
-        synthesis = Synthesis.objects.get(file__endswith=filename)
+        review = WrittenReview.objects.get(file__endswith=filename)
         user = request.user
         if not (user.registration.is_admin or user.registration.is_volunteer
-                and (user.registration in synthesis.passage.pool.juries.all()
+                and (user.registration in review.passage.pool.juries.all()
-                     or user.registration in synthesis.passage.pool.tournament.organizers.all()
+                     or user.registration in review.passage.pool.tournament.organizers.all()
-                     or user.registration.pools_presided.filter(tournament=synthesis.passage.pool.tournament).exists())
+                     or user.registration.pools_presided.filter(tournament=review.passage.pool.tournament).exists())
-                or user.registration.participates and user.registration.team == synthesis.participation.team):
+                or user.registration.participates and user.registration.team == review.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(synthesis) + f".{ext}"
+        true_file_name = str(review) + f".{ext}"
         return FileResponse(open(path, "rb"), content_type=mime_type, filename=true_file_name)
 
 

requirements.txt

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

tfjm/context_processors.py

@@ -10,13 +10,21 @@ def tfjm_context(request):
         '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,
-            'SINGLE_TOURNAMENT':
+            'RECOMMENDED_SOLUTIONS_COUNT': settings.RECOMMENDED_SOLUTIONS_COUNT,
-                Tournament.objects.first() if Tournament.objects.exists() and settings.TFJM_APP else None,
+            '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

@@ -13,6 +13,7 @@ For the full list of settings and their values, see
 https://docs.djangoproject.com/en/5.0/ref/settings/
 """
 
+from datetime import datetime
 import os
 import sys
 
@@ -195,7 +196,14 @@ STATICFILES_DIRS = [
 
 STATIC_ROOT = os.path.join(BASE_DIR, "static")
 
-STATICFILES_STORAGE = 'pipeline.storage.PipelineStorage'
+STORAGES = {
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+    'staticfiles': {
+        'BACKEND': 'pipeline.storage.PipelineStorage',
+    },
+}
 
 STATICFILES_FINDERS = (
     'django.contrib.staticfiles.finders.FileSystemFinder',
@@ -262,7 +270,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_psycopg2',
+            'ENGINE': 'django.db.backends.mysql' if _db_type == 'mysql' else 'django.db.backends.postgresql',
             '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'),
@@ -351,12 +359,24 @@ if TFJM_APP == "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",
@@ -374,12 +394,24 @@ elif TFJM_APP == "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",

tfjm/static/eteam/Written_review.tex

@@ -0,0 +1,196 @@
+\documentclass{article}
+
+\usepackage[utf8]{inputenc}
+\usepackage[english]{babel}
+\usepackage{graphicx}
+
+\usepackage[margin=2cm]{geometry} % marges
+
+\usepackage{amsthm}
+\usepackage{amsmath}
+\usepackage{amsfonts}
+\usepackage{amssymb}
+
+\title{Note de synthèse}
+
+\begin{document}
+\pagestyle{empty}
+
+\begin{center}
+\begin{Huge}
+ETEAM
+\end{Huge}
+
+\bigskip
+
+\begin{Large}
+WRITTEN REVIEW
+\end{Large}
+\end{center}
+
+Round \underline{~~~~} pool \underline{~~~~}
+
+\medskip
+
+Problem \underline{~~~~} reported by team \underline{~~~~~~~~~~~~~~~~~~~~~~~~~~~~}
+
+\medskip
+
+Written review of the team \underline{~~~~~~~~~~~~~~~~~~~~~~~~~~~~} in the role of : ~ $\square$ Opponent ~ $\square$ Reviewer ~ $\square$ Observer
+
+\section*{Evaluation, question by question, of the solution}
+
+Note: it is possible to tick between the boxes for an intermediate case.
+
+\medskip
+
+\noindent
+ \begin{tabular}{|c|c|c|c|c|c|}
+	\hline
+    Question & ER & ~PA~ & ~SE~ & NA  \\
+    \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+ \end{tabular}
+ \begin{tabular}{|c|c|c|c|c|c|}
+	\hline
+    Question & ER & ~PA~ & ~SE~ & NA  \\
+    \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+     & & & & \\
+     \hline
+ \end{tabular}
+\hfill
+\begin{minipage}{0.27\textwidth}
+ER : entirely resolved, nor error, nor mathematical lack
+
+\smallskip
+
+PA : partially answered
+
+\smallskip
+
+SE : some elements of answer
+
+\smallskip
+
+NA : not addressed
+
+\bigskip
+
+\end{minipage}
+
+
+\section*{Qualitative evaluation of the solution}
+
+Give your opinion regarding the solution. In particular, highlight the positive points (important, original
+ideas, etc.) and specify what could have improved the solution.
+
+\vfill
+
+\begin{center}
+\textbf{General evaluation of the solution:} ~ $\square$ Excellent ~ $\square$ Good ~ $\square$ Suffisant ~ $\square$ Average ~ $\square$ Poor
+\end{center}
+
+
+\newpage
+
+\section*{Errors and inaccuracies}
+
+List below in descending order of importance no more than four errors and/or inaccuracies in your opinion, specifying
+the question concerned, the page, the paragraph and the type of remark.
+
+\medskip
+
+1. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~}
+
+$\square$ Major mistake ~ $\square$ Minor mistake ~ $\square$ Inaccuracy ~ $\square$ Other: \underline{~~~~~~~~}
+
+Description :
+
+\vfill
+
+2. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~}
+
+$\square$ Major mistake ~ $\square$ Minor mistake ~ $\square$ Inaccuracy ~ $\square$ Other: \underline{~~~~~~~~}
+
+Description :
+
+\vfill
+
+3. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~}
+
+$\square$ Major mistake ~ $\square$ Minor mistake ~ $\square$ Inaccuracy ~ $\square$ Other: \underline{~~~~~~~~}
+
+Description :
+
+\vfill
+
+4. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~}
+
+$\square$ Major mistake ~ $\square$ Minor mistake ~ $\square$ Inaccuracy ~ $\square$ Other: \underline{~~~~~~~~}
+
+Description :
+
+\vfill
+
+
+\section*{Positive aspects}
+
+Identify at most two strong points of the solution and say why (examples: relevant propositions, important ideas,
+relevant generalizations, significant examples, original constructions, etc.).
+
+\medskip
+
+1. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~}
+
+Description :
+
+\vfill
+
+2. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~}
+
+Description :
+
+\vfill
+
+\section*{Other remarks (optional)}
+
+Give your opinion regarding the presentation of the solution (readability, etc.).
+
+\vfill
+
+
+
+\end{document}

tfjm/templates/base.html

@@ -94,8 +94,10 @@
 
 {% javascript 'main' %}
 
+{{ TFJM|json_script:'TFJM_settings' }}
+
 <script>
-    CSRF_TOKEN = "{{ csrf_token }}";
+    const CSRF_TOKEN = "{{ csrf_token }}"
     document.querySelectorAll(".invalid-feedback").forEach(elem => elem.classList.add('d-block'))
 
     document.addEventListener('DOMContentLoaded', () => {

tfjm/templates/index_tfjm.html

@@ -30,6 +30,15 @@
         </div>
     </div>
 
+    <div class="alert alert-warning">
+        <h3 class="alert-heading"><i class="fas fa-warning"></i> {% trans "New in 2025" %}</h3>
+        {% blocktrans trimmed %}
+        Registration for Ile-de-France tournaments is now unified.
+        If you live in or near the Ile-de-France region, your registration will be pooled with each of the region's tournaments,
+        and the organizers will take care of team allocation. However, date constraints can be indicated in the motivation letter.
+        {% endblocktrans %}
+    </div>
+
     <div class="jumbotron p-5 border rounded-5">
         <h5 class="display-4">{% trans "How does it work?" %}</h5>
         <p>

tfjm/templates/navbar.html

@@ -2,10 +2,8 @@
 
 <nav class="navbar navbar-expand-lg fixed-navbar shadow-sm">
     <div class="container-fluid">
-    {# TODO ETEAM Plus d'uniformité #}
+    <a class="navbar-brand" href="{{ TFJM.HOME_PAGE_LINK }}">
-    <a class="navbar-brand" href="https://eteam.tfjm.org/">
+        <img src="{% static TFJM.LOGO_PATH %}" style="height: 2em;" alt="Logo {{ TFJM.APP_NAME }}" id="navbar-logo">
-        {# TODO ETEAM Plus d'uniformité #}
-        <img src="{% static "tfjm/img/eteam.png" %}" style="height: 2em;" alt="Logo ETEAM" id="navbar-logo">
     </a>
     <button class="navbar-toggler" type="button" data-bs-toggle="collapse"
             data-bs-target="#navbarNavDropdown"
@@ -20,7 +18,7 @@
             </li>
             <li class="nav-item active">
                 {% if TFJM.SINGLE_TOURNAMENT %}
-                    <a href="{% url 'participation:tournament_detail' pk=TFJM.SINGLE_TOURNAMENT.pk %}" class="nav-link">
+                    <a href="{% url 'participation:tournament_detail' pk=TFJM_TOURNAMENT.pk %}" class="nav-link">
                         <i class="fas fa-calendar-day"></i> {% trans "Tournament" %}
                     </a>
                 {% else %}
@@ -98,9 +96,12 @@
                 </li>
             {% endif %}
             {% if not user.is_authenticated %}
-                <li class="nav-item active">
+                {% now "c" as now %}
-                    <a class="nav-link" href="{% url "registration:signup" %}"><i class="fas fa-user-plus"></i> {% trans "Register" %}</a>
+                {% if TFJM.REGISTRATION_DATES.open.isoformat <= now and now <= TFJM.REGISTRATION_DATES.close.isoformat %}
-                </li>
+                    <li class="nav-item active">
+                        <a class="nav-link" href="{% url "registration:signup" %}"><i class="fas fa-user-plus"></i> {% trans "Register" %}</a>
+                    </li>
+                {% endif %}
                 <li class="nav-item active">
                     <a class="nav-link" href="#" data-bs-toggle="modal" data-bs-target="#loginModal">
                         <i class="fas fa-sign-in-alt"></i> {% trans "Log in" %}

tfjm/urls.py

@@ -18,18 +18,17 @@ Including another URLconf
 """
 from django.conf import settings
 from django.contrib import admin
-from django.utils.translation import gettext_lazy as _
 from django.urls import include, path
+from django.utils.translation import gettext_lazy as _
 from django.views.defaults import bad_request, page_not_found, permission_denied, server_error
 from django.views.generic import TemplateView
 from participation.views import MotivationLetterView
 from registration.views import HealthSheetView, ParentalAuthorizationView, PhotoAuthorizationView, \
-    ReceiptView, SolutionView, SynthesisView, VaccineSheetView
+    ReceiptView, SolutionView, VaccineSheetView, WrittenReviewView
 
 from .views import AdminSearchView
 
 urlpatterns = [
-    # TODO ETEAM Rendre ça plus joli
     path('', TemplateView.as_view(template_name=f"index_{settings.TFJM_APP.lower()}.html",
                                   extra_context={'title': _("Home")}),
          name='index'),
@@ -61,8 +60,8 @@ urlpatterns = [
 
     path('media/solutions/<str:filename>/', SolutionView.as_view(),
          name='solution'),
-    path('media/syntheses/<str:filename>/', SynthesisView.as_view(),
+    path('media/reviews/<str:filename>/', WrittenReviewView.as_view(),
-         name='synthesis'),
+         name='reviews'),
 ]
 
 if settings.DEBUG:

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
-    py311
     py312
+    py313
 
     linters
 skipsdist = True