add event info and prog link if possible

apikeys
Razmig Sarkissian 5 months ago
parent 6483a0add2
commit b5b5d4e0f5
  1. 2
      tournaments/models/tournament.py
  2. 4
      tournaments/templates/tournaments/tournament_info.html
  3. 20
      tournaments/templates/tournaments/tournaments_list.html
  4. 15
      tournaments/views.py

@ -911,8 +911,6 @@ class Tournament(BaseModel):
return False return False
def display_prog(self): def display_prog(self):
if self.end_date is not None:
return True
if self.publish_prog: if self.publish_prog:
return True return True
if self.has_started(): if self.has_started():

@ -182,7 +182,7 @@
<hr/> <hr/>
<p> <p>
<a href="{% url 'index' %}?club={{ tournament.event.club.id }}"> <a href="{% url 'index' %}?club={{ tournament.event.club.id }}" class="topmargin5 orange">
<div class="semibold">{{ tournament.event.club.name }}</div> <div class="semibold">{{ tournament.event.club.name }}</div>
{% if tournament.has_club_address %} {% if tournament.has_club_address %}
<div>{{ tournament.event.club.address }}</div> <div>{{ tournament.event.club.address }}</div>
@ -193,7 +193,7 @@
{% if tournament.event.tournaments.count > 1 %} {% if tournament.event.tournaments.count > 1 %}
<p> <p>
<a href="{% url 'event' tournament.event.id %}"> <a href="{% url 'event' tournament.event.id %}" class="topmargin5 orange">
<div class="semibold">Voir les autres tournois de l'événement{% if tournament.event.name %} {{ tournament.event.name }}{% endif %}</div> <div class="semibold">Voir les autres tournois de l'événement{% if tournament.event.name %} {{ tournament.event.name }}{% endif %}</div>
</a> </a>
</p> </p>

@ -7,12 +7,9 @@
{% block content %} {% block content %}
{% include 'tournaments/navigation_base.html' %} {% include 'tournaments/navigation_base.html' %}
<div class="grid-x"> <div class="grid-x">
{% if tournaments %} {% if tournaments %}
<div class="cell medium-12 large-6 topblock padding10"> <div class="cell medium-12 large-6 topblock padding10">
<div> <div>
{% for tournament in tournaments %} {% for tournament in tournaments %}
@ -23,6 +20,23 @@
</div> </div>
{% endif %} {% endif %}
{% if first_tournament_prog_url and tournaments %}
<div class="cell medium-6 large-6 topblock padding10">
<div class="bubble">
<a href="{{ first_tournament_prog_url }}" class="large-button semibold orange topmargin5">Voir la programmation de l'événement</a>
{% if tournaments.first.information %}
<hr/>
<p>
<div class="semibold">Infos</div>
<div class="tournament-info">
{{ tournaments.first.information|linebreaksbr|urlize }}
</div>
</p>
{% endif %}
</div>
</div>
{% endif %}
</div> </div>
{% endblock %} {% endblock %}

@ -258,18 +258,29 @@ def club(request, club_id):
def event(request, event_id): def event(request, event_id):
event = get_object_or_404(Event, pk=event_id) event = get_object_or_404(Event, pk=event_id)
tournaments = event.tournaments.all().order_by('start_date')
# Get the first tournament for the prog link
first_tournament_prog_url = None
if tournaments.exists():
first_tournament = tournaments.first()
if first_tournament.display_prog():
first_tournament_prog_url = reverse('tournament-prog', kwargs={'tournament_id': first_tournament.id})
if event.name and len(event.name) > 0: if event.name and len(event.name) > 0:
name = event.name name = event.name
else: else:
name = 'Événement' name = 'Événement'
return render( return render(
request, request,
"tournaments/tournaments_list.html", "tournaments/tournaments_list.html",
{ {
'tournaments': event.tournaments.all().order_by('start_date'), 'tournaments': tournaments,
'first_title': event.club.name, 'first_title': event.club.name,
'second_title': name, 'second_title': name,
'head_title': name, 'head_title': name,
'first_tournament_prog_url': first_tournament_prog_url,
} }
) )
@ -1741,8 +1752,6 @@ def private_tournaments(request):
False, 50 False, 50
) )
print(tournaments)
# Filter tournaments that should be displayed # Filter tournaments that should be displayed
display_tournament = tournaments display_tournament = tournaments

Loading…
Cancel
Save