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

Fix importation fields for MP

Browse source
This commit is contained in:
alazo 2018-08-17 18:11:00 +02:00 • committed by Claude Paroz
parent 130d50b7ed
commit 8150b1363f
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
stages/test_files/CLOEE2_Export_Ester_2018.xls
View file

Binary file not shown.

2
stages/tests.py
View file

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

12
stages/views/imports.py
View file

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