locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TFJM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-29 19:18+0100\n"
+"POT-Creation-Date: 2024-03-27 00:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emmy D'Anello <emmy.danello@animath.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -214,17 +214,17 @@ msgid "Pool {letter}{number}"
 msgstr "Poule {letter}{number}"
 
 #: draw/models.py:408 draw/models.py:435 participation/admin.py:136
-#: participation/admin.py:155 participation/models.py:601
+#: participation/admin.py:155 participation/models.py:597
-#: participation/models.py:610 participation/tables.py:84
+#: participation/models.py:606 participation/tables.py:84
 msgid "pool"
 msgstr "poule"
 
-#: draw/models.py:409 participation/models.py:602
+#: draw/models.py:409 participation/models.py:598
 msgid "pools"
 msgstr "poules"
 
-#: draw/models.py:421 participation/models.py:503 participation/models.py:771
+#: draw/models.py:421 participation/models.py:503 participation/models.py:767
-#: participation/models.py:801 participation/models.py:843
+#: participation/models.py:797 participation/models.py:839
 msgid "participation"
 msgstr "participation"
 
@@ -248,8 +248,8 @@ msgid ""
 msgstr ""
 "L'ordre de choix dans la poule, entre 0 et la taille de la poule moins 1."
 
-#: draw/models.py:458 draw/models.py:481 participation/models.py:624
+#: draw/models.py:458 draw/models.py:481 participation/models.py:620
-#: participation/models.py:808
+#: participation/models.py:804
 #, python-brace-format
 msgid "Problem #{problem}"
 msgstr "Problème n°{problem}"
@@ -344,8 +344,8 @@ msgstr "équipe"
 #: draw/templates/draw/tournament_content.html:228
 #: draw/templates/draw/tournament_content.html:229
 #: draw/templates/draw/tournament_content.html:230
-#: participation/templates/participation/pool_detail.html:85
+#: participation/templates/participation/pool_detail.html:84
-#: participation/templates/participation/pool_detail.html:89
+#: participation/templates/participation/pool_detail.html:88
 #: participation/templates/participation/pool_detail.html:94
 #: participation/templates/participation/pool_detail.html:98
 msgid "Room"
@@ -456,21 +456,21 @@ msgid "selected for final"
 msgstr "sélectionnée pour la finale"
 
 #: participation/admin.py:124 participation/admin.py:183
-#: participation/models.py:631 participation/tables.py:112
+#: participation/models.py:627 participation/tables.py:112
 msgid "defender"
 msgstr "défenseur⋅se"
 
-#: participation/admin.py:128 participation/models.py:638
+#: participation/admin.py:128 participation/models.py:634
-#: participation/models.py:855
+#: participation/models.py:851
 msgid "opponent"
 msgstr "opposant⋅e"
 
-#: participation/admin.py:132 participation/models.py:645
+#: participation/admin.py:132 participation/models.py:641
-#: participation/models.py:856
+#: participation/models.py:852
 msgid "reporter"
 msgstr "rapporteur⋅e"
 
-#: participation/admin.py:187 participation/models.py:806
+#: participation/admin.py:187 participation/models.py:802
 msgid "problem"
 msgstr "numéro de problème"
 
@@ -529,7 +529,7 @@ msgid "The PDF file must not have more than 30 pages."
 msgstr "Le fichier PDF ne doit pas avoir plus de 30 pages."
 
 #: participation/forms.py:236
-#: participation/templates/participation/pool_detail.html:130
+#: participation/templates/participation/pool_detail.html:123
 msgid "Add"
 msgstr "Ajouter"
 
@@ -888,32 +888,32 @@ msgstr ""
 "Ils restent toujours accessibles pour vous. Seules les moyennes sont "
 "communiquées."
 
-#: participation/models.py:591
+#: participation/models.py:587
 msgid "The president of the jury must be part of the jury."
 msgstr "Læ président⋅e du jury doit faire partie du jury."
 
-#: participation/models.py:595
+#: participation/models.py:591
 #, python-brace-format
 msgid "Pool of day {round} for tournament {tournament} with teams {teams}"
 msgstr "Poule du jour {round} du tournoi {tournament} avec les équipes {teams}"
 
-#: participation/models.py:615
+#: participation/models.py:611
 msgid "position"
 msgstr "position"
 
-#: participation/models.py:622
+#: participation/models.py:618
 msgid "defended solution"
 msgstr "solution défendue"
 
-#: participation/models.py:655
+#: participation/models.py:651
 msgid "observer"
 msgstr "observateur⋅rice"
 
-#: participation/models.py:660
+#: participation/models.py:656
 msgid "penalties"
 msgstr "pénalités"
 
-#: participation/models.py:662
+#: participation/models.py:658
 msgid ""
 "Number of penalties for the defender. The defender will loose a 0.5 "
 "coefficient per penalty."
