From bfc6bf143f201bd0279683b5fb88ed0b25fe554c Mon Sep 17 00:00:00 2001 From: Raz Date: Fri, 27 Sep 2024 14:21:28 +0200 Subject: [PATCH 1/4] add court name on summon page --- tournaments/models/tournament.py | 6 ++++-- .../templates/tournaments/broadcast/broadcasted_summon.html | 5 ++++- tournaments/templates/tournaments/summon_row.html | 5 ++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tournaments/models/tournament.py b/tournaments/models/tournament.py index f644ebd..a1f7e21 100644 --- a/tournaments/models/tournament.py +++ b/tournaments/models/tournament.py @@ -221,7 +221,7 @@ class Tournament(models.Model): names = team_registration.team_names() stage = next_match.summon_stage_name() weight = team_registration.weight - summon = TeamSummon(names, next_match.start_date, weight, stage, team_registration.logo) + summon = TeamSummon(names, next_match.start_date, weight, stage, next_match.court_name(next_match.court_index), team_registration.logo) summons.append(summon) summons.sort(key=lambda s: s.date) @@ -727,11 +727,12 @@ class MatchGroup: self.matches = matches class TeamSummon: - def __init__(self, names, date, weight, stage, image): + def __init__(self, names, date, weight, stage, court, image): self.names = names self.date = date self.weight = weight self.stage = stage + self.court = court self.image = image def formatted_date(self): @@ -747,6 +748,7 @@ class TeamSummon: "date": self.formatted_date(), "weight": self.weight, "stage": self.stage, + "court": self.court, "image": self.image, } diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html index 0a39dcc..5d5a2b6 100644 --- a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html @@ -13,7 +13,10 @@ {% else %}
{% endif %} -
+
+
+
+
diff --git a/tournaments/templates/tournaments/summon_row.html b/tournaments/templates/tournaments/summon_row.html index 5a909c7..94b2bbc 100644 --- a/tournaments/templates/tournaments/summon_row.html +++ b/tournaments/templates/tournaments/summon_row.html @@ -8,7 +8,10 @@ {% endfor %} -
{{ summon.date|date:'l H:i' }}
+
+
{{ summon.date|date:'l H:i' }}
+
{{ summon.court }}
+
{{ summon.stage }}
From d5fc63129af5b59fe93da6316e53900101174464 Mon Sep 17 00:00:00 2001 From: Raz Date: Fri, 27 Sep 2024 15:01:09 +0200 Subject: [PATCH 2/4] add court name on summon page --- .../tournaments/broadcast/broadcasted_rankings.html | 2 +- .../tournaments/broadcast/broadcasted_summon.html | 12 ++++++------ .../tournaments/broadcast/broadcasted_summons.html | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_rankings.html b/tournaments/templates/tournaments/broadcast/broadcasted_rankings.html index ed4ef95..f749acc 100644 --- a/tournaments/templates/tournaments/broadcast/broadcasted_rankings.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_rankings.html @@ -16,7 +16,7 @@ .then(res => res.json()) .then((data) => { - let pageSize = 20 + let pageSize = 16 this.paginatedRankings = this.paginate(data, pageSize) const splitGroups = []; diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html index 5d5a2b6..c65854d 100644 --- a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html @@ -6,13 +6,13 @@ + {% if not tournament.hide_weight %} +
+ {% else %} +
+ {% endif %} - - {% if not tournament.hide_weight %} -
- {% else %} -
- {% endif %} +
diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_summons.html b/tournaments/templates/tournaments/broadcast/broadcasted_summons.html index 08157a9..d7838c8 100644 --- a/tournaments/templates/tournaments/broadcast/broadcasted_summons.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_summons.html @@ -16,7 +16,7 @@ .then(res => res.json()) .then((data) => { - let pageSize = 20 + let pageSize = 16 this.paginatedMatches = this.paginate(data, pageSize) const splitGroups = []; From f69c8ca0a1e33a5407ffc1c601d30cd0afdacc6a Mon Sep 17 00:00:00 2001 From: Raz Date: Fri, 27 Sep 2024 15:08:28 +0200 Subject: [PATCH 3/4] add court name on summon page --- .../tournaments/broadcast/broadcasted_summon.html | 7 +------ tournaments/templates/tournaments/summon_row.html | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html index c65854d..26c50cc 100644 --- a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html @@ -6,14 +6,9 @@ - {% if not tournament.hide_weight %} -
- {% else %} -
- {% endif %}
-
+
diff --git a/tournaments/templates/tournaments/summon_row.html b/tournaments/templates/tournaments/summon_row.html index 94b2bbc..ffdfc68 100644 --- a/tournaments/templates/tournaments/summon_row.html +++ b/tournaments/templates/tournaments/summon_row.html @@ -8,11 +8,11 @@ {% endfor %}
-
+
{{ summon.date|date:'l H:i' }}
{{ summon.court }}
-
{{ summon.stage }}
+
{{ summon.stage }}
{% if not forloop.last %} From 3f5f9ada217cf61784eea854f6e9a0ff00414438 Mon Sep 17 00:00:00 2001 From: Raz Date: Fri, 27 Sep 2024 15:11:01 +0200 Subject: [PATCH 4/4] add court name on summon page --- .../templates/tournaments/broadcast/broadcasted_summon.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html index 26c50cc..e08dfda 100644 --- a/tournaments/templates/tournaments/broadcast/broadcasted_summon.html +++ b/tournaments/templates/tournaments/broadcast/broadcasted_summon.html @@ -9,8 +9,8 @@
-
-
+
+