Improves admin and names

tournaments/admin.py

@@ -30,7 +30,7 @@ class TournamentAdmin(admin.ModelAdmin):
     list_display = ['name', 'event', 'is_private', 'start_date']
 
 class TeamScoreAdmin(admin.ModelAdmin):
-    list_display = ['match', 'team_registration', 'score']
+    list_display = ['team_registration', 'match', 'score']
 
 class RoundAdmin(admin.ModelAdmin):
     list_display = ['tournament', 'name', 'index', 'parent']

tournaments/models/match.py

@@ -21,7 +21,7 @@ class Match(models.Model):
 
     def __str__(self):
         names = " / ".join(self.player_names())
-        return f"{self.stage_name()}: {names}"
+        return f"{self.stage_name()} #{self.index}: {names}"
 
         # player_names = " / ".join(self.player_names())
         # if self.round:

tournaments/models/round.py

@@ -11,9 +11,9 @@ class Round(models.Model):
 
     def __str__(self):
         if self.parent:
-            return f"{self.tournament.name} - Loser bracket of : {self.name()}"
+            return f"{self.tournament.display_name()} - LB: {self.name()}"
         else:
-            return f"{self.tournament.name} - {self.name()}"
+            return f"{self.tournament.display_name()} - {self.name()}"
 
     def name(self):
         if self.parent:

tournaments/models/team_score.py

@@ -12,7 +12,7 @@ class TeamScore(models.Model):
     lucky_loser = models.BooleanField()
 
     def __str__(self):
-        return f"{str(self.match)}: {self.player_names()}"
+        return f"{self.match.stage_name()} #{self.match.index}: {self.player_names()}"
 
     def player_names(self):
         if self.team_registration.name:

tournaments/models/tournament.py

@@ -90,7 +90,7 @@ class Tournament(models.Model):
 
     def all_groups(self, broadcasted):
         groups = []
-        for round in self.round_set.all().order_by('index'):
+        for round in self.round_set.filter(parent=None).all().order_by('index'):
             groups.extend(self.round_match_groups(round, broadcasted, hide_empty_matches=True))
         for group_stage in self.groupstage_set.all():
             group = self.group_stage_match_group(group_stage, broadcasted, hide_empty_matches=True)