Ratio victoires
diff --git a/tournaments/templates/tournaments/teams.html b/tournaments/templates/tournaments/teams.html
index f978b62..0cf803c 100644
--- a/tournaments/templates/tournaments/teams.html
+++ b/tournaments/templates/tournaments/teams.html
@@ -4,13 +4,11 @@
{% block first_title %}{{ tournament.event.display_name }}{% endblock %}
{% block second_title %}{{ tournament.display_name }}{% endblock %}
-{% if tournament.display_teams %}
-
{% block content %}
-
{% load static %}
-{% include 'tournaments/navigation_tournament.html' %}
+{% if tournament.display_teams %}
+ {% include 'tournaments/navigation_tournament.html' %}
{% if selected_teams|length > 0 %}
@@ -36,5 +34,5 @@
{% endif %}
-{% endblock %}
{% endif %}
+{% endblock %}
diff --git a/tournaments/templates/tournaments/tournament_bracket.html b/tournaments/templates/tournaments/tournament_bracket.html
new file mode 100644
index 0000000..d6ed322
--- /dev/null
+++ b/tournaments/templates/tournaments/tournament_bracket.html
@@ -0,0 +1,288 @@
+{% extends 'tournaments/base.html' %}
+
+{% block head_title %}Matchs du {{ tournament.display_name }}{% endblock %}
+{% block first_title %}{{ tournament.event.display_name }}{% endblock %}
+{% block second_title %}{{ tournament.display_name }}{% endblock %}
+
+{% block content %}
+
+{% if tournament.display_matches %}
+{% include 'tournaments/navigation_tournament.html' %}
+
+
+
+
+ {% for match_group in match_groups %}
+ {% if match_group.matches %}
+ {% for match in match_group.matches %}
+
+ {% include 'tournaments/bracket_match_cell.html' %}
+
+ {% endfor %}
+ {% endif %}
+ {% endfor %}
+
+
+
+
+
+
+{% endif %}
+{% endblock %}
diff --git a/tournaments/urls.py b/tournaments/urls.py
index 1be64d4..64ab807 100644
--- a/tournaments/urls.py
+++ b/tournaments/urls.py
@@ -17,6 +17,8 @@ urlpatterns = [
path('', views.tournament, name='tournament'),
path('teams/', views.tournament_teams, name='tournament-teams'),
path('info/', views.tournament_info, name='tournament-info'),
+ path('bracket/', views.tournament_bracket, name='tournament-bracket'),
+ path('prog/', views.tournament_prog, name='tournament-prog'),
path('summons/', views.tournament_summons, name='tournament-summons'),
path('broadcast/summons/', views.tournament_broadcasted_summons, name='broadcasted-summons'),
path('summons/json/', views.tournament_summons_json, name='tournament-summons-json'),
diff --git a/tournaments/views.py b/tournaments/views.py
index 0340b4c..8415c79 100644
--- a/tournaments/views.py
+++ b/tournaments/views.py
@@ -271,8 +271,8 @@ def tournament_teams(request, tournament_id):
tournament = get_object_or_404(Tournament, pk=tournament_id)
teams = tournament.teams(True)
- selected_teams = [team for team in teams if team.stage != 'Attente']
- waiting_teams = [team for team in teams if team.stage == 'Attente']
+ selected_teams = [team for team in teams if team.stage != "Attente"]
+ waiting_teams = [team for team in teams if team.stage == "Attente"]
return render(request, 'tournaments/teams.html', {
'tournament': tournament,
@@ -954,6 +954,105 @@ def team_details(request, tournament_id, team_id):
'debug': False # Set to False in production
})
+def tournament_bracket(request, tournament_id):
+ """
+ View to display tournament bracket structure.
+ """
+ tournament = get_object_or_404(Tournament, pk=tournament_id)
+
+ # Get main bracket rounds (excluding children/ranking matches)
+ main_rounds = tournament.round_set.filter(
+ parent=None,
+ group_stage_loser_bracket=False
+ ).order_by('-index')
+ main_rounds_reversed = tournament.round_set.filter(
+ parent=None,
+ group_stage_loser_bracket=False
+ ).order_by('index') # Removed the minus sign before 'index'
+
+ loser_final = None
+ if len(main_rounds_reversed) >= 1:
+ semi = main_rounds_reversed[1]
+ loser_round = tournament.round_set.filter(
+ parent=semi,
+ group_stage_loser_bracket=False
+ ).order_by('index')
+ if len(loser_round) >= 1:
+ loser_final = loser_round[0]
+
+ # Create serializable match groups data
+ serializable_match_groups = []
+
+ # Add first half of each round (from last to semi-finals)
+ for round in main_rounds:
+ matches = round.match_set.all().order_by('index')
+
+ if matches:
+ if len(matches) > 1:
+ midpoint = int(len(matches) / 2)
+ first_half_matches = matches[:midpoint]
+ else:
+ first_half_matches = list(matches) # Convert QuerySet to a list
+ if loser_final:
+ loser_matches = loser_final.match_set.all()
+ if len(loser_matches) >= 1:
+ first_half_matches.append(loser_matches[0])
+
+
+ if first_half_matches:
+ match_group = tournament.create_match_group(
+ name=round.name(),
+ matches=first_half_matches
+ )
+ serializable_match_groups.append(match_group)
+
+ for round in main_rounds_reversed:
+ matches = round.match_set.all().order_by('index')
+ if matches:
+ if len(matches) > 1:
+ midpoint = int(len(matches) / 2)
+ first_half_matches = matches[midpoint:]
+
+ match_group = tournament.create_match_group(
+ name=round.name(),
+ matches=first_half_matches
+ )
+ serializable_match_groups.append(match_group)
+
+ context = {
+ 'tournament': tournament,
+ 'match_groups': serializable_match_groups
+ }
+
+ return render(request, 'tournaments/tournament_bracket.html', context)
+
+def tournament_prog(request, tournament_id):
+ tournament = get_object_or_404(Tournament, id=tournament_id)
+
+ # Get matches from all_groups
+ match_groups = tournament.all_groups(broadcasted=False)
+
+ # Flatten matches and add necessary attributes
+ all_matches = []
+ for group in match_groups:
+ for match in group.matches:
+ if match.start_date: # Only include matches with start dates
+ all_matches.append({
+ 'start_date': match.start_date,
+ 'court_index': match.court_index,
+ # Add other match attributes needed for match_cell.html
+ 'match': match
+ })
+
+ # Sort matches by date and court
+ all_matches.sort(key=lambda x: (x['start_date'], x['court_index'] or 999))
+
+ context = {
+ 'tournament': tournament,
+ 'match_groups': {'matches': all_matches}
+ }
+ return render(request, 'tournaments/prog.html', context)
+
class UserListExportView(LoginRequiredMixin, View):
def get(self, request, *args, **kwargs):
users = CustomUser.objects.order_by('date_joined')