@@ -921,124 +921,124 @@ msgstr ""
 "Nombre de pénalités pour l'équipe défenseuse. Elle perd un coefficient 0.5 "
 "sur sa présentation orale par pénalité."
 
-#: participation/models.py:738 participation/models.py:741
+#: participation/models.py:734 participation/models.py:737
-#: participation/models.py:744 participation/models.py:747
+#: participation/models.py:740 participation/models.py:743
 #, python-brace-format
 msgid "Team {trigram} is not registered in the pool."
 msgstr "L'équipe {trigram} n'est pas inscrite dans la poule."
 
-#: participation/models.py:752
+#: participation/models.py:748
 #, python-brace-format
 msgid "Passage of {defender} for problem {problem}"
 msgstr "Passage de {defender} pour le problème {problem}"
 
-#: participation/models.py:756 participation/models.py:765
+#: participation/models.py:752 participation/models.py:761
-#: participation/models.py:850 participation/models.py:892
+#: participation/models.py:846 participation/models.py:888
 msgid "passage"
 msgstr "passage"
 
-#: participation/models.py:757
+#: participation/models.py:753
 msgid "passages"
 msgstr "passages"
 
-#: participation/models.py:776
+#: participation/models.py:772
 msgid "difference"
 msgstr "différence"
 
-#: participation/models.py:777
+#: participation/models.py:773
 msgid "Score to add/remove on the final score"
 msgstr "Score à ajouter/retrancher au score final"
 
-#: participation/models.py:784
+#: participation/models.py:780
 msgid "tweak"
 msgstr "harmonisation"
 
-#: participation/models.py:785
+#: participation/models.py:781
 msgid "tweaks"
 msgstr "harmonisations"
 
-#: participation/models.py:813
+#: participation/models.py:809
 msgid "solution for the final tournament"
 msgstr "solution pour la finale"
 
-#: participation/models.py:818 participation/models.py:861
+#: participation/models.py:814 participation/models.py:857
 msgid "file"
 msgstr "fichier"
 
-#: participation/models.py:828
+#: participation/models.py:824
 #, python-brace-format
 msgid "Solution of team {team} for problem {problem}"
 msgstr "Solution de l'équipe {team} pour le problème {problem}"
 
-#: participation/models.py:830
+#: participation/models.py:826
 msgid "for final"
 msgstr "pour la finale"
 
-#: participation/models.py:833
+#: participation/models.py:829
 msgid "solution"
 msgstr "solution"
 
-#: participation/models.py:834
+#: participation/models.py:830
 msgid "solutions"
 msgstr "solutions"
 
-#: participation/models.py:867
+#: participation/models.py:863
 #, python-brace-format
 msgid "Synthesis of {team} as {type} for problem {problem} of {defender}"
 msgstr ""
 "Note de synthèse de l'équipe {team} en tant que {type} pour le problème "
 "{problem} de {defender}"
 
-#: participation/models.py:875
+#: participation/models.py:871
 msgid "synthesis"
 msgstr "note de synthèse"
 
-#: participation/models.py:876
+#: participation/models.py:872
 msgid "syntheses"
 msgstr "notes de synthèse"
 
-#: participation/models.py:885
+#: participation/models.py:881
 msgid "jury"
 msgstr "jury"
 
-#: participation/models.py:897
+#: participation/models.py:893
 msgid "defender writing note"
 msgstr "note d'écrit de la défense"
 
-#: participation/models.py:903
+#: participation/models.py:899
 msgid "defender oral note"
 msgstr "note d'oral de la défense"
 
-#: participation/models.py:909
+#: participation/models.py:905
 msgid "opponent writing note"
 msgstr "note d'écrit de l'opposition"
 
-#: participation/models.py:915
+#: participation/models.py:911
 msgid "opponent oral note"
 msgstr "note d'oral de l'opposition"
 
-#: participation/models.py:921
+#: participation/models.py:917
 msgid "reporter writing note"
 msgstr "note d'écrit du rapportage"
 
-#: participation/models.py:927
+#: participation/models.py:923
 msgid "reporter oral note"
 msgstr "note d'oral du rapportage"
 
-#: participation/models.py:933
+#: participation/models.py:929
 msgid "observer note"
 msgstr "note de l'observation"
 
-#: participation/models.py:969
+#: participation/models.py:965
 #, python-brace-format
 msgid "Notes of {jury} for {passage}"
 msgstr "Notes de {jury} pour le {passage}"
 
-#: participation/models.py:972
+#: participation/models.py:968
 msgid "note"
 msgstr "note"
 
-#: participation/models.py:973
+#: participation/models.py:969
 msgid "notes"
 msgstr "notes"
 
@@ -1073,13 +1073,13 @@ msgid "No defined team"
 msgstr "Pas d'équipe définie"
 
 #: participation/tables.py:142
-#: participation/templates/participation/note_form.html:14
+#: participation/templates/participation/note_form.html:13
 #: participation/templates/participation/passage_detail.html:54
