From 1506a1bbe03dd788cb32a8875ee04c789f0b1fc5 Mon Sep 17 00:00:00 2001 From: SofianeLasri <alasri250@gmail.com> Date: Tue, 13 Jun 2023 20:55:59 +0200 Subject: [PATCH] =?UTF-8?q?Modification=20du=20mod=C3=A8le=20RaceType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WSR/admin.py | 1 + ...acetype_font_awesome_icon_racetype_icon.py | 22 +++++++++++++++++++ WSR/models.py | 13 +++++++---- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 WSR/migrations/0018_remove_racetype_font_awesome_icon_racetype_icon.py diff --git a/WSR/admin.py b/WSR/admin.py index f4d8e90..ad59cdd 100644 --- a/WSR/admin.py +++ b/WSR/admin.py @@ -5,6 +5,7 @@ from WSR.models import * # Register your models here. admin.site.register(Article) admin.site.register(Race) +admin.site.register(RaceType) admin.site.register(Result) admin.site.register(Vehicle) admin.site.register(Driver) diff --git a/WSR/migrations/0018_remove_racetype_font_awesome_icon_racetype_icon.py b/WSR/migrations/0018_remove_racetype_font_awesome_icon_racetype_icon.py new file mode 100644 index 0000000..12ed47d --- /dev/null +++ b/WSR/migrations/0018_remove_racetype_font_awesome_icon_racetype_icon.py @@ -0,0 +1,22 @@ +# Generated by Django 4.2.2 on 2023-06-13 18:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('WSR', '0017_racetype_alter_race_type'), + ] + + operations = [ + migrations.RemoveField( + model_name='racetype', + name='font_awesome_icon', + ), + migrations.AddField( + model_name='racetype', + name='icon', + field=models.ImageField(blank=True, default='', upload_to='racetypes', verbose_name="Logo d'illustration"), + ), + ] diff --git a/WSR/models.py b/WSR/models.py index 1ba6f58..35de010 100644 --- a/WSR/models.py +++ b/WSR/models.py @@ -2,6 +2,7 @@ import datetime from django.db import models + class Season(models.Model): name = models.CharField(max_length=100) year = models.PositiveIntegerField(verbose_name="Year") @@ -27,10 +28,11 @@ class Vehicle(models.Model): def __str__(self): return f"{self.brand} {self.model}" + class RaceType(models.Model): name = models.CharField(max_length=100) description = models.TextField(default="", blank=True) - font_awesome_icon = models.CharField(max_length=64, default="", blank=True) + icon = models.ImageField(upload_to='racetypes', default="", blank=True, verbose_name="Logo d'illustration") image = models.ImageField(upload_to='racetypes', default="", blank=True, verbose_name="Image d'illustration") def __str__(self): @@ -49,7 +51,7 @@ class Race(models.Model): PARIS = "Paris" BARCELONA = "Barcelone" COT = "Côte d'Azur" - HONG_KONG= "Hong Kong" + HONG_KONG = "Hong Kong" OKUTAMA = "Okutama" DUBAI = "Dubaï" YAS_MARINA = "Yas Marina" @@ -92,7 +94,11 @@ class Race(models.Model): date = models.DateField(default=datetime.date.today) def __str__(self): - return self.participation_type + ' | ' + self.type + ' ' + self.name + ' - ' + self.location + ', ' + self.circuit + race_type = RaceType.objects.get(name=self.type) + return ( + f"{self.participation_type} | {race_type.name} {self.name} - " + f"{self.location}, {self.circuit}" + ) class Article(models.Model): @@ -113,4 +119,3 @@ class Result(models.Model): def __str__(self): return f"{self.driver} - {self.race}" - -- GitLab