Merge branch 'main' of https://stax.alwaysdata.net/gitea/staxriver/padelclub_backend

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),
+        ),
+    ]

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:

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,8 +62,11 @@ class Tournament(models.Model):
 
     def display_name(self):
         if self.name:
-            return self.name
+            return self.base_name() + " " + self.name
         else:
+            return self.base_name()
+
+    def base_name(self):
         return f"{self.level()} {self.category()}"
 
     def level(self):

tournaments/templates/tournaments/matches.html

@@ -9,6 +9,7 @@
 
 {% include 'tournaments/navigation_tournament.html' %}
 
+{% if tournament.display_matches %}
 {% if rounds or group_stages %}
     <nav class="margin10">
         <a href="{% url 'tournament' tournament.id %}" class="mybox topmargin5">Tous les matchs</a>
@@ -37,5 +38,6 @@
 
 {% endfor %}
 
+{% endif %}
 {% endblock %}
 {% endif %}

tournaments/templates/tournaments/tournament_row.html

@@ -6,8 +6,8 @@
                 </div>
                 <div class="table-cell table-cell-large horizontal-padding semibold">
                     {% if tournament.name %}
-                    <span>{{ tournament.event.club.name }}: </span>
-                    <span>{{ tournament.name }}</span>
+                    <div><span>{{ tournament.event.display_long_name }}</span></div>
+                    <div><span>{{ tournament.name }}</span></div>
                     {% else %}
                     <span>{{ tournament.event.club.name }}</span>
                     {% endif %}