diff --git a/stages/admin.py b/stages/admin.py index b24aa74..270f462 100644 --- a/stages/admin.py +++ b/stages/admin.py @@ -180,7 +180,7 @@ class StudentAdmin(admin.ModelAdmin): ('last_name', 'first_name', 'ext_id'), ('street', 'pcode', 'city', 'district'), ('email', 'tel', 'mobile'), ('gender', 'avs', 'birth_date'), ('archived', 'dispense_ecg', 'dispense_eps', 'soutien_dys'), - ('klass', 'option_ase'), + ('klass', 'option_ase', 'start_educ'), ('report_sem1', 'report_sem1_sent'), ('report_sem2', 'report_sem2_sent'), ('corporation', 'instructor', 'instructor2') diff --git a/stages/migrations/0037_student_start_educ.py b/stages/migrations/0037_student_start_educ.py new file mode 100644 index 0000000..45d21a0 --- /dev/null +++ b/stages/migrations/0037_student_start_educ.py @@ -0,0 +1,16 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('stages', '0036_corpcontact_etat_civil'), + ] + + operations = [ + migrations.AddField( + model_name='student', + name='start_educ', + field=models.DateField(blank=True, null=True, verbose_name='Entrée en formation'), + ), + ] diff --git a/stages/models.py b/stages/models.py index e9f9c46..92598b9 100644 --- a/stages/models.py +++ b/stages/models.py @@ -303,6 +303,7 @@ class Student(models.Model): null=True, blank=True, on_delete=models.SET_NULL) expert = models.ForeignKey('CorpContact', related_name='rel_expert', verbose_name='Expert externe', null=True, blank=True, on_delete=models.SET_NULL) + start_educ = models.DateField('Entrée en formation', null=True, blank=True) klass = models.ForeignKey(Klass, verbose_name='Classe', blank=True, null=True, on_delete=models.PROTECT) report_sem1 = models.FileField('Bulletin 1er sem.', null=True, blank=True, upload_to='bulletins') diff --git a/stages/views/export.py b/stages/views/export.py index 07cfc80..c5ae923 100644 --- a/stages/views/export.py +++ b/stages/views/export.py @@ -429,7 +429,7 @@ def ortra_export(request): def export_qualification(request): headers = [ - 'Classe', 'Etudiant-e', + 'Classe', 'Etudiant-e', 'Entrée en formation', 'Référent pratique', 'Titre TD', 'Résumé TD', 'Ens. référent', 'Mentor', 'Session', 'Type', 'Exp_int.', @@ -452,6 +452,7 @@ def export_qualification(request): stud_values = [ student.klass.name, student.full_name, + student.start_educ, student.training_referent.full_name if student.training_referent else '', student.title, student.subject,