diff --git a/stages/test_files/CLOEE2_Export_Ester_2018.xls b/stages/test_files/CLOEE2_Export_Ester_2018.xls index 19b7d40..b01e559 100644 Binary files a/stages/test_files/CLOEE2_Export_Ester_2018.xls and b/stages/test_files/CLOEE2_Export_Ester_2018.xls differ diff --git a/stages/tests.py b/stages/tests.py index 73edc15..65d190f 100644 --- a/stages/tests.py +++ b/stages/tests.py @@ -578,8 +578,8 @@ class ImportTests(TestCase): # Student already existed, klass changed student1 = Student.objects.get(ext_id=11111) self.assertEqual(student1.klass.name, '2MPTS ASE1') - self.assertEqual(student1.option_ase.name, 'Accompagnement des enfants') self.assertEqual(student1.city, 'Le Locle') + self.assertEqual(student1.email, 'seraphin.lampion@rpn.ch') # Castafiore was archived stud_arch = Student.objects.get(ext_id=22222) self.assertTrue(stud_arch.archived) diff --git a/stages/views/imports.py b/stages/views/imports.py index 30ed94e..cd19f45 100644 --- a/stages/views/imports.py +++ b/stages/views/imports.py @@ -101,7 +101,7 @@ class StudentImportView(ImportViewBase): 'ENT_NPA': 'pcode', 'ENT_LOCALITE': 'city', 'ENT_TEL': 'tel', - 'ENT_CODE_CANTON' : 'district', + 'ENT_CODE_CANTON': 'district', } mapping_option_ase = { 'GEN': 'Généraliste', @@ -111,7 +111,7 @@ class StudentImportView(ImportViewBase): 'PAG': 'Accompagnement des personnes âgées', } # Those values are always taken from the import file - fields_to_overwrite = ['klass', 'login_rpn'] + fields_to_overwrite = ['klass', 'district', 'login_rpn'] klasses_to_skip = [] def get_form_kwargs(self): @@ -300,11 +300,15 @@ class StudentEsterImportView(StudentImportView): 'ELE_AVS': 'avs', 'ELE_SEXE': 'gender', 'INS_CLASSE': 'klass', - 'PROF_DOMAINE_SPEC': 'option_ase', + 'ELE_CODE_CANTON': 'district', + 'ELE_TEL_PRIVE': 'tel', + 'ELE_TEL_MOBILE': 'mobile', + 'ELE_EMAIL_RPN': 'email', + 'ELE_COMPTE_RPN': 'login_rpn', } corporation_mapping = None # Those values are always taken from the import file - fields_to_overwrite = ['klass', 'street', 'city', 'option_ase'] + fields_to_overwrite = ['klass', 'street', 'city','district', 'tel', 'mobile', 'email', 'login_rpn'] klasses_to_skip = ['1CMS*'] # Abandon classes 1CMS ASE + 1CMS ASSC @property