-#: participation/templates/participation/passage_detail.html:153
+#: participation/templates/participation/passage_detail.html:120
-#: participation/templates/participation/passage_detail.html:159
+#: participation/templates/participation/passage_detail.html:126
-#: participation/templates/participation/pool_detail.html:117
+#: participation/templates/participation/pool_detail.html:110
-#: participation/templates/participation/pool_detail.html:135
+#: participation/templates/participation/pool_detail.html:128
-#: participation/templates/participation/pool_detail.html:140
+#: participation/templates/participation/pool_detail.html:133
 #: participation/templates/participation/team_detail.html:151
 #: participation/templates/participation/team_detail.html:215
 #: participation/templates/participation/tournament_form.html:12
@@ -1116,14 +1116,6 @@ msgstr "Rejoindre"
 msgid "Notes of"
 msgstr "Notes de"
 
-#: participation/templates/participation/note_form.html:9
-msgid "Defense of"
-msgstr "Défense de"
-
-#: participation/templates/participation/note_form.html:9
-msgid "Pb."
-msgstr "Pb."
-
 #: participation/templates/participation/participation_detail.html:6
 #: participation/templates/participation/participation_detail.html:21
 #: participation/templates/participation/passage_detail.html:6
@@ -1179,8 +1171,8 @@ msgid "Upload solution"
 msgstr "Envoyer une solution"
 
 #: participation/templates/participation/participation_detail.html:65
-#: participation/templates/participation/passage_detail.html:165
+#: participation/templates/participation/passage_detail.html:132
-#: participation/templates/participation/pool_detail.html:145
+#: participation/templates/participation/pool_detail.html:138
 #: participation/templates/participation/team_detail.html:210
 #: participation/templates/participation/upload_motivation_letter.html:13
 #: participation/templates/participation/upload_notes.html:17
@@ -1241,12 +1233,12 @@ msgid "No synthesis was uploaded yet."
 msgstr "Aucune note de synthèse n'a encore été envoyée."
 
 #: participation/templates/participation/passage_detail.html:52
-#: participation/templates/participation/passage_detail.html:158
+#: participation/templates/participation/passage_detail.html:125
 msgid "Update notes"
 msgstr "Modifier les notes"
 
 #: participation/templates/participation/passage_detail.html:58
-#: participation/templates/participation/passage_detail.html:164
+#: participation/templates/participation/passage_detail.html:131
 msgid "Upload synthesis"
 msgstr "Envoyer une note de synthèse"
 
@@ -1254,51 +1246,51 @@ msgstr "Envoyer une note de synthèse"
 msgid "Notes detail"
 msgstr "Détails des notes"
 
-#: participation/templates/participation/passage_detail.html:74
+#: participation/templates/participation/passage_detail.html:73
-msgid "Average points for the defender writing"
+msgid "Average points for the defender writing:"
-msgstr "Moyenne de l'écrit de l'équipe défenseuse"
+msgstr "Moyenne de l'écrit de l'équipe défenseuse :"
 
-#: participation/templates/participation/passage_detail.html:80
+#: participation/templates/participation/passage_detail.html:76
-msgid "Average points for the defender oral"
+msgid "Average points for the defender oral:"
-msgstr "Moyenne de l'oral de l'équipe défenseuse"
+msgstr "Moyenne de l'oral de l'équipe défenseuse :"
 
-#: participation/templates/participation/passage_detail.html:86
+#: participation/templates/participation/passage_detail.html:79
-msgid "Average points for the opponent writing"
+msgid "Average points for the opponent writing:"
-msgstr "Moyenne de l'écrit de l'équipe opposante"
+msgstr "Moyenne de l'écrit de l'équipe opposante :"
+
+#: participation/templates/participation/passage_detail.html:82
+msgid "Average points for the opponent oral:"
+msgstr "Moyenne de l'oral de l'équipe opposante :"
+
+#: participation/templates/participation/passage_detail.html:85
+msgid "Average points for the reporter writing:"
+msgstr "Moyenne de l'écrit de l'équipe rapportrice :"
+
+#: participation/templates/participation/passage_detail.html:88
+msgid "Average points for the reporter oral:"
+msgstr "Moyenne de l'oral de l'équipe rapportrice :"
 
 #: participation/templates/participation/passage_detail.html:92
-msgid "Average points for the opponent oral"
+msgid "Average points for the observer oral:"
-msgstr "Moyenne de l'oral de l'équipe opposante"
+msgstr "Moyenne de l'oral de l'observateur⋅rice :"
 
-#: participation/templates/participation/passage_detail.html:98
+#: participation/templates/participation/passage_detail.html:100
-msgid "Average points for the reporter writing"
+msgid "Defender points:"
-msgstr "Moyenne de l'écrit de l'équipe rapportrice"
+msgstr "Points de l'équipe défenseuse :"
 
