Merge branch 'main' of https://gitea.staxriver.com/staxriver/padelclub_backend

tournaments/models/enums.py

@@ -340,3 +340,4 @@ class AnimationType(models.IntegerChoices):
     MELEE = 1, 'Mêlée'
     LOSER_BRACKET = 2, 'Classement'
     CONSOLATION_BRACKET = 3, 'Consolation'
+    CUSTOM = 4, 'Custom'

tournaments/models/player_registration.py

@@ -135,10 +135,15 @@ class PlayerRegistration(TournamentSubModel):
 
         tournament = self.team_registration.tournament
         tournament_status_team_count = tournament.get_tournament_status_team_count()
+        # If custom animation type, replace header by "Inscriptions"
+        if tournament.is_custom_animation():
+            header = "Inscriptions"
+        else:
+            header = "Équipes"
 
         if tournament.is_canceled():
             return {
-                'header': "Équipes",
+                'header': header,
                 'position': tournament_status_team_count,
                 'display_box': True,
                 'box_class': 'light-red',
@@ -146,7 +151,7 @@ class PlayerRegistration(TournamentSubModel):
             }
 
         status = {
-            'header': "Équipes",
+            'header': header,
             'position': tournament_status_team_count,
             'display_box': True,
             'box_class': 'gray',

tournaments/models/tournament.py

@@ -210,8 +210,23 @@ class Tournament(BaseModel):
     def level(self):
         return self.get_federal_level_category_display()
 
+    def is_custom_animation(self):
+        return self.animation_type == AnimationType.CUSTOM
+
     def short_level(self):
         if self.federal_level_category == 0:
+            match self.animation_type:
+                case AnimationType.TOURNAMENT:
+                    return "Anim."
+                case AnimationType.MELEE:
+                    return "Mêlée"
+                case AnimationType.LOSER_BRACKET:
+                    return "Classement"
+                case AnimationType.CONSOLATION_BRACKET:
+                    return "Consolante"
+                case AnimationType.CUSTOM:
+                    return "Spécial"
+                case _:
                     return "Anim."
         if self.federal_level_category == 1:
             return "CHPT"

tournaments/services/email_service.py

@@ -113,11 +113,18 @@ class TournamentEmailService:
         link_text = f"informations sur {tournament_prefix_that}{tournament_word}"
         absolute_url = f'<a href="{absolute_url}">{link_text}</a>'
 
+        if other_player:
             body_parts.extend([
                 f"\nDate d'inscription: {inscription_date}",
                 f"\nÉquipe inscrite: {captain.name()} et {other_player.name()}",
                 f"\nVoir les {absolute_url}"
             ])
+        else:
+            body_parts.extend([
+                f"\nDate d'inscription: {inscription_date}",
+                f"\nVotre inscription: {captain.name()}",
+                f"\nVoir les {absolute_url}"
+            ])
 
         # Add payment information if applicable
         if tournament.should_request_payment():

tournaments/templates/tournaments/navigation_tournament.html

@@ -4,6 +4,7 @@
 
     <a href="{% url 'tournament-info' tournament.id %}" class="topmargin5 orange">Informations</a>
 
+    {% if not tournament.is_custom_animation %}
         {% if tournament.supposedly_in_progress %}
         <a href="{% url 'tournament-live' tournament.id %}" class="topmargin5 orange">Live</a>
         {% endif %}
@@ -36,6 +37,8 @@
         <a href="{% url 'tournament-rankings' tournament.id %}" class="topmargin5  orange">Classement</a>
         {% endif %}
 
+    {% endif %}
+
     {% if user.is_authenticated %}
         <a href="{% url 'profile' %}" class="topmargin5">Mon compte</a>
     {% else %}

tournaments/views.py

@@ -65,6 +65,8 @@ from .services.payment_service import PaymentService
 
 import logging
 
+from .models import AnimationType
+
 logger = logging.getLogger(__name__)
 
 def index(request):
@@ -119,6 +121,9 @@ def tournaments_query(query, club_id, ascending, limit=None):
         club = get_object_or_404(Club, pk=club_id)
         q_club = Q(event__club=club)
         queries.append(q_club)
+    else:
+        q_animation_type = ~Q(animation_type=AnimationType.CUSTOM)
+        queries.append(q_animation_type)
 
     sortkey = 'start_date'
     if not ascending: