attempt to fix sorting

clubs
Laurent 1 year ago
parent 2784e32276
commit c7b42f8cc9
  1. 10
      tournaments/models/match.py
  2. 4
      tournaments/models/tournament.py
  3. 2
      tournaments/templates/tournaments/broadcast_club.html

@ -166,11 +166,11 @@ class Match(models.Model):
else: else:
return self.team_scores.order_by('team_registration__bracket_position') return self.team_scores.order_by('team_registration__bracket_position')
def sort_start_date(self): # def non_null_start_date(self):
if self.start_date: # if self.start_date:
return self.start_date # return self.start_date
else: # else:
return timezone.now() + timedelta(days=7) # return timezone.now() + timedelta(days=7)
# def sort_value(self): # def sort_value(self):
# sort_score = 0 # sort_score = 0

@ -457,7 +457,9 @@ class Tournament(models.Model):
for group_stage in self.groupstage_set.all(): for group_stage in self.groupstage_set.all():
matches.extend(group_stage.match_set.all()) matches.extend(group_stage.match_set.all())
matches = [m for m in matches if m.should_appear()] matches = [m for m in matches if m.should_appear()]
matches.sort(key=lambda m: (m.non_null_start_date(), m.index), reverse=True) # matches.sort(key=lambda m: (m.non_null_start_date(), m.index), reverse=True)
matches.sort(key=lambda m: (m.start_date is None, m.start_date, m.index), reverse=True)
return matches return matches
def display_rankings(self): def display_rankings(self):

@ -32,7 +32,7 @@
<span><a href="{% url 'automatic-broadcast' tournament.id %}">Automatic</a></span> | <span><a href="{% url 'automatic-broadcast' tournament.id %}">Automatic</a></span> |
<span><a href="{% url 'broadcasted-matches' tournament.id %}">Matchs</a></span> | <span><a href="{% url 'broadcasted-matches' tournament.id %}">Matchs</a></span> |
<span><a href="{% url 'broadcasted-group-stages' tournament.id %}">Poules</a></span> | <span><a href="{% url 'broadcasted-group-stages' tournament.id %}">Poules</a></span> |
<span><a href="{% url 'broadcasted-summons' tournament.id %}">Convocations</a></span> <span><a href="{% url 'broadcasted-summons' tournament.id %}">Convocations</a></span> |
<span><a href="{% url 'broadcasted-rankings' tournament.id %}">Classement</a></span> <span><a href="{% url 'broadcasted-rankings' tournament.id %}">Classement</a></span>
</div> </div>

Loading…
Cancel
Save