-#: participation/templates/participation/passage_detail.html:104
+#: participation/templates/participation/passage_detail.html:103
-msgid "Average points for the reporter oral"
+msgid "Opponent points:"
-msgstr "Moyenne de l'oral de l'équipe rapportrice"
+msgstr "Points de l'équipe opposante :"
 
-#: participation/templates/participation/passage_detail.html:111
+#: participation/templates/participation/passage_detail.html:106
-msgid "Average points for the observer oral"
+msgid "Reporter points:"
-msgstr "Moyenne de l'oral de l'observateur⋅rice"
+msgstr "Points de l'équipe rapportrice :"
 
-#: participation/templates/participation/passage_detail.html:122
+#: participation/templates/participation/passage_detail.html:110
-msgid "Defender points"
+msgid "Observer points:"
-msgstr "Points de l'équipe défenseuse"
+msgstr "Points de l'équipe observatrice :"
 
-#: participation/templates/participation/passage_detail.html:128
+#: participation/templates/participation/passage_detail.html:119
-msgid "Opponent points"
-msgstr "Points de l'équipe opposante"
-
-#: participation/templates/participation/passage_detail.html:134
-msgid "Reporter points"
-msgstr "Points de l'équipe rapportrice"
-
-#: participation/templates/participation/passage_detail.html:141
-msgid "Observer points"
-msgstr "Points de l'équipe observatrice"
-
-#: participation/templates/participation/passage_detail.html:152
 #: participation/templates/participation/passage_form.html:11
 msgid "Update passage"
 msgstr "Modifier le passage"
@@ -1341,7 +1333,7 @@ msgstr "Lien BigBlueButton :"
 msgid "Ranking"
 msgstr "Classement"
 
-#: participation/templates/participation/pool_detail.html:85
+#: participation/templates/participation/pool_detail.html:84
 msgid "Download the scale sheet"
 msgstr "Télécharger la feuille de barème"
 
@@ -1349,34 +1341,30 @@ msgstr "Télécharger la feuille de barème"
 msgid "Download the final notation sheet"
 msgstr "Télécharger la fiche de notation finale"
 
-#: participation/templates/participation/pool_detail.html:103
+#: participation/templates/participation/pool_detail.html:102
-msgid "Download all notation sheets"
-msgstr "Télécharger toutes les fiches de notation"
-
-#: participation/templates/participation/pool_detail.html:108
 msgid "Upload notes from a CSV file"
 msgstr "Soumettre les notes à partir d'un fichier CSV"
 
-#: participation/templates/participation/pool_detail.html:116
+#: participation/templates/participation/pool_detail.html:109
-#: participation/templates/participation/pool_detail.html:129
+#: participation/templates/participation/pool_detail.html:122
 msgid "Add passage"
 msgstr "Ajouter un passage"
 
-#: participation/templates/participation/pool_detail.html:118
+#: participation/templates/participation/pool_detail.html:111
-#: participation/templates/participation/pool_detail.html:139
+#: participation/templates/participation/pool_detail.html:132
 msgid "Update teams"
 msgstr "Modifier les équipes"
 
-#: participation/templates/participation/pool_detail.html:125
+#: participation/templates/participation/pool_detail.html:118
 msgid "Passages"
 msgstr "Passages"
 
-#: participation/templates/participation/pool_detail.html:134
+#: participation/templates/participation/pool_detail.html:127
 #: participation/templates/participation/pool_form.html:11
 msgid "Update pool"
 msgstr "Modifier la poule"
 
-#: participation/templates/participation/pool_detail.html:144
+#: participation/templates/participation/pool_detail.html:137
 msgid "Upload notes"
 msgstr "Envoyer les notes"
 
@@ -1888,17 +1876,7 @@ msgstr "L'utilisateur⋅rice suivant n'est pas inscrit⋅e en tant que juré⋅e
 msgid "Notes were successfully uploaded."
 msgstr "Les notes ont bien été envoyées."
 
-#: participation/views.py:1739
+#: participation/views.py:1811
-#, python-brace-format
-msgid "Notation sheets of pool {pool} of {tournament}.zip"
-msgstr "Feuilles de notations pour la poule {pool} du tournoi {tournament}.zip"
-
-#: participation/views.py:1744
-#, python-brace-format
-msgid "Notation sheets of {tournament}.zip"
-msgstr "Feuilles de notation de {tournament}.zip"
-
-#: participation/views.py:1922
 msgid "You can't upload a synthesis after the deadline."
 msgstr "Vous ne pouvez pas envoyer de note de synthèse après la date limite."
 

participation/models.py

@@ -567,10 +567,6 @@ class Pool(models.Model):
                     "They stay accessible to you. Only averages are given."),
     )
 
-    @property
-    def short_name(self):
-        return f"{self.get_letter_display()}{self.round}"
-
     @property
     def solutions(self):
         return [passage.defended_solution for passage in self.passages.all()]

participation/templates/participation/note_form.html

@@ -6,7 +6,6 @@
     <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>
             <hr>
             {% csrf_token %}
             {{ form|crispy }}

participation/templates/participation/passage_detail.html

@@ -70,47 +70,26 @@
         <div class="card bg-body shadow">
             <div class="card-body">
                 <dl class="row">
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Average points for the defender writing:" %}</dt>
-                        {% trans "Average points for the defender writing" %}
-                        ({{ passage.defender.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_defender_writing|floatformat }}/20</dd>
 
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Average points for the defender oral:" %}</dt>
-                        {% trans "Average points for the defender oral" %}
-                        ({{ passage.defender.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_defender_oral|floatformat }}/16</dd>
 
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Average points for the opponent writing:" %}</dt>
-                        {% trans "Average points for the opponent writing" %}
-                        ({{ passage.opponent.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_opponent_writing|floatformat }}/9</dd>
 
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Average points for the opponent oral:" %}</dt>
-                        {% trans "Average points for the opponent oral" %}
-                        ({{ passage.opponent.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_opponent_oral|floatformat }}/10</dd>
 
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Average points for the reporter writing:" %}</dt>
-                        {% trans "Average points for the reporter writing" %}
-                        ({{ passage.reporter.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_reporter_writing|floatformat }}/9</dd>
 
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Average points for the reporter oral:" %}</dt>
-                        {% trans "Average points for the reporter oral" %}
-                        ({{ passage.reporter.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_reporter_oral|floatformat }}/10</dd>
 
                     {% if passage.observer %}
-                        <dt class="col-sm-8">
+                        <dt class="col-sm-8">{% trans "Average points for the observer oral:" %}</dt>
-                            {% trans "Average points for the observer oral" %}
-                            ({{ passage.observer.team.trigram }}) :
-                        </dt>
                         <dd class="col-sm-4">{{ passage.average_observer|floatformat }}/4</dd>
                     {% endif %}
                 </dl>
@@ -118,29 +97,17 @@
                 <hr>
 
                 <dl class="row">
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Defender points:" %}</dt>
-                        {% trans "Defender points" %}
-                        ({{ passage.defender.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_defender|floatformat }}/52</dd>
 
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Opponent points:" %}</dt>
-                        {% trans "Opponent points" %}
-                        ({{ passage.opponent.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_opponent|floatformat }}/29</dd>
 
-                    <dt class="col-sm-8">
+                    <dt class="col-sm-8">{% trans "Reporter points:" %}</dt>
-                        {% trans "Reporter points" %}
-                        ({{ passage.reporter.team.trigram }}) :
-                    </dt>
                     <dd class="col-sm-4">{{ passage.average_reporter|floatformat }}/19</dd>
 
                     {% if passage.observer %}
-                        <dt class="col-sm-8">
+                        <dt class="col-sm-8">{% trans "Observer points:" %}</dt>
-                            {% trans "Observer points" %}
-                            ({{ passage.observer.team.trigram }}) :
-                        </dt>
                         <dd class="col-sm-4">{{ passage.average_observer|floatformat }}/4</dd>
                     {% endif %}
                 </dl>

participation/templates/participation/pool_detail.html

@@ -80,8 +80,7 @@
                 {% if user.registration.is_volunteer %}
                     <div class="card-footer text-center">
                         <div class="btn-group">
-                            <a class="btn btn-sm btn-info" href="{% url 'participation:pool_scale_note_sheet' pk=pool.pk %}">
+                            <a class="btn btn-info" href="{% url 'participation:pool_scale_note_sheet' pk=pool.pk %}">
-                                <i class="fas fa-download"></i>
                                 {% trans "Download the scale sheet" %}{% if pool.passages.count == 5 %} — {% trans "Room" %} 1{% endif %}
                             </a>
                             {% if pool.passages.count == 5 %}
@@ -89,24 +88,18 @@
                                     {% trans "Room" %} 2
                                 </a>
                             {% endif %}
-                            <a class="btn btn-sm btn-info" href="{% url 'participation:pool_final_note_sheet' pk=pool.pk %}">
+                        </div>
-                                <i class="fas fa-download"></i>
+                        <div class="btn-group">
+                            <a class="btn btn-info" href="{% url 'participation:pool_final_note_sheet' pk=pool.pk %}">
                                 {% trans "Download the final notation sheet" %}{% if pool.passages.count == 5 %} — {% trans "Room" %} 1{% endif %}
                             </a>
                             {% if pool.passages.count == 5 %}
-                                <a class="btn btn-sm btn-info" href="{% url 'participation:pool_final_note_sheet' pk=pool.pk %}?page=2">
+                                <a class="btn btn-info" href="{% url 'participation:pool_final_note_sheet' pk=pool.pk %}?page=2">
                                     {% trans "Room" %} 2
                                 </a>
                             {% endif %}
-                            <a class="btn btn-sm btn-info" href="{% url 'participation:pool_notation_sheets' pool_id=pool.id %}">
-                                <i class="fas fa-archive"></i>
-                                {% trans "Download all notation sheets" %}
-                            </a>
                         </div>
-                        <button class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#uploadNotesModal">
+                        <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadNotesModal">{% trans "Upload notes from a CSV file" %}</button>
-                            <i class="fas fa-upload"></i>
-                            {% trans "Upload notes from a CSV file" %}
-                        </button>
                     </div>
                 {% endif %}
             </div>

participation/templates/participation/tex/finale.tex

@@ -82,7 +82,7 @@ Tour {{ pool.round }} \;-- Poule {{ pool.get_letter_display }}{{ page }} \;-- {%
 \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 %}
+{% if is_jury %}\underline{ {{ user.first_name|safe }} {{ user.last_name|safe }} }{% else %}\underline{\phantom{Phrase suffisamment longue pour le nom}}{% endif %}
 $\qquad$ Signature : \underline{\phantom{Phrase moins longue}}
 
 \newpage

participation/templates/participation/tournament_detail.html

@@ -195,8 +195,13 @@
                         </a>
                     </li>
                     <li>
-                        <a href="{% url "participation:tournament_notation_sheets" tournament_id=tournament.id %}">
+                        <a>
-                            Archive de toutes les feuilles de notes à imprimer triées par poule
+                            Archive de tous les barèmes de notes à imprimer triés par poule
+                        </a>
+                    </li>
+                    <li>
+                        <a>
+                            Archive de tous les tableurs de notes à saisir triés par poule
                         </a>
                     </li>
                 </ul>

participation/urls.py

@@ -5,8 +5,8 @@ from django.urls import path
 from django.views.generic import TemplateView
 
 from .views import CreateTeamView, FinalNotationSheetTemplateView, JoinTeamView, MyParticipationDetailView, \
-    MyTeamDetailView, NotationSheetsArchiveView, NoteUpdateView, ParticipationDetailView, PassageCreateView, \
+    MyTeamDetailView, NoteUpdateView, ParticipationDetailView, PassageCreateView, PassageDetailView, \
-    PassageDetailView, PassageUpdateView, PoolCreateView, PoolDetailView, PoolJuryView, PoolNotesTemplateView, \
+    PassageUpdateView, PoolCreateView, PoolDetailView, PoolJuryView, PoolNotesTemplateView, \
     PoolPresideJuryView, PoolRemoveJuryView, PoolUpdateTeamsView, PoolUpdateView, PoolUploadNotesView, \
     ScaleNotationSheetTemplateView, SolutionsDownloadView, SolutionUploadView, SynthesisUploadView, \
     TeamAuthorizationsView, TeamDetailView, TeamLeaveView, TeamListView, TeamUpdateView, \
@@ -43,8 +43,6 @@ urlpatterns = [
          name="tournament_solutions"),
     path("tournament/<int:tournament_id>/syntheses/", SolutionsDownloadView.as_view(),
          name="tournament_syntheses"),
-    path("tournament/<int:tournament_id>/notation/sheets/", NotationSheetsArchiveView.as_view(),
-         name="tournament_notation_sheets"),
     path("tournament/<int:pk>/publish-notes/<int:round>/", TournamentPublishNotesView.as_view(),
          name="tournament_publish_notes"),
     path("pools/create/", PoolCreateView.as_view(), name="pool_create"),
@@ -54,7 +52,6 @@ urlpatterns = [
     path("pools/<int:pool_id>/syntheses/", SolutionsDownloadView.as_view(), name="pool_download_syntheses"),
     path("pools/<int:pk>/notation/scale/", ScaleNotationSheetTemplateView.as_view(), name="pool_scale_note_sheet"),
     path("pools/<int:pk>/notation/final/", FinalNotationSheetTemplateView.as_view(), name="pool_final_note_sheet"),
-    path("pools/<int:pool_id>/notation/sheets/", NotationSheetsArchiveView.as_view(), name="pool_notation_sheets"),
     path("pools/<int:pk>/update-teams/", PoolUpdateTeamsView.as_view(), name="pool_update_teams"),
     path("pools/<int:pk>/jury/", PoolJuryView.as_view(), name="pool_jury"),
     path("pools/<int:pk>/jury/remove/<int:jury_id>/", PoolRemoveJuryView.as_view(), name="pool_remove_jury"),

participation/views.py

@@ -650,7 +650,7 @@ class TournamentExportCSVView(VolunteerMixin, DetailView):
         if 'all' not in request.GET:
             participations = participations.filter(valid=True)
         for participation in participations.order_by('-valid', 'team__trigram').all():
-            for registration in participation.team.participants \
+            for registration in participation.team.participants\
                     .order_by('coachregistration', 'user__last_name').all():
                 writer.writerow({
                     'Tournoi': tournament.name,
@@ -939,8 +939,8 @@ class PoolJuryView(VolunteerMixin, FormView, DetailView):
 
         if request.user.is_authenticated and \
                 (request.user.registration.is_admin or request.user.registration.is_volunteer
-                 and (self.object.tournament in request.user.registration.organized_tournaments.all()
+                    and (self.object.tournament in request.user.registration.organized_tournaments.all()
-                      or request.user.registration == self.object.jury_president)):
+                         or request.user.registration == self.object.jury_president)):
             return super().dispatch(request, *args, **kwargs)
 
         return self.handle_no_permission()
@@ -1022,8 +1022,8 @@ class PoolRemoveJuryView(VolunteerMixin, DetailView):
 
         if request.user.is_authenticated and \
                 (request.user.registration.is_admin or request.user.registration.is_volunteer
-                 and (self.object.tournament in request.user.registration.organized_tournaments.all()
+                    and (self.object.tournament in request.user.registration.organized_tournaments.all()
-                      or request.user.registration == self.object.jury_president)):
+                         or request.user.registration == self.object.jury_president)):
             return super().dispatch(request, *args, **kwargs)
 
         return self.handle_no_permission()
@@ -1048,8 +1048,8 @@ class PoolPresideJuryView(VolunteerMixin, DetailView):
 
         if request.user.is_authenticated and \
                 (request.user.registration.is_admin or request.user.registration.is_volunteer
-                 and (self.object.tournament in request.user.registration.organized_tournaments.all()
+                    and (self.object.tournament in request.user.registration.organized_tournaments.all()
-                      or request.user.registration == self.object.jury_president)):
+                         or request.user.registration == self.object.jury_president)):
             return super().dispatch(request, *args, **kwargs)
 
         return self.handle_no_permission()
@@ -1076,8 +1076,8 @@ class PoolUploadNotesView(VolunteerMixin, FormView, DetailView):
 
         if request.user.is_authenticated and \
                 (request.user.registration.is_admin or request.user.registration.is_volunteer
-                 and (self.object.tournament in request.user.registration.organized_tournaments.all()
+                    and (self.object.tournament in request.user.registration.organized_tournaments.all()
-                      or request.user.registration == self.object.jury_president)):
+                         or request.user.registration == self.object.jury_president)):
             return super().dispatch(request, *args, **kwargs)
 
         return self.handle_no_permission()
@@ -1121,8 +1121,8 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
 
         if request.user.is_authenticated and \
                 (request.user.registration.is_admin or request.user.registration.is_volunteer
-                 and (self.object.tournament in request.user.registration.organized_tournaments.all()
+                    and (self.object.tournament in request.user.registration.organized_tournaments.all()
-                      or request.user.registration == self.object.jury_president)):
+                         or request.user.registration == self.object.jury_president)):
             return super().dispatch(request, *args, **kwargs)
 
         return self.handle_no_permission()
@@ -1313,7 +1313,7 @@ class PoolNotesTemplateView(VolunteerMixin, DetailView):
 
         for i in range(line_length):
             table.addElement(TableColumn(stylename=obs_col_style if pool_size == 4
-                                                                    and i % passage_width == passage_width - 1 else col_style))
+                                         and i % passage_width == passage_width - 1 else col_style))
 
         # Add line for the problems for different passages
         header_pb = TableRow()
@@ -1652,17 +1652,6 @@ class NotationSheetTemplateView(VolunteerMixin, DetailView):
     """
     model = Pool
 
-    def dispatch(self, request, *args, **kwargs):
-        self.object = self.get_object()
-
-        if request.user.is_authenticated and \
-                (request.user.registration.is_admin or request.user.registration.is_volunteer
-                 and (self.object.tournament in request.user.registration.organized_tournaments.all()
-                      or request.user.registration == self.object.jury_president)):
-            return super().dispatch(request, *args, **kwargs)
-
-        return self.handle_no_permission()
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
@@ -1672,13 +1661,13 @@ class NotationSheetTemplateView(VolunteerMixin, DetailView):
             if not page.isnumeric() or page not in ['1', '2']:
                 page = '1'
             passages = passages.filter(id__in=[passages[0].id, passages[2].id, passages[4].id]
-            if page == '1' else [passages[1].id, passages[3].id])
+                                       if page == '1' else [passages[1].id, passages[3].id])
             context['page'] = page
 
         context['passages'] = passages
         context['esp'] = passages.count() * '&'
-        if self.request.user.registration in self.object.juries.all() and 'blank' not in self.request.GET:
+        context['is_jury'] = self.request.user.registration in self.object.juries.all() \
-            context['jury'] = self.request.user.registration
+            and 'blank' not in self.request.GET
         context['tfjm_number'] = timezone.now().year - 2010
         return context
 
@@ -1703,95 +1692,6 @@ class FinalNotationSheetTemplateView(NotationSheetTemplateView):
     template_name = 'participation/tex/finale.tex'
 
 
-class NotationSheetsArchiveView(VolunteerMixin, DetailView):
-    @property
-    def model(self):
-        return Pool if 'pool_id' in self.kwargs else Tournament
-
-    @property
-    def pk_url_kwarg(self):
-        return 'pool_id' if 'pool_id' in self.kwargs else 'tournament_id'
-
-    def dispatch(self, request, *args, **kwargs):
-        if not request.user.is_authenticated:
-            return self.handle_no_permission()
-
-        reg = request.user.registration
-
-        if 'pool_id' in kwargs:
-            pool = self.get_object()
-            tournament = pool.tournament
-            if reg.is_admin or reg.is_volunteer \
-                    and (tournament in reg.organized_tournaments.all() or reg in pool.juries.all()):
-                return super().dispatch(request, *args, **kwargs)
-        else:
-            tournament = self.get_object()
-            if reg.is_admin or reg.is_volunteer and tournament in reg.organized_tournaments.all():
-                return super().dispatch(request, *args, **kwargs)
-
-        return self.handle_no_permission()
-
-    def get(self, request, *args, **kwargs):
-        if 'pool_id' in kwargs:
-            pool = self.get_object()
-            tournament = pool.tournament
-            pools = [pool]
-            filename = _("Notation sheets of pool {pool} of {tournament}.zip") \
-                .format(pool=pool.short_name, tournament=tournament.name)
-        else:
-            tournament = self.get_object()
-            pools = tournament.pools.all()
-            filename = _("Notation sheets of {tournament}.zip").format(tournament=tournament.name)
-
-        output = BytesIO()
-        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']:
-                    pages = [1] if pool.participations.count() < 5 else [1, 2]
-                    for page in pages:
-                        juries = list(pool.juries.all()) + [None]
-
-                        for jury in juries:
-                            if jury is not None and template_name == "bareme":
-                                continue
-
-                            context = {'jury': jury, 'page': page, 'pool': pool,
-                                       'tfjm_number': timezone.now().year - 2010}
-
-                            passages = pool.passages.all()
-                            if passages.count() == 5:
-                                passages = passages.filter(id__in=[passages[0].id, passages[2].id, passages[4].id]
-                                if page == '1' else [passages[1].id, passages[3].id])
-
-                            context['passages'] = passages
-                            context['esp'] = passages.count() * '&'
-
-                            tex = render_to_string(f"participation/tex/{template_name}.tex",
-                                                   context=context, request=self.request)
-                            temp_dir = mkdtemp()
-                            with open(os.path.join(temp_dir, "texput.tex"), "w") as f:
-                                f.write(tex)
-
-                            process = subprocess.Popen(
-                                ["pdflatex", "-interaction=nonstopmode", f"-output-directory={temp_dir}",
-                                 os.path.join(temp_dir, "texput.tex"), ])
-                            process.wait()
-
-                            sheet_name = f"Barème pour la poule {pool.short_name}" if template_name == "bareme" \
-                                else (f"Feuille de notation pour la poule {pool.short_name}"
-                                      f" - {str(jury) if jury else 'Vierge'}")
-                            sheet_name += " - page 2" if page == 2 else ""
-
-                            zf.write(os.path.join(temp_dir, "texput.pdf"),
-                                     f"{prefix}{sheet_name}.pdf")
-
-        response = HttpResponse(content_type="application/zip")
-        response["Content-Disposition"] = f"attachment; filename=\"{filename}\""
-        response.write(output.getvalue())
-        return response
-
-
 class PassageCreateView(VolunteerMixin, CreateView):
     model = Passage
     form_class = PassageForm
@@ -1852,20 +1752,9 @@ class PassageDetailView(LoginRequiredMixin, DetailView):
             context["notes"] = NoteTable(notes)
 
             # Only display the observer column for 4-teams pools
-            if self.object.pool.participations.count() != 4:
+            context['notes']._sequence.remove('observer_oral')
-                context['notes']._sequence.remove('observer_oral')
         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" ({self.object.defender.team.trigram})"
-        context['notes'].columns['defender_oral'].column.verbose_name += f" ({self.object.defender.team.trigram})"
-        context['notes'].columns['opponent_writing'].column.verbose_name += f" ({self.object.opponent.team.trigram})"
-        context['notes'].columns['opponent_oral'].column.verbose_name += f" ({self.object.opponent.team.trigram})"
-        context['notes'].columns['reporter_writing'].column.verbose_name += f" ({self.object.reporter.team.trigram})"
-        context['notes'].columns['reporter_oral'].column.verbose_name += f" ({self.object.reporter.team.trigram})"
-        if self.object.observer:
-            context['notes'].columns['observer_oral'].column.verbose_name += f" ({self.object.observer.team.trigram})"
-
         return context
 
 
@@ -1953,15 +1842,7 @@ 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})"
+        if not self.object.passage.observer:
-        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})"
-        if self.object.passage.observer:
-            form.fields['observer_oral'].label += f" ({self.object.passage.observer.team.trigram})"
-        else:
             # Set the note of the observer only for 4-teams pools
             del form.fields['observer_oral']
         return form