From 189df37c4b2dbb5f0d3a9652a99d42f3ec2f22b9 Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Fri, 24 May 2024 18:59:01 +0200 Subject: [PATCH] udpate title stuff --- tournaments/models/tournament.py | 40 +++++++++++++++++++ tournaments/static/tournaments/css/style.css | 8 ++++ .../templates/tournaments/rankings.html | 2 + .../templates/tournaments/summons.html | 4 ++ tournaments/templates/tournaments/teams.html | 5 +++ .../templates/tournaments/tournament_row.html | 15 ++++--- 6 files changed, 68 insertions(+), 6 deletions(-) diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py index d2517f8..28736b4 100644 --- a/tournaments/models/tournament.py +++ b/tournaments/models/tournament.py @@ -81,6 +81,46 @@ class Tournament(models.Model): def in_progress(self): return self.end_date is None + def summon_count_display(self): + teams = self.team_summons() + if teams is not None and len(teams) > 0: + return f"{len(teams)} équipes convoquées" + else: + return None + + def ranking_count_display(self): + teams = self.rankings() + if teams is not None and len(teams) > 0: + return f"{len(teams)} équipes" + else: + return None + + def registration_count_display(self): + teams = self.teams() + if teams is not None and len(teams) > 0: + return f"{len(teams)} équipes inscrites" + else: + return None + + def team_count_display(self): + teams = self.teams() + if teams is not None and len(teams) > 0: + return f"{len(teams)} inscriptions" + else: + return None + + def name_and_event(self): + event_name = self.event.name + if event_name and self.name: + return event_name + " : " + self.name + elif event_name: + return event_name + elif self.name: + return self.name + else: + return None + + def team_summons(self): summons = [] for team_registration in self.teamregistration_set.all(): diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css index 3cd509a..e1bf56f 100644 --- a/tournaments/static/tournaments/css/style.css +++ b/tournaments/static/tournaments/css/style.css @@ -560,6 +560,14 @@ svg { padding: 5px 0px; } +.table-row-4-colums-tournament { + display: grid; + grid-template-columns: auto 1fr auto auto; + align-items: center; + /* Vertically center the content within each column */ + padding: 5px 0px; +} + .table-row-4-colums { display: grid; grid-template-columns: 1px auto 50px 70px 100px; diff --git a/tournaments/templates/tournaments/rankings.html b/tournaments/templates/tournaments/rankings.html index 32348ed..b364ce5 100644 --- a/tournaments/templates/tournaments/rankings.html +++ b/tournaments/templates/tournaments/rankings.html @@ -18,6 +18,8 @@
+ + {% for ranking in rankings %} {% include 'tournaments/ranking_row.html' %} diff --git a/tournaments/templates/tournaments/summons.html b/tournaments/templates/tournaments/summons.html index 886f07a..6da7514 100644 --- a/tournaments/templates/tournaments/summons.html +++ b/tournaments/templates/tournaments/summons.html @@ -18,6 +18,10 @@
+ {% if tournament.summon_count_display %} + + {% endif %} + {% for summon in team_summons %} {% include 'tournaments/summon_row.html' %} diff --git a/tournaments/templates/tournaments/teams.html b/tournaments/templates/tournaments/teams.html index be8aae4..f7137a7 100644 --- a/tournaments/templates/tournaments/teams.html +++ b/tournaments/templates/tournaments/teams.html @@ -18,6 +18,11 @@
+ + {% if tournament.registration_count_display %} + + {% endif %} + {% for team in teams %} {% include 'tournaments/team_row.html' %} diff --git a/tournaments/templates/tournaments/tournament_row.html b/tournaments/templates/tournaments/tournament_row.html index 15a4472..b603a28 100644 --- a/tournaments/templates/tournaments/tournament_row.html +++ b/tournaments/templates/tournaments/tournament_row.html @@ -1,17 +1,20 @@ -