From 220683d07c22ebfc15b63f8ab1da7a2cff052aad Mon Sep 17 00:00:00 2001 From: Razmig Sarkissian Date: Mon, 31 Jul 2023 15:35:42 +0200 Subject: [PATCH] update ranking page --- ...2_team_couleur_finale_team_points_label.py | 23 +++++++++++++++++++ scores/models.py | 4 ++++ scores/serializers.py | 2 +- scores/templates/scores/ranks.html | 15 +++++++++--- 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 scores/migrations/0022_team_couleur_finale_team_points_label.py diff --git a/scores/migrations/0022_team_couleur_finale_team_points_label.py b/scores/migrations/0022_team_couleur_finale_team_points_label.py new file mode 100644 index 0000000..ec60c77 --- /dev/null +++ b/scores/migrations/0022_team_couleur_finale_team_points_label.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2 on 2023-07-31 13:29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('scores', '0021_team_position_finale'), + ] + + operations = [ + migrations.AddField( + model_name='team', + name='couleur_finale', + field=models.CharField(blank=True, max_length=200), + ), + migrations.AddField( + model_name='team', + name='points_label', + field=models.CharField(blank=True, max_length=200), + ), + ] diff --git a/scores/models.py b/scores/models.py index 4e3da78..f04b16a 100644 --- a/scores/models.py +++ b/scores/models.py @@ -122,5 +122,9 @@ class Team(models.Model): position_label = models.CharField(max_length=200, blank=True) date_label = models.CharField(max_length=200, blank=True) background_color = models.CharField(max_length=200, blank=True) + position_finale = models.IntegerField(default=0) + couleur_finale = models.CharField(max_length=200, blank=True) + points_label = models.CharField(max_length=200, blank=True) + tournament = models.ForeignKey(Tournament, on_delete=models.CASCADE, default=None, blank=True, null=True) diff --git a/scores/serializers.py b/scores/serializers.py index 31dd1fe..6823715 100644 --- a/scores/serializers.py +++ b/scores/serializers.py @@ -28,5 +28,5 @@ class MatchSerializer(serializers.HyperlinkedModelSerializer): class TeamSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = Team - fields = ['id', 'name', 'background_color', 'rank', 'position', 'position_finale', 'bracket', 'position_label', 'date_label', 'tournament'] + fields = ['id', 'name', 'background_color', 'rank', 'position', 'position_finale', 'bracket', 'position_label', 'date_label', 'couleur_finale', 'points_label', 'tournament'] diff --git a/scores/templates/scores/ranks.html b/scores/templates/scores/ranks.html index 74f6308..3fee650 100644 --- a/scores/templates/scores/ranks.html +++ b/scores/templates/scores/ranks.html @@ -95,11 +95,20 @@ Points {% for team in tournament.teamsByFinalRank %} - + #{{ team.position_finale }} - {{ team.name|linebreaksbr }} + {{ team.name|linebreaksbr }} {{ team.rank }} - {{ team.date_label }} + {{ team.points_label }} + {% if team.position_finale == 1 %} + 🥇 + {% endif %} + {% if team.position_finale == 2 %} + 🥈 + {% endif %} + {% if team.position_finale == 3 %} + 🥉 + {% endif %} {% endfor %}