From 53414c489c0185611301f19943359b8aaaa21aca Mon Sep 17 00:00:00 2001 From: Laurent Date: Mon, 17 Jun 2024 09:36:29 +0200 Subject: [PATCH] Admin improvements --- tournaments/admin.py | 2 +- tournaments/filters.py | 4 ++-- tournaments/models/match.py | 6 ------ tournaments/models/team_registration.py | 3 ++- tournaments/models/tournament.py | 6 ++++++ 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/tournaments/admin.py b/tournaments/admin.py index 379e817..c27c41a 100644 --- a/tournaments/admin.py +++ b/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): diff --git a/tournaments/filters.py b/tournaments/filters.py index b77cdef..d5fdcbc 100644 --- a/tournaments/filters.py +++ b/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(): diff --git a/tournaments/models/match.py b/tournaments/models/match.py index 85b88b6..800747a 100644 --- a/tournaments/models/match.py +++ b/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: diff --git a/tournaments/models/team_registration.py b/tournaments/models/team_registration.py index 9410361..9c3efc1 100644 --- a/tournaments/models/team_registration.py +++ b/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): diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py index eb14c99..f1b97b5 100644 --- a/tournaments/models/tournament.py +++ b/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()