diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py index 506646f..440fe6d 100644 --- a/tournaments/models/tournament.py +++ b/tournaments/models/tournament.py @@ -185,7 +185,7 @@ class Tournament(models.Model): team = TeamRanking(names, ranking, points, team_registration.logo) rankings.append(team) - rankings.sort(key=lambda s: s.ranking) + rankings.sort(key=lambda r: r.ranking) return rankings def teams(self): @@ -628,16 +628,17 @@ class TeamRanking: def __init__(self, names, ranking, points, image): self.names = names self.ranking = ranking - self.points = points + self.formatted_ranking = self.ordinal(ranking) + self.points = self.points_earned_display(points) self.image = image - def ranking_display(self): - return self.ordinal(self.ranking) + # def ranking_display(self): + # return self.ordinal(self.ranking) - def points_earned_display(self): - if self.points is None: + def points_earned_display(self, points): + if points is None: return "" - return f"+{self.points} pt{self.plural_suffix(self.points)}" + return f"+{points} pt{self.plural_suffix(points)}" def plural_suffix(self, n): if n > 1: @@ -656,7 +657,8 @@ class TeamRanking: def to_dict(self): return { "names": self.names, - "ranking": self.ranking_display(), - "points": self.points_earned_display(), + "ranking": self.ranking, + "formatted_ranking": self.formatted_ranking, + "points": self.points, "image": self.image, } diff --git a/tournaments/static/tournaments/css/style.css b/tournaments/static/tournaments/css/style.css index 71e073c..670873f 100644 --- a/tournaments/static/tournaments/css/style.css +++ b/tournaments/static/tournaments/css/style.css @@ -200,6 +200,10 @@ tr { padding-top: 4px; } +.padding-left { + padding-left: 10px; +} + .names { /* width: 70%; */ } @@ -605,6 +609,15 @@ h-margin { } +.table-row-3-colums-ranks { + display: grid; + grid-template-columns: 80px 1fr auto ; + /* first column is a hack */ + align-items: center; + /* Vertically center the content within each column */ + padding: 5px 0px; +} + .table-row-3-colums-teams { display: grid; grid-template-columns: 1px auto auto 80px; diff --git a/tournaments/templates/tournaments/broadcast.html b/tournaments/templates/tournaments/broadcast.html index a2c4de8..f293aa2 100644 --- a/tournaments/templates/tournaments/broadcast.html +++ b/tournaments/templates/tournaments/broadcast.html @@ -15,6 +15,7 @@
+ diff --git a/tournaments/templates/tournaments/broadcast_club.html b/tournaments/templates/tournaments/broadcast_club.html index 867b90a..81b0859 100644 --- a/tournaments/templates/tournaments/broadcast_club.html +++ b/tournaments/templates/tournaments/broadcast_club.html @@ -33,6 +33,7 @@ Matchs | Poules | Convocations + Classement diff --git a/tournaments/templates/tournaments/broadcasted_ranking.html b/tournaments/templates/tournaments/broadcasted_ranking.html new file mode 100644 index 0000000..7e9247b --- /dev/null +++ b/tournaments/templates/tournaments/broadcasted_ranking.html @@ -0,0 +1,14 @@ +{% load static %} + +