From 5d1afb77ee5b2382c9313c6c524ca1a365c70965 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Tue, 18 Jul 2017 12:48:10 +0200 Subject: [PATCH] Add new pointer from Training to Teacher model --- stages/admin.py | 3 ++- stages/migrations/0016_referent_to_teacher.py | 26 +++++++++++++++++++ stages/models.py | 5 +++- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 stages/migrations/0016_referent_to_teacher.py diff --git a/stages/admin.py b/stages/admin.py index 16a8aa1..e0ab113 100644 --- a/stages/admin.py +++ b/stages/admin.py @@ -63,7 +63,8 @@ class KlassAdmin(admin.ModelAdmin): class TeacherAdmin(admin.ModelAdmin): - list_display = ('__str__', 'abrev', 'email') + list_display = ('__str__', 'abrev', 'email', 'archived') + list_filter = ('archived',) actions = [print_charge_sheet] diff --git a/stages/migrations/0016_referent_to_teacher.py b/stages/migrations/0016_referent_to_teacher.py new file mode 100644 index 0000000..baa8e25 --- /dev/null +++ b/stages/migrations/0016_referent_to_teacher.py @@ -0,0 +1,26 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('stages', '0015_auto_20170717_1515'), + ] + + operations = [ + migrations.RenameField( + model_name='training', + old_name='referent', + new_name='referent_old', + ), + migrations.AddField( + model_name='training', + name='referent', + field=models.ForeignKey(blank=True, null=True, on_delete=models.deletion.SET_NULL, to='stages.Teacher', verbose_name='Référent'), + ), + migrations.AddField( + model_name='teacher', + name='archived', + field=models.BooleanField(default=False), + ), + ] diff --git a/stages/models.py b/stages/models.py index 95c3555..58f1292 100644 --- a/stages/models.py +++ b/stages/models.py @@ -70,6 +70,7 @@ class Teacher(models.Model): ext_id = models.IntegerField(blank=True, null=True) previous_report = models.IntegerField(default=0, verbose_name='Report précédent') next_report = models.IntegerField(default=0, verbose_name='Report suivant') + archived = models.BooleanField(default=False) class Meta: verbose_name='Enseignant' @@ -336,7 +337,9 @@ class Training(models.Model): """ Stages """ student = models.ForeignKey(Student, verbose_name='Étudiant', on_delete=models.CASCADE) availability = models.OneToOneField(Availability, verbose_name='Disponibilité', on_delete=models.CASCADE) - referent = models.ForeignKey(Referent, null=True, blank=True, verbose_name='Référent', + referent_old = models.ForeignKey(Referent, null=True, blank=True, verbose_name='Référent', + on_delete=models.SET_NULL) + referent = models.ForeignKey(Teacher, null=True, blank=True, verbose_name='Référent', on_delete=models.SET_NULL) comment = models.TextField(blank=True, verbose_name='Remarques')