From 4395ee5428d6b750f6edaf5ca7bd92119ccd5029 Mon Sep 17 00:00:00 2001 From: Gabriel Augendre Date: Sat, 2 Jun 2018 16:39:10 +0200 Subject: [PATCH] Alphabetically sort editors and teachers. Close #13 --- manuels/migrations/0021_auto_20180602_1638.py | 21 +++++++++++++++++++ manuels/models.py | 6 ++++++ 2 files changed, 27 insertions(+) create mode 100644 manuels/migrations/0021_auto_20180602_1638.py diff --git a/manuels/migrations/0021_auto_20180602_1638.py b/manuels/migrations/0021_auto_20180602_1638.py new file mode 100644 index 0000000..e1c57cf --- /dev/null +++ b/manuels/migrations/0021_auto_20180602_1638.py @@ -0,0 +1,21 @@ +# Generated by Django 2.0.5 on 2018-06-02 14:38 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('manuels', '0020_auto_20180602_1630'), + ] + + operations = [ + migrations.AlterModelOptions( + name='editor', + options={'ordering': ['name'], 'verbose_name': 'éditeur', 'verbose_name_plural': 'éditeurs'}, + ), + migrations.AlterModelOptions( + name='teacher', + options={'ordering': ['first_name'], 'verbose_name': 'coordonnateur', 'verbose_name_plural': 'coordonnateurs'}, + ), + ] diff --git a/manuels/models.py b/manuels/models.py index 580eb82..ffbd7b4 100644 --- a/manuels/models.py +++ b/manuels/models.py @@ -14,6 +14,7 @@ from django.urls import reverse class BaseModel(models.Model): class Meta: abstract = True + created_at = models.DateTimeField('créé le', auto_now_add=True) updated_at = models.DateTimeField('mis à jour le', auto_now=True) @@ -31,6 +32,8 @@ class Teacher(BaseModel): class Meta: verbose_name = 'coordonnateur' verbose_name_plural = 'coordonnateurs' + ordering = ['first_name'] + uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False) first_name = models.CharField('prénom', max_length=100) last_name = models.CharField('nom', max_length=100) @@ -80,6 +83,7 @@ class Level(BaseModel): class Meta: verbose_name = 'classe' verbose_name_plural = 'classes' + name = models.CharField('nom', max_length=50) def __str__(self): @@ -90,6 +94,8 @@ class Editor(BaseModel): class Meta: verbose_name = 'éditeur' verbose_name_plural = 'éditeurs' + ordering = ['name'] + name = models.CharField('nom', max_length=100) def __str__(self):