claudep/epcstages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add new pointer from Training to Teacher model

Browse source
This commit is contained in:
Claude Paroz 2017-07-18 12:48:10 +02:00
parent b00f3e12a8
commit 5d1afb77ee
3 changed files with 32 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
stages/admin.py
View file

@ -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]

26
stages/migrations/0016_referent_to_teacher.py Normal file
View file

@ -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),
),
]

5
stages/models.py
View file

@ -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')