staxriver
/
padelclub_backend
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
clubs
Laurent 2 years ago
parent e9b748ba56
commit 313cf67943
6 changed files with 82 additions and 96 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 3
      tournaments/models/team_registration.py
  2. 20
      tournaments/models/tournament.py
  3. 59
      tournaments/templates/tournaments/broadcasted_group_stage.html
  4. 92
      tournaments/templates/tournaments/broadcasted_group_stages.html
  5. 2
      tournaments/templates/tournaments/broadcasted_match.html
  6. 2
      tournaments/templates/tournaments/broadcasted_summons.html

3
tournaments/models/team_registration.py
Unescape View File

@ -69,3 +69,6 @@ class TeamRegistration(models.Model):
rank = player.rank if player.rank is not None else 0 rank = player.rank if player.rank is not None else 0
weight += rank weight += rank
return weight return weight
def is_valid_for_summon(self):
return len(self.playerregistration_set.all()) > 0

20
tournaments/models/tournament.py
Unescape View File

@ -61,13 +61,14 @@ class Tournament(models.Model):
def team_summons(self): def team_summons(self):
summons = [] summons = []
for team_registration in self.teamregistration_set.all(): for team_registration in self.teamregistration_set.all():
next_match = team_registration.next_match() if team_registration.is_valid_for_summon():
if next_match: next_match = team_registration.next_match()
names = team_registration.team_names() if next_match:
stage = next_match.stage_name() names = team_registration.team_names()
weight = team_registration.weight() stage = next_match.stage_name()
summon = TeamSummon(names, next_match.start_date, weight, stage, team_registration.logo) weight = team_registration.weight()
summons.append(summon) summon = TeamSummon(names, next_match.start_date, weight, stage, team_registration.logo)
summons.append(summon)
summons.sort(key=lambda s: s.weight) summons.sort(key=lambda s: s.weight)
return summons return summons
@ -139,11 +140,6 @@ class Tournament(models.Model):
def broadcast_content(self): def broadcast_content(self):
# now = timezone.now()
# matches_with_date = [match for match in self.all_matches() if match.start_date]
# today_matches = [match for match in today_matches if match.start_date.date() == now]
# matches_with_date.sort(key=lambda m: m.start_date)
matches, group_stages = self.broadcasted_matches_and_group_stages() matches, group_stages = self.broadcasted_matches_and_group_stages()
group_stages_dicts = [gs.to_dict() for gs in group_stages] group_stages_dicts = [gs.to_dict() for gs in group_stages]

59
tournaments/templates/tournaments/broadcasted_group_stage.html
Unescape View File

@ -2,42 +2,51 @@
<div class="flex-row"> <div class="flex-row">
<label class="left-label matchtitle winner"><span x-text="group_stage.title"></span></label> <label class="left-label matchtitle winner"><span x-text="group_stage.title"></span></label>
<!-- <label class="right-label info"><span x-text="group_stage.date"></span></label> -->
</div> </div>
<template x-for="i in group_stage.teams.length"> <template x-for="i in group_stage.teams.length">
<div> <div>
<div class="table-row-2-colums team-names-box padding-bottom-small"> <div class="flex dark-bottom-border">
<div class="table-cell table-cell-large"> <div class="flex-left">
<template x-for="name in group_stage.teams[i-1].names"> <template x-for="name in group_stage.teams[i-1].names">
<div class="semibold" x-data="{ <div class="semibold" x-data="{
showName(name, team) { showName(name, team) {
let html = `<span class='` let html = `<span class='`
if (team.is_winner) html += `winner` if (team.is_winner) html += `winner`
html += `'>` html += `'>`
html += name html += name
html += `</span>` html += `</span>`
return html return html
}, },
}" x-html="showName(name, group_stage.teams[i-1])"> }" x-html="showName(name, group_stage.teams[i-1])">
</div> </div>
</template> </template>
</div>
<div class="flex-right">
<div x-show="group_stage.teams[i-1].match_count == 0">
<div class="score ws"><span x-text="group_stage.teams[i-1].weight"></span></div>
</div> </div>
<div class="table-cell center">
<div class="score ws"><span x-text="group_stage.teams[i-1].win_loss"></span></div> <div x-show="group_stage.teams[i-1].match_count > 0">
<div class="ws"><span x-text="group_stage.teams[i-1].diff"></span></div> <div class="center">
<div class="score ws"><span x-text="group_stage.teams[i-1].win_loss"></span></div>
<div class="ws"><span x-text="group_stage.teams[i-1].diff"></span></div>
</div>
</div> </div>
</div>
<div x-show="i != group_stage.teams.length">
<div class="dark-bottom-border"></div>
</div> </div>
</div>
<div x-show="i != group_stage.teams.length">
<div class="dark-bottom-border"></div>
</div> </div>
</div>
</template> </template>
<div class="top-margin flex-row"> <div class="top-margin flex-row">

92
tournaments/templates/tournaments/broadcasted_group_stages.html
Unescape View File

@ -75,87 +75,65 @@
<template x-for="group_stage in paginatedGroupStages[i-1]" > <template x-for="group_stage in paginatedGroupStages[i-1]" >
<div class="cell medium-6 large-3 my-block" x-show="active === i"> <div class="cell medium-6 large-3 my-block" x-show="active === i">
<div class="dark_bubble">
{% include 'tournaments/broadcasted_group_stage.html' %}
<!-- <div class="dark_bubble">
<div class="flex-row"> <div class="flex-row">
<label class="left-label matchtitle winner"><span x-text="group_stage.title"></span></label> <label class="left-label matchtitle winner"><span x-text="group_stage.title"></span></label>
<!-- <label class="right-label info"><span x-text="group_stage.date"></span></label> -->
</div> </div>
<template x-for="i in group_stage.teams.length"> <template x-for="i in group_stage.teams.length">
<div> <div>
<div class="flex dark-bottom-border"> <div class="flex dark-bottom-border">
<div class="flex-left"> <div class="flex-left">
<template x-for="name in group_stage.teams[i-1].names"> <template x-for="name in group_stage.teams[i-1].names">
<div class="semibold" x-data="{ <div class="semibold" x-data="{
showName(name, team) { showName(name, team) {
let html = `<span class='` let html = `<span class='`
if (team.is_winner) html += `winner` if (team.is_winner) html += `winner`
html += `'>` html += `'>`
html += name html += name
html += `</span>` html += `</span>`
return html return html
}, },
}" x-html="showName(name, group_stage.teams[i-1])"> }" x-html="showName(name, group_stage.teams[i-1])">
</div>
</template>
</div>
<div class="flex-right">
<div x-show="group_stage.teams[i-1].match_count == 0">
<div class="score ws"><span x-text="group_stage.teams[i-1].weight"></span></div>
</div>
<div x-show="group_stage.teams[i-1].match_count > 0">
<div class="center">
<div class="score ws"><span x-text="group_stage.teams[i-1].win_loss"></span></div>
<div class="ws"><span x-text="group_stage.teams[i-1].diff"></span></div>
</div>
</div> </div>
</template>
<!-- <div class="score ws"><span x-text="group_stage.teams[i-1].win_loss"></span></div>
<div class="ws"><span x-text="group_stage.teams[i-1].diff"></span></div> -->
</div>
</div> </div>
<!-- <div class="flex-right">
<div class="flex dark-bottom-border">
<div class="flex-left"> <div x-show="group_stage.teams[i-1].match_count == 0">
{% for name in team.names %} <div class="score ws"><span x-text="group_stage.teams[i-1].weight"></span></div>
<div class="semibold {% if team.is_winner %}winner{% endif %}">
{{ name }}
</div>
{% endfor %}
</div> </div>
<div class="flex-right">
{% if team.match_count == 0 %} <div x-show="group_stage.teams[i-1].match_count > 0">
<div class="score ws">{{ team.weight }}</div>
{% else %}
<div class="center"> <div class="center">
<div class="score ws">{{ team.wins_losses }}</div> <div class="score ws"><span x-text="group_stage.teams[i-1].win_loss"></span></div>
<div class="ws">{{ team.formatted_diff }}</div> <div class="ws"><span x-text="group_stage.teams[i-1].diff"></span></div>
</div> </div>
{% endif %}
</div> </div>
</div> -->
<div x-show="i != group_stage.teams.length">
<div class="dark-bottom-border"></div>
</div> </div>
</div>
<div x-show="i != group_stage.teams.length">
<div class="dark-bottom-border"></div>
</div> </div>
</div>
</template> </template>
<div class="top-margin flex-row"> <div class="top-margin flex-row">
<label class="left-label minor-info"><span class="beige" x-text="group_stage.duration"></span></label> <label class="left-label minor-info"><span class="beige" x-text="group_stage.duration"></span></label>
<!-- <label class="right-label minor-info"><span x-text="group_stage.court"></span></label> -->
</div> </div>
</div> </div> -->
</div> </div>
</template> </template>

2
tournaments/templates/tournaments/broadcasted_match.html
Unescape View File

@ -21,7 +21,7 @@
html += `</span>` html += `</span>`
return html return html
}, },
}" x-html="showName(name, match.teams[i-1])"> }" x-html="showName(name, match.teams[i-1])"></div>
</template> </template>
</div> </div>
<div class="scores"> <div class="scores">

2
tournaments/templates/tournaments/broadcasted_summons.html
Unescape View File

@ -1,7 +1,7 @@
{% extends 'tournaments/broadcast_base.html' %} {% extends 'tournaments/broadcast_base.html' %}
{% block head_title %}Convocations{% endblock %} {% block head_title %}Convocations{% endblock %}
{% block first_title %}{{ tournament.name }}{% endblock %} {% block first_title %}{{ tournament.display_name }}{% endblock %}
{% block second_title %}Convocations{% endblock %} {% block second_title %}Convocations{% endblock %}
{% block content %} {% block content %}

Write Preview
Loading…
Cancel
Save