diff --git a/stages/models.py b/stages/models.py index 926a489..cd80879 100644 --- a/stages/models.py +++ b/stages/models.py @@ -24,10 +24,19 @@ class Section(models.Model): def __str__(self): return self.name + @property def is_fe(self): """fe=formation en entreprise""" return self.name in {'ASA', 'ASE', 'ASSC'} + @property + def is_EPC(self): + return self.name in {'ASA', 'ASE', 'ASSC', 'EDE', 'EDS'} + + @property + def is_ESTER(self): + return self.name in {'MP_ASE', 'MP_ASSC'} + class Level(models.Model): name = models.CharField(max_length=10, verbose_name='Nom') @@ -324,7 +333,7 @@ class Student(models.Model): @property def role(self): - if self.klass.section.is_fe(): + if self.klass.section.is_fe: return {'M': 'apprenti', 'F': 'apprentie'}.get(self.gender, '') else: return {'M': 'étudiant', 'F': 'étudiante'}.get(self.gender, '') diff --git a/stages/views/imports.py b/stages/views/imports.py index 772fa72..e4ecb8f 100644 --- a/stages/views/imports.py +++ b/stages/views/imports.py @@ -155,7 +155,7 @@ class StudentImportView(ImportViewBase): Student.objects.filter( archived=False, ext_id__isnull=False, - klass__section__in=[s for s in Section.objects.all() if s.is_fe()] + klass__section__in=[s for s in Section.objects.all() if s.is_EPC] ).values_list('ext_id', flat=True) )