diff --git a/tournaments/migrations/0056_tournament_should_verify_bracket_and_more.py b/tournaments/migrations/0056_tournament_should_verify_bracket_and_more.py new file mode 100644 index 0000000..1ded51e --- /dev/null +++ b/tournaments/migrations/0056_tournament_should_verify_bracket_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.11 on 2024-05-23 11:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('tournaments', '0055_rename_globalid_tournament_global_id_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='tournament', + name='should_verify_bracket', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='tournament', + name='should_verify_group_stage', + field=models.BooleanField(default=False), + ), + ] diff --git a/tournaments/models/event.py b/tournaments/models/event.py index 1dd8ad4..e2faf26 100644 --- a/tournaments/models/event.py +++ b/tournaments/models/event.py @@ -19,6 +19,18 @@ class Event(models.Model): return self.display_name() def display_name(self): + if self.club and self.club.name and self.name: + return self.club.acronym + " " + self.name + if self.name: + return self.name + elif self.club and self.club.name: + return self.club.name + else: + return self.creation_date.strftime("%Y-%m-%d %H:%M") + + def display_long_name(self): + if self.club and self.club.name and self.name: + return self.club.name + " " + self.name if self.name: return self.name elif self.club and self.club.name: diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py index 9c99787..d2517f8 100644 --- a/tournaments/models/tournament.py +++ b/tournaments/models/tournament.py @@ -51,6 +51,8 @@ class Tournament(models.Model): publish_summons = models.BooleanField(default=False) publish_group_stages = models.BooleanField(default=False) publish_brackets = models.BooleanField(default=False) + should_verify_bracket = models.BooleanField(default=False) + should_verify_group_stage = models.BooleanField(default=False) def __str__(self): if self.name: @@ -60,9 +62,12 @@ class Tournament(models.Model): def display_name(self): if self.name: - return self.name + return self.base_name() + " " + self.name else: - return f"{self.level()} {self.category()}" + return self.base_name() + + def base_name(self): + return f"{self.level()} {self.category()}" def level(self): return self.get_federal_level_category_display() diff --git a/tournaments/templates/tournaments/matches.html b/tournaments/templates/tournaments/matches.html index a858728..1dea711 100644 --- a/tournaments/templates/tournaments/matches.html +++ b/tournaments/templates/tournaments/matches.html @@ -9,6 +9,7 @@ {% include 'tournaments/navigation_tournament.html' %} +{% if tournament.display_matches %} {% if rounds or group_stages %}