Admin improvements

tournaments/admin.py

@@ -42,7 +42,7 @@ class TournamentAdmin(admin.ModelAdmin):
     list_display = ['display_name', 'event', 'is_private', 'start_date', 'payment', 'is_canceled']
 
 class TeamScoreAdmin(admin.ModelAdmin):
-    list_display = ['team_registration', 'match', 'score', 'walk_out']
+    list_display = ['team_registration', 'score', 'walk_out', 'match']
     list_filter = [TeamScoreTournamentListFilter]
 
 class RoundAdmin(admin.ModelAdmin):

tournaments/filters.py

@@ -14,7 +14,7 @@ class TeamScoreTournamentListFilter(admin.SimpleListFilter):
 
     def lookups(self, request, model_admin):
         tournaments = Tournament.objects.order_by('-start_date')
-        return [(t.id, t.display_name()) for t in tournaments]
+        return [(t.id, t.filter_name()) for t in tournaments]
 
     def queryset(self, request, queryset):
         if self.value():
@@ -32,7 +32,7 @@ class MatchTournamentListFilter(admin.SimpleListFilter):
 
     def lookups(self, request, model_admin):
         tournaments = Tournament.objects.order_by('-start_date')
-        return [(t.id, t.display_name()) for t in tournaments]
+        return [(t.id, t.filter_name()) for t in tournaments]
 
     def queryset(self, request, queryset):
         if self.value():

tournaments/models/match.py

@@ -230,12 +230,6 @@ class LiveMatch:
             "has_walk_out": self.has_walk_out,
         }
 
-    # def has_walk_out(self):
-    #     for team in self.teams:
-    #         if team.walk_out:
-    #             return True
-    #     return False
-
     def show_duration(self):
         for team in self.teams:
             if team.walk_out and len(team.scores) == 0:

tournaments/models/team_registration.py

@@ -33,7 +33,8 @@ class TeamRegistration(models.Model):
 
     def __str__(self):
         if self.name:
-            return f"{self.name}: {self.player_names()}"
+            return self.name
+            # return f"{self.name}: {self.player_names()}"
         return self.player_names()
 
     def team_names(self):

tournaments/models/tournament.py

@@ -92,6 +92,12 @@ class Tournament(models.Model):
     def base_name(self):
         return f"{self.level()} {self.category()}"
 
+    def filter_name(self):
+        if self.event.name:
+            return f"{self.base_name()} {self.event.name}"
+        else:
+            return self.display_name()
+
     def level(self):
         return self.get_federal_level_category_display()