Display trigrams in note interface

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

participation/templates/participation/note_form.html

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

participation/templates/participation/passage_detail.html

@@ -70,26 +70,47 @@
         <div class="card bg-body shadow">
             <div class="card-body">
                 <dl class="row">
-                    <dt class="col-sm-8">{% trans "Average points for the defender writing:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% 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">{% trans "Average points for the defender oral:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% 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">{% trans "Average points for the opponent writing:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% 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">{% trans "Average points for the opponent oral:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% 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">{% trans "Average points for the reporter writing:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% 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">{% trans "Average points for the reporter oral:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% 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">{% trans "Average points for the observer oral:" %}</dt>
+                        <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|floatformat }}/4</dd>
                     {% endif %}
                 </dl>
@@ -97,17 +118,29 @@
                 <hr>
 
                 <dl class="row">
-                    <dt class="col-sm-8">{% trans "Defender points:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% trans "Defender points" %}
+                        ({{ passage.defender.team.trigram }}) :
+                    </dt>
                     <dd class="col-sm-4">{{ passage.average_defender|floatformat }}/52</dd>
 
-                    <dt class="col-sm-8">{% trans "Opponent points:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% trans "Opponent points" %}
+                        ({{ passage.opponent.team.trigram }}) :
+                    </dt>
                     <dd class="col-sm-4">{{ passage.average_opponent|floatformat }}/29</dd>
 
-                    <dt class="col-sm-8">{% trans "Reporter points:" %}</dt>
+                    <dt class="col-sm-8">
+                        {% 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">{% trans "Observer points:" %}</dt>
+                        <dt class="col-sm-8">
+                            {% trans "Observer points" %}
+                            ({{ passage.observer.team.trigram }}) :
+                        </dt>
                         <dd class="col-sm-4">{{ passage.average_observer|floatformat }}/4</dd>
                     {% endif %}
                 </dl>

participation/views.py

@@ -1852,9 +1852,20 @@ class PassageDetailView(LoginRequiredMixin, DetailView):
             context["notes"] = NoteTable(notes)
 
             # Only display the observer column for 4-teams pools
-            context['notes']._sequence.remove('observer_oral')
+            if self.object.pool.participations.count() != 4:
+                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
 
 
@@ -1942,7 +1953,15 @@ class NoteUpdateView(VolunteerMixin, UpdateView):
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
-        if not self.object.passage.observer:
+        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})"
+        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