From 597ada73dae19f5bc311546d5a580149bb836903 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Fri, 1 Nov 2024 23:09:20 +0100 Subject: [PATCH] =?UTF-8?q?Suppression=20de=20champs=20inutiles=20sur=20le?= =?UTF-8?q?s=20cat=C3=A9gories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tegory_alt_name_alter_category_codename.py | 23 +++++++++++++++++++ ...egory_alt_name_remove_category_codename.py | 21 +++++++++++++++++ src/agenda_culturel/models.py | 11 +-------- src/scripts/create_categories.py | 20 ++++++++-------- 4 files changed, 55 insertions(+), 20 deletions(-) create mode 100644 src/agenda_culturel/migrations/0097_alter_category_alt_name_alter_category_codename.py create mode 100644 src/agenda_culturel/migrations/0098_remove_category_alt_name_remove_category_codename.py diff --git a/src/agenda_culturel/migrations/0097_alter_category_alt_name_alter_category_codename.py b/src/agenda_culturel/migrations/0097_alter_category_alt_name_alter_category_codename.py new file mode 100644 index 0000000..dcac1e9 --- /dev/null +++ b/src/agenda_culturel/migrations/0097_alter_category_alt_name_alter_category_codename.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.9 on 2024-11-01 22:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('agenda_culturel', '0096_alter_tag_name'), + ] + + operations = [ + migrations.AlterField( + model_name='category', + name='alt_name', + field=models.CharField(blank=True, help_text='Alternative name used with a time period', max_length=512, null=True, verbose_name='Alternative Name'), + ), + migrations.AlterField( + model_name='category', + name='codename', + field=models.CharField(blank=True, help_text='Short name of the category', max_length=3, null=True, verbose_name='Short name'), + ), + ] diff --git a/src/agenda_culturel/migrations/0098_remove_category_alt_name_remove_category_codename.py b/src/agenda_culturel/migrations/0098_remove_category_alt_name_remove_category_codename.py new file mode 100644 index 0000000..4e61100 --- /dev/null +++ b/src/agenda_culturel/migrations/0098_remove_category_alt_name_remove_category_codename.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.9 on 2024-11-01 22:08 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('agenda_culturel', '0097_alter_category_alt_name_alter_category_codename'), + ] + + operations = [ + migrations.RemoveField( + model_name='category', + name='alt_name', + ), + migrations.RemoveField( + model_name='category', + name='codename', + ), + ] diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index b187a30..a0ab122 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -93,16 +93,7 @@ class Category(models.Model): name = models.CharField( verbose_name=_("Name"), help_text=_("Category name"), max_length=512 ) - alt_name = models.CharField( - verbose_name=_("Alternative Name"), - help_text=_("Alternative name used with a time period"), - max_length=512, - ) - codename = models.CharField( - verbose_name=_("Short name"), - help_text=_("Short name of the category"), - max_length=3, - ) + color = ColorField( verbose_name=_("Color"), help_text=_("Color used as background for the category"), diff --git a/src/scripts/create_categories.py b/src/scripts/create_categories.py index 16a1a01..09f4180 100644 --- a/src/scripts/create_categories.py +++ b/src/scripts/create_categories.py @@ -7,21 +7,21 @@ def run(): # divers categories = [ - ("Théâtre", "Au théâtre", "T"), - ("Concert", "Concerts", "C"), - ("Danse", "Danse", "D"), - ("Arts du spectacle", None, "S"), - ("Jeune public", "Pour le jeune public", "J"), - ("Exposition", "Expositions", "E"), - ("Conférence", "Conférences", "C"), - ("Nature", "Événements nature", "N"), - ("Autre", "Autres événements", "A"), + ("Théâtre"), + ("Concert"), + ("Danse"), + ("Arts du spectacle"), + ("Jeune public"), + ("Exposition"), + ("Conférence"), + ("Nature"), + ("Autre"), ] if len(Category.objects.all()) <= 1: print("On créée des catégories") for c in categories: cat = Category( - name=c[0], alt_name=c[1] if c[1] is not None else c[0], codename=c[2] + name=c[0] ) cat.save()