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

Fixes WO layour

Browse Source
clubs
Laurent 2 years ago
parent 37c6d121a3
commit f0ef16f753
6 changed files with 66 additions and 76 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. 7
      tournaments/models/match.py
  2. 14
      tournaments/models/team_score.py
  3. 6
      tournaments/models/tournament.py
  4. 4
      tournaments/static/tournaments/css/style.css
  5. 109
      tournaments/templates/tournaments/match_cell.html
  6. 2
      tournaments/templates/tournaments/matches.html

7
tournaments/models/match.py
Unescape View File

@ -125,7 +125,8 @@ class Match(models.Model):
scores = team_score.scores_array() scores = team_score.scores_array()
weight = team_score.team_registration.weight() weight = team_score.team_registration.weight()
is_winner = team_score.team_registration.id == self.winning_team_id is_winner = team_score.team_registration.id == self.winning_team_id
team = Team(image, names, scores, weight, is_winner) walk_out = team_score.walk_out
team = Team(image, names, scores, weight, is_winner, walk_out)
livematch.add_team(team) livematch.add_team(team)
return livematch return livematch
@ -147,13 +148,14 @@ class Match(models.Model):
# return sort_score # return sort_score
class Team: class Team:
def __init__(self, image, names, scores, weight, is_winner): def __init__(self, image, names, scores, weight, is_winner, walk_out):
# print(f"image = {image}, names= {names}, scores ={scores}, weight={weight}, win={is_winner}") # print(f"image = {image}, names= {names}, scores ={scores}, weight={weight}, win={is_winner}")
self.image = image self.image = image
self.names = names self.names = names
self.scores = scores self.scores = scores
self.weight = weight self.weight = weight
self.is_winner = is_winner self.is_winner = is_winner
self.walk_out = walk_out
def to_dict(self): def to_dict(self):
return { return {
@ -162,6 +164,7 @@ class Team:
"scores": self.scores, "scores": self.scores,
"weight": self.weight, "weight": self.weight,
"is_winner": self.is_winner, "is_winner": self.is_winner,
"walk_out": self.walk_out,
} }
class LiveMatch: class LiveMatch:

14
tournaments/models/team_score.py
Unescape View File

@ -36,9 +36,13 @@ class TeamScore(models.Model):
return [] return []
def scores_array(self): def scores_array(self):
scores = []
if self.score: if self.score:
scores = [x for x in self.score.split(',')] return [x for x in self.score.split(',')]
if self.walk_out == 1: else:
scores.insert(0, 'WO') return []
return scores # scores = []
# if self.score:
# scores = [x for x in self.score.split(',')]
# if self.walk_out == 1:
# scores.insert(0, 'WO')
# return scores

6
tournaments/models/tournament.py
Unescape View File

@ -42,6 +42,12 @@ class Tournament(models.Model):
else: else:
return '--' return '--'
def display_name(self):
if self.name:
return self.name
else:
return f"{self.level()} {self.category()}"
def level(self): def level(self):
return self.get_federal_level_category_display() return self.get_federal_level_category_display()

4
tournaments/static/tournaments/css/style.css
Unescape View File

@ -223,7 +223,7 @@ tr {
.scores span { .scores span {
width: 30px; /* Fixed width for each score cell */ width: 30px; /* Fixed width for each score cell */
text-align: center; /* Center-align the score text */ text-align: center;
} }
.separator { .separator {
@ -237,8 +237,6 @@ tr {
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
padding: 0px 5px; padding: 0px 5px;
/* width: 40px; */
/* justify-content: space-between; */
} }
.winner { .winner {

109
tournaments/templates/tournaments/match_cell.html
Unescape View File

@ -1,72 +1,51 @@
{% load static %} {% load static %}
<div class="cell medium-12 large-3 my-block"> <div class="cell medium-12 large-3 my-block">
<div class="bubble"> <div class="bubble">
<!-- <div class="flex-row"> --> <!-- <div class="flex-row"> -->
<label class="matchtitle">{{ match.title }}</label> <label class="matchtitle">{{ match.title }}</label>
<!-- <label class="right-label info">{{ match.date }}</label> --> <!-- <label class="right-label info">{{ match.date }}</label> -->
<!-- </div> --> <!-- </div> -->
<div> <div>
{% for team in match.teams %} {% for team in match.teams %}
<div class="match-result {% cycle 'bottom-border' '' %}"> <div class="match-result {% cycle 'bottom-border' '' %}">
<div class="player"> <div class="player">
{% for name in team.names %} {% for name in team.names %}
<div class="semibold {% if team.is_winner %}winner{% endif %}"> <div class="semibold {% if team.is_winner %}winner{% endif %}">
{{ name }} {{ name }}
</div>
{% endfor %}
</div>
<div class="scores">
{% if match.started %}
{% for score in team.scores %}
<div class="scores">
<span class="score ws {% if team.is_winner %}winner{% endif %}">{{ score }}</span>
</div>
{% endfor %}
{% else %}
<span class="score ws">{{ team.weight }}</span>
{% endif %}
</div>
</div>
<!-- <div class="table-row-3-colums team-names-box {% cycle 'bottom-border' '' %} padding-bottom-small">
<div class="table-cell table-cell-large">
{% for name in team.names %}
<div class="semibold {% if team.is_winner %}winner{% endif %}">
{{ name }}
</div>
{% endfor %}
</div>
<div class=" alignright left-margin">
{% if match.started %}
{% for score in team.scores %}
<div class="scores">
<span class="score ws {% if team.is_winner %}winner{% endif %}">{{ score }}</span>
</div>
{% endfor %}
{% else %}
<span class="score ws">{{ team.weight }}</span>
{% endif %}
</div>
</div> -->
{% endfor %}
</div>
<div class="flex-row top-margin">
<label class="left-label minor-info bold">{{ match.duration }}</label>
<label class="right-label minor-info">{{ match.court }}</label>
<!-- <a href="" class="right-label">{{ match.court }}</a> -->
</div>
</div>
</div> </div>
{% endfor %}
</div>
<!-- <div class="scores"> -->
{% if match.started %}
{% if team.walk_out %}
<span class="score ws">WO</span>
{% else %}
{% for score in team.scores %}
<div class="scores">
<span class="score ws{% if team.is_winner %} winner{% endif %}">{{ score }}</span>
</div>
{% endfor %}
{% endif %}
{% else %}
<span class="score ws">{{ team.weight }}</span>
{% endif %}
<!-- </div> -->
</div>
{% endfor %}
</div>
<div class="flex-row top-margin">
<label class="left-label minor-info bold">{{ match.duration }}</label>
<label class="right-label minor-info">{{ match.court }}</label>
<!-- <a href="" class="right-label">{{ match.court }}</a> -->
</div>
</div>
</div>

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

@ -2,7 +2,7 @@
{% block head_title %}Matchs{% endblock %} {% block head_title %}Matchs{% endblock %}
{% block first_title %}{{ tournament.event.display_name }}{% endblock %} {% block first_title %}{{ tournament.event.display_name }}{% endblock %}
{% block second_title %}{{ tournament.name }}{% endblock %} {% block second_title %}{{ tournament.display_name }}{% endblock %}
{% block content %} {% block content %}

Write Preview
Loading…
Cancel
Save