fix cell height broadcast when team name and fix display of groupstages when bracket starts

sync
Raz 8 months ago
parent 530a60b0e1
commit c69f7385f9
  1. 17
      tournaments/models/team_registration.py
  2. 4
      tournaments/models/tournament.py

@ -38,21 +38,28 @@ class TeamRegistration(models.Model):
return self.player_names() return self.player_names()
def player_names_as_list(self): def player_names_as_list(self):
return [pr.name() for pr in self.playerregistration_set.all()] players = list(self.playerregistration_set.all())
if len(players) == 0:
return ['', '']
elif len(players) == 1:
return [players[0].name(), '']
else:
return [pr.name() for pr in players]
def team_names(self): def team_names(self):
if self.name: if self.name:
return [self.name] return [self.name, ''] #add an empty line if it's a team name
else: else:
return self.player_names_as_list() return self.player_names_as_list()
def shortened_team_names(self): def shortened_team_names(self):
if self.name: if self.name:
return [self.name] return [self.name, ''] #add an empty line if it's a team name
else: else:
players = list(self.playerregistration_set.all()) players = list(self.playerregistration_set.all())
if len(players) == 1: if len(players) == 0:
return ['', '']
elif len(players) == 1:
return [players[0].shortened_name(), ''] return [players[0].shortened_name(), '']
else: else:
return [pr.shortened_name() for pr in players] return [pr.shortened_name() for pr in players]

@ -722,6 +722,10 @@ class Tournament(models.Model):
matches = [m for m in self.all_matches(False) if m.start_date and m.end_date is None] matches = [m for m in self.all_matches(False) if m.start_date and m.end_date is None]
# print(f'first_unfinished_match > match len: {len(matches)}') # print(f'first_unfinished_match > match len: {len(matches)}')
matches.sort(key=lambda m: m.start_date) matches.sort(key=lambda m: m.start_date)
main_bracket_matches = [m for m in matches if m.round and m.round.parent is None]
if main_bracket_matches:
return main_bracket_matches[0]
if matches: if matches:
return matches[0] return matches[0]
else: else:

Loading…
Cancel
Save