|
|
|
@ -661,8 +661,8 @@ class Tournament(models.Model): |
|
|
|
matches.extend(first_round.get_matches_recursive(True)) |
|
|
|
matches.extend(first_round.get_matches_recursive(True)) |
|
|
|
else: |
|
|
|
else: |
|
|
|
current_round = self.round_to_show() |
|
|
|
current_round = self.round_to_show() |
|
|
|
# print(f'current_round = {current_round.index} / parent = {current_round.parent}') |
|
|
|
|
|
|
|
if current_round: |
|
|
|
if current_round: |
|
|
|
|
|
|
|
print(f'current_round = {current_round.index} / parent = {current_round.parent}') |
|
|
|
all_upper_matches_are_over = current_round.all_matches_are_over() |
|
|
|
all_upper_matches_are_over = current_round.all_matches_are_over() |
|
|
|
if all_upper_matches_are_over is False: |
|
|
|
if all_upper_matches_are_over is False: |
|
|
|
matches.extend(current_round.get_matches_recursive(True)) |
|
|
|
matches.extend(current_round.get_matches_recursive(True)) |
|
|
|
@ -689,8 +689,12 @@ class Tournament(models.Model): |
|
|
|
previous_previous_matches = [m for m in previous_previous_matches if m.end_date is None] |
|
|
|
previous_previous_matches = [m for m in previous_previous_matches if m.end_date is None] |
|
|
|
matches.extend(previous_previous_matches) |
|
|
|
matches.extend(previous_previous_matches) |
|
|
|
else: |
|
|
|
else: |
|
|
|
# print('group_stages') |
|
|
|
print('group_stages') |
|
|
|
group_stages = [gs.live_group_stages() for gs in self.last_group_stage_step()] |
|
|
|
group_stages = [gs.live_group_stages() for gs in self.last_group_stage_step()] |
|
|
|
|
|
|
|
else: |
|
|
|
|
|
|
|
first_round = self.first_round() |
|
|
|
|
|
|
|
if first_round: |
|
|
|
|
|
|
|
matches.extend(first_round.get_matches_recursive(True)) |
|
|
|
|
|
|
|
|
|
|
|
return matches, group_stages |
|
|
|
return matches, group_stages |
|
|
|
|
|
|
|
|
|
|
|
|