diff --git a/tournaments/models/match.py b/tournaments/models/match.py
index 92231f5..a5356a5 100644
--- a/tournaments/models/match.py
+++ b/tournaments/models/match.py
@@ -184,7 +184,7 @@ class Match(SideStoreModel):
def is_ready(self):
return self.team_scores.count() == 2
- def live_teams(self, hide_names=False):
+ def live_teams(self, hide_names=False, short_names=False):
#print('player names from match')
##return map(lambda ts: ts.player_names(), self.team_scores.all())
# List to hold the names of the teams
@@ -247,7 +247,7 @@ class Match(SideStoreModel):
teams.append(team)
elif len(team_scores) == 1:
# Only one team score, handle missing one
- existing_team = team_scores[0].live_team(self)
+ existing_team = team_scores[0].live_team(self, short_names=short_names)
if (self.group_stage):
teams.append(existing_team)
names = ["Équipe de poule"]
@@ -287,19 +287,19 @@ class Match(SideStoreModel):
elif len(team_scores) == 2:
# Both team scores present
- teams.extend([team_score.live_team(self) for team_score in team_scores])
+ teams.extend([team_score.live_team(self, short_names=short_names) for team_score in team_scores])
if self.round is not None and self.round.parent is None:
pos1 = team_scores[0].team_registration.bracket_position if hasattr(team_scores[0], 'team_registration') and team_scores[0].team_registration else None
pos2 = team_scores[1].team_registration.bracket_position if hasattr(team_scores[1], 'team_registration') and team_scores[1].team_registration else None
if pos1 is not None and pos2 is not None and pos1 // 2 == self.index and pos2 // 2 == self.index:
if pos1 > pos2:
- teams = [team_scores[1].live_team(self), team_scores[0].live_team(self)]
+ teams = [team_scores[1].live_team(self, short_names=short_names), team_scores[0].live_team(self, short_names=short_names)]
else:
- teams = [team_scores[0].live_team(self), team_scores[1].live_team(self)]
+ teams = [team_scores[0].live_team(self, short_names=short_names), team_scores[1].live_team(self, short_names=short_names)]
else:
- teams.extend([team_score.live_team(self) for team_score in team_scores if team_score.walk_out != 1])
+ teams.extend([team_score.live_team(self, short_names=short_names) for team_score in team_scores if team_score.walk_out != 1])
return teams
@@ -426,7 +426,7 @@ class Match(SideStoreModel):
else:
return self.round.tournament.short_full_name()
- def live_match(self, hide_teams=False, event_mode=False):
+ def live_match(self, hide_teams=False, event_mode=False, short_names=False):
title = self.computed_name()
date = self.formatted_start_date()
time_indication = self.time_indication()
@@ -447,7 +447,7 @@ class Match(SideStoreModel):
livematch = LiveMatch(self.index, title, date, time_indication, court, self.started(), ended, group_stage_name, live_format, self.start_date, self.court_index, self.disabled, bracket_name, self.should_show_lucky_loser_status(), tournament_title)
- for team in self.live_teams(hide_teams):
+ for team in self.live_teams(hide_teams, short_names):
livematch.add_team(team)
return livematch
diff --git a/tournaments/models/player_registration.py b/tournaments/models/player_registration.py
index 59141b0..0c9e1b6 100644
--- a/tournaments/models/player_registration.py
+++ b/tournaments/models/player_registration.py
@@ -62,11 +62,11 @@ class PlayerRegistration(SideStoreModel):
def name(self):
return f"{self.first_name} {self.last_name}"
- def shortened_name(self):
+ def shortened_name(self, forced=False):
name = self.name()
- if len(name) > 20 and self.first_name:
+ if (len(name) > 20 or forced) and self.first_name:
name = f"{self.first_name[0]}. {self.last_name}"
- if len(name) > 20:
+ if len(name) > 20 or forced:
name_parts = self.last_name.split(" ")
name = f"{self.first_name[0]}. {name_parts[0]}"
return name
diff --git a/tournaments/models/round.py b/tournaments/models/round.py
index 2270e83..b648912 100644
--- a/tournaments/models/round.py
+++ b/tournaments/models/round.py
@@ -179,7 +179,8 @@ class Round(SideStoreModel):
name=name,
matches=first_half_matches,
round_id=self.id,
- round_index=self.index
+ round_index=self.index,
+ short_names=True
)
return match_group
diff --git a/tournaments/models/team_registration.py b/tournaments/models/team_registration.py
index 83f4b06..274a815 100644
--- a/tournaments/models/team_registration.py
+++ b/tournaments/models/team_registration.py
@@ -72,7 +72,7 @@ class TeamRegistration(SideStoreModel):
else:
return self.player_names_as_list()
- def shortened_team_names(self):
+ def shortened_team_names(self, forced=False):
if self.name:
return [self.name] #add an empty line if it's a team name
else:
@@ -85,9 +85,9 @@ class TeamRegistration(SideStoreModel):
else:
return ['Place réservée']
elif len(players) == 1:
- return [players[0].shortened_name()]
+ return [players[0].shortened_name(forced=forced)]
else:
- return [pr.shortened_name() for pr in players]
+ return [pr.shortened_name(forced=forced) for pr in players]
@property
def players_sorted_by_rank(self):
diff --git a/tournaments/models/team_score.py b/tournaments/models/team_score.py
index b9f8dc6..c7c367e 100644
--- a/tournaments/models/team_score.py
+++ b/tournaments/models/team_score.py
@@ -49,10 +49,10 @@ class TeamScore(SideStoreModel):
else:
return "--"
- def shortened_team_names(self):
+ def shortened_team_names(self, forced=False):
names = []
if self.team_registration:
- names = self.team_registration.shortened_team_names()
+ names = self.team_registration.shortened_team_names(forced=forced)
return names
def team_names(self):
@@ -109,7 +109,7 @@ class TeamScore(SideStoreModel):
scores = self.scores()
return sum(scores)
- def live_team(self, match):
+ def live_team(self, match, short_names=False):
if self.team_registration:
id = self.team_registration.id
image = self.team_registration.logo
@@ -123,7 +123,7 @@ class TeamScore(SideStoreModel):
image = None
weight= None
is_winner = False
- names = self.shortened_team_names()
+ names = self.shortened_team_names(forced=short_names)
scores = self.parsed_scores()
walk_out = self.walk_out
is_lucky_loser = self.lucky_loser is not None
diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py
index aa970fb..8adc63c 100644
--- a/tournaments/models/tournament.py
+++ b/tournaments/models/tournament.py
@@ -571,9 +571,9 @@ class Tournament(BaseModel):
return groups
- def create_match_group(self, name, matches, round_id=None, round_index=None, hide_teams=False, event_mode=False):
+ def create_match_group(self, name, matches, round_id=None, round_index=None, hide_teams=False, event_mode=False, short_names=False):
matches = list(matches)
- live_matches = [match.live_match(hide_teams, event_mode) for match in matches]
+ live_matches = [match.live_match(hide_teams, event_mode, short_names) for match in matches]
# Filter out matches that have a start_date of None
valid_matches = [match for match in matches if match.start_date is not None]
diff --git a/tournaments/static/tournaments/js/tournament_bracket.js b/tournaments/static/tournaments/js/tournament_bracket.js
index 3efaf3b..fcab638 100644
--- a/tournaments/static/tournaments/js/tournament_bracket.js
+++ b/tournaments/static/tournaments/js/tournament_bracket.js
@@ -443,64 +443,64 @@ function renderBracket(options) {
bracket.appendChild(roundDiv);
});
- if (isBroadcast == false || isBroadcast == undefined) {
- setTimeout(() => {
- const roundDivs = document.querySelectorAll(".butterfly-round");
-
- // First, find the maximum bottom position across all rounds
- let globalMaxBottom = 0;
-
- roundDivs.forEach((roundDiv) => {
- const matches = roundDiv.querySelectorAll(".butterfly-match");
- matches.forEach((match) => {
- const bottom = match.offsetTop + match.offsetHeight;
- if (bottom > globalMaxBottom) {
- globalMaxBottom = bottom;
- }
- });
- });
-
- // Now create and position footers for all rounds at the same y-position
- roundDivs.forEach((roundDiv, index) => {
- // Get the match templates from this round to extract data
- const roundMatches = rounds[index] || [];
- if (roundMatches.length > 0) {
- const firstMatchTemplate = roundMatches[0].closest(".match-template");
- const roundId = firstMatchTemplate.dataset.roundId;
- const realRoundIndex = firstMatchTemplate.dataset.roundIndex;
- if (realRoundIndex > 1) {
- // Create footer div
- const footerDiv = document.createElement("div");
- footerDiv.className = "round-footer";
- footerDiv.style.width = `${responsiveMatchWidth}px`;
- footerDiv.style.paddingBottom = "40px";
- footerDiv.style.textAlign = "center";
-
- // Create footer content
- let linkSpan = document.createElement("a");
- linkSpan.className = "small styled-link";
- linkSpan.textContent = "accès au tableau de classement";
- if (roundId) {
- linkSpan.href = `/tournament/${tournamentId}/round/${roundId}/bracket/`;
- linkSpan.style.cursor = "pointer";
- }
-
- footerDiv.appendChild(linkSpan);
-
- // Create a container that will sit at the same position for all rounds
- const footerContainer = document.createElement("div");
- footerContainer.style.position = "absolute";
- footerContainer.style.top = `${globalMaxBottom}px`; // Same position for all footers
- footerContainer.style.width = "100%";
- footerContainer.appendChild(footerDiv);
-
- // Add to the round div
- const matchesContainer =
- roundDiv.querySelector(".matches-container");
- matchesContainer.appendChild(footerContainer);
- }
- }
- });
- }, 100);
- }
+ // if (isBroadcast == false || isBroadcast == undefined) {
+ // setTimeout(() => {
+ // const roundDivs = document.querySelectorAll(".butterfly-round");
+
+ // // First, find the maximum bottom position across all rounds
+ // let globalMaxBottom = 0;
+
+ // roundDivs.forEach((roundDiv) => {
+ // const matches = roundDiv.querySelectorAll(".butterfly-match");
+ // matches.forEach((match) => {
+ // const bottom = match.offsetTop + match.offsetHeight;
+ // if (bottom > globalMaxBottom) {
+ // globalMaxBottom = bottom;
+ // }
+ // });
+ // });
+
+ // // Now create and position footers for all rounds at the same y-position
+ // roundDivs.forEach((roundDiv, index) => {
+ // // Get the match templates from this round to extract data
+ // const roundMatches = rounds[index] || [];
+ // if (roundMatches.length > 0) {
+ // const firstMatchTemplate = roundMatches[0].closest(".match-template");
+ // const roundId = firstMatchTemplate.dataset.roundId;
+ // const realRoundIndex = firstMatchTemplate.dataset.roundIndex;
+ // if (realRoundIndex > 1) {
+ // // Create footer div
+ // const footerDiv = document.createElement("div");
+ // footerDiv.className = "round-footer";
+ // footerDiv.style.width = `${responsiveMatchWidth}px`;
+ // footerDiv.style.paddingBottom = "40px";
+ // footerDiv.style.textAlign = "center";
+
+ // // Create footer content
+ // let linkSpan = document.createElement("a");
+ // linkSpan.className = "small styled-link";
+ // linkSpan.textContent = "accès au tableau de classement";
+ // if (roundId) {
+ // linkSpan.href = `/tournament/${tournamentId}/round/${roundId}/bracket/`;
+ // linkSpan.style.cursor = "pointer";
+ // }
+
+ // footerDiv.appendChild(linkSpan);
+
+ // // Create a container that will sit at the same position for all rounds
+ // const footerContainer = document.createElement("div");
+ // footerContainer.style.position = "absolute";
+ // footerContainer.style.top = `${globalMaxBottom}px`; // Same position for all footers
+ // footerContainer.style.width = "100%";
+ // footerContainer.appendChild(footerDiv);
+
+ // // Add to the round div
+ // const matchesContainer =
+ // roundDiv.querySelector(".matches-container");
+ // matchesContainer.appendChild(footerContainer);
+ // }
+ // }
+ // });
+ // }, 1000);
+ // }
}
diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_bracket.html b/tournaments/templates/tournaments/broadcast/broadcasted_bracket.html
index 823789c..dbc4c0e 100644
--- a/tournaments/templates/tournaments/broadcast/broadcasted_bracket.html
+++ b/tournaments/templates/tournaments/broadcast/broadcasted_bracket.html
@@ -4,6 +4,7 @@
+
@@ -108,6 +109,15 @@
+