From 6b7d52c79b2be9d44b0070b36e7be15bf18b788f Mon Sep 17 00:00:00 2001
From: Emmy D'Anello <emmy.danello@animath.fr>
Date: Tue, 9 Jul 2024 12:44:04 +0200
Subject: [PATCH] Fix the passage table with observers

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>
---
 draw/templates/draw/tournament_content.html | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/draw/templates/draw/tournament_content.html b/draw/templates/draw/tournament_content.html
index 907fa6a..9bc4724 100644
--- a/draw/templates/draw/tournament_content.html
+++ b/draw/templates/draw/tournament_content.html
@@ -176,7 +176,7 @@
                                 📁 {% trans "Export" %}
                             </button>
                         </div>
-                        {% if tournament.final %}
+                        {% if tournament.final or TFJM.APP == "ETEAM" %}
                             {# 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 %}">
@@ -344,33 +344,33 @@
                                                         {% elif pool.size == 5 %}
                                                             {% if forloop.counter == 1 %}
                                                                 <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center"></td>
+                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
                                                                 <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
                                                                 <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                            {% elif forloop.counter == 2 %}
-                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
                                                                 <td class="text-center"></td>
+                                                            {% elif forloop.counter == 2 %}
+                                                                <td class="text-center"></td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
+                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
                                                                 <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
                                                                 <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
                                                             {% elif forloop.counter == 3 %}
                                                                 <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
-                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
                                                                 <td class="text-center"></td>
+                                                                <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
+                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
                                                                 <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
                                                             {% elif forloop.counter == 4 %}
                                                                 <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
                                                                 <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
+                                                                <td class="text-center"></td>
                                                                 <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
-                                                                <td class="text-center"></td>
+                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
                                                             {% elif forloop.counter == 5 %}
-                                                                <td class="text-center"></td>
+                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
                                                                 <td class="text-center">{% trans "Rev" context "Role abbreviation" %}</td>
                                                                 <td class="text-center">{% trans "Opp" context "Role abbreviation" %}</td>
-                                                                <td class="text-center">{% if TFJM.APP == "ETEAM" %}{% trans "Obs" context "Role abbreviation" %}{% endif %}</td>
+                                                                <td class="text-center"></td>
                                                                 <td class="text-center">{% trans "Rep" context "Role abbreviation" %}</td>
                                                             {% endif %}
                                                         {% endif %}