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

Fixed student import when birth_date or option_ase are empty

Browse source
This commit is contained in:
Claude Paroz 2017-12-06 11:43:51 +01:00
parent 54e85b744f
commit 8a5c88583f
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
stages/test_files/EXPORT_GAN.xlsx
View file

Binary file not shown.

2
stages/tests.py
View file

@ -308,7 +308,7 @@ class ImportTests(TestCase):
with open(path, 'rb') as fh: # , override_settings(DEBUG=True):
response = self.client.post(reverse('import-students'), {'upload': fh}, follow=True)
msg = "\n".join(str(m) for m in response.context['messages'])
self.assertIn("Objets créés : 2", msg)
self.assertIn("Objets créés : 3", msg)
student1 = Student.objects.get(last_name='Fellmann')
self.assertEqual(student1.corporation.name, "Crèche Les Mousaillons")
self.assertEqual(student1.option_ase.name, "Accompagnement des enfants")

6
stages/views.py
View file

@ -322,13 +322,17 @@ class StudentImportView(ImportViewBase):
# Second line for student, ignore it
continue
seen_students_ids.add(student_defaults['ext_id'])
if isinstance(student_defaults['birth_date'], str):
if student_defaults['birth_date'] == '':
student_defaults['birth_date'] = None
elif isinstance(student_defaults['birth_date'], str):
student_defaults['birth_date'] = datetime.strptime(student_defaults['birth_date'], '%d.%m.%Y').date()
if student_defaults['option_ase']:
try:
student_defaults['option_ase'] = Option.objects.get(name=student_defaults['option_ase'])
except Option.DoesNotExist:
del student_defaults['option_ase']
else:
del student_defaults['option_ase']
corporation_defaults = {
val: strip(line[key]) for key, val in corporation_mapping.items()