bracket-feature
laurent 11 months ago
commit f04a47a7e2
  1. 8
      tournaments/models/tournament.py
  2. 4
      tournaments/templates/tournaments/team_row.html

@ -341,7 +341,7 @@ class Tournament(models.Model):
# print(f"Group stage members count: {group_stage_members_count}") # print(f"Group stage members count: {group_stage_members_count}")
if self.team_sorting == TeamSortingType.INSCRIPTION_DATE: if self.team_sorting == TeamSortingType.INSCRIPTION_DATE:
complete_teams.sort(key=lambda s: (s.date is None, s.date or datetime.min, s.initial_weight, s.team_registration.id)) complete_teams.sort(key=lambda s: (s.registration_date is None, s.registration_date or datetime.min, s.initial_weight, s.team_registration.id))
else: else:
complete_teams.sort(key=lambda s: (s.initial_weight, s.team_registration.id)) complete_teams.sort(key=lambda s: (s.initial_weight, s.team_registration.id))
@ -370,7 +370,7 @@ class Tournament(models.Model):
if waiting_list_count > 0: if waiting_list_count > 0:
waiting_teams = waiting_teams + complete_teams[-waiting_list_count:] waiting_teams = waiting_teams + complete_teams[-waiting_list_count:]
if self.team_sorting == TeamSortingType.INSCRIPTION_DATE: if self.team_sorting == TeamSortingType.INSCRIPTION_DATE:
waiting_teams.sort(key=lambda s: (s.date is None, s.date or datetime.min, s.initial_weight, s.team_registration.id)) waiting_teams.sort(key=lambda s: (s.registration_date is None, s.registration_date or datetime.min, s.initial_weight, s.team_registration.id))
else: else:
waiting_teams.sort(key=lambda s: (s.initial_weight, s.team_registration.id)) waiting_teams.sort(key=lambda s: (s.initial_weight, s.team_registration.id))
else: else:
@ -936,7 +936,7 @@ class TeamSummon:
class TeamItem: class TeamItem:
def __init__(self, team_registration): def __init__(self, team_registration):
self.names = team_registration.team_names() self.names = team_registration.team_names()
self.date = team_registration.local_call_date() self.registration_date = team_registration.registration_date
self.weight = team_registration.weight self.weight = team_registration.weight
self.initial_weight = team_registration.initial_weight() self.initial_weight = team_registration.initial_weight()
self.image = team_registration.logo self.image = team_registration.logo
@ -951,7 +951,7 @@ class TeamItem:
def to_dict(self): def to_dict(self):
return { return {
"names": self.names, "names": self.names,
"date": self.date, "registration_date": self.registration_date,
"weight": self.weight, "weight": self.weight,
"initial_weight": self.initial_weight, "initial_weight": self.initial_weight,
"image": self.image, "image": self.image,

@ -12,6 +12,10 @@
<div>{{ name }}</div> <div>{{ name }}</div>
{% endfor %} {% endfor %}
</div> </div>
{% else %}
<div class="table-cell table-cell-large semibold">
<div>Bloqué</div>
</div>
{% endif %} {% endif %}
{% if tournament.hide_teams_weight %} {% if tournament.hide_teams_weight %}
<div class="table-cell right horizontal-padding"></div> <div class="table-cell right horizontal-padding"></div>

Loading…
Cancel
Save