Moved file column mapping to the view itself

common/settings.py

@@ -106,32 +106,6 @@ ALLOWED_HOSTS = ['localhost', 'stages.pierre-coullery.ch']
 FABRIC_HOST = 'stages.pierre-coullery.ch'
 FABRIC_USERNAME = ''
 
-# Mapping between column names of a tabular file and Student field names
-STUDENT_IMPORT_MAPPING = {
-    'NOCLOEE': 'ext_id',
-    'NOM': 'last_name',
-    'PRENOM': 'first_name',
-    'RUE': 'street',
-    'LOCALITE': 'city',  # pcode is separated from city in prepare_import
-    'TEL_PRIVE': 'tel',
-    'TEL_MOBILE': 'mobile',
-    'EMAIL_RPN': 'email',
-    'DATENAI': 'birth_date',
-    'NAVS13': 'avs',
-    'SEXE': 'gender',
-    'CLASSE_ACTUELLE': 'klass',
-    'LIB_BRANCHE_OPTION': 'option_ase',
-}
-
-CORPORATION_IMPORT_MAPPING = {
-    'NO_EMPLOYEUR' : 'ext_id',
-    'EMPLOYEUR' : 'name',
-    'RUE_EMPLOYEUR': 'street',
-    'LOCALITE_EMPLOYEUR': 'city',
-    'TEL_EMPLOYEUR': 'tel',
-    'CANTON_EMPLOYEUR' : 'district',
-}
-
 INSTRUCTOR_IMPORT_MAPPING = {
     'NO_FORMATEUR': 'ext_id',
     'NOM_FORMATEUR': 'last_name',

stages/forms.py

@@ -1,5 +1,4 @@
 from django import forms
-from django.conf import settings
 
 from tabimport import FileFactory, UnsupportedFileFormat
 
@@ -7,7 +6,12 @@ from .models import Section, Period
 
 
 class StudentImportForm(forms.Form):
-    upload = forms.FileField(label="Fichier des étudiants")
+    upload = forms.FileField()
+
+    def __init__(self, file_label='Fichier', mandatory_headers=None, **kwargs):
+        super().__init__(**kwargs)
+        self.fields['upload'].label = file_label
+        self.mandatory_headers = mandatory_headers
 
     def clean_upload(self):
         f = self.cleaned_data['upload']
@@ -17,7 +21,7 @@ class StudentImportForm(forms.Form):
             raise forms.ValidationError("Erreur: %s" % e)
         # Check needed headers are present
         headers = imp_file.get_headers()
-        missing = set(settings.STUDENT_IMPORT_MAPPING.keys()) - set(headers)
+        missing = set(self.mandatory_headers) - set(headers)
         if missing:
             raise forms.ValidationError("Erreur: il manque les colonnes %s" % (
                 ", ".join(missing)))

stages/views/imports.py

@@ -66,11 +66,41 @@ class ImportViewBase(FormView):
 class StudentImportView(ImportViewBase):
     title = "Importation étudiants"
     form_class = StudentImportForm
+    # Mapping between column names of a tabular file and Student field names
+    student_mapping = {
+        'NOCLOEE': 'ext_id',
+        'NOM': 'last_name',
+        'PRENOM': 'first_name',
+        'RUE': 'street',
+        'LOCALITE': 'city',  # pcode is separated from city in prepare_import
+        'TEL_PRIVE': 'tel',
+        'TEL_MOBILE': 'mobile',
+        'EMAIL_RPN': 'email',
+        'DATENAI': 'birth_date',
+        'NAVS13': 'avs',
+        'SEXE': 'gender',
+        'CLASSE_ACTUELLE': 'klass',
+        'LIB_BRANCHE_OPTION': 'option_ase',
+    }
+    corporation_mapping = {
+        'NO_EMPLOYEUR' : 'ext_id',
+        'EMPLOYEUR' : 'name',
+        'RUE_EMPLOYEUR': 'street',
+        'LOCALITE_EMPLOYEUR': 'city',
+        'TEL_EMPLOYEUR': 'tel',
+        'CANTON_EMPLOYEUR' : 'district',
+    }
+
+    def get_form_kwargs(self):
+        kwargs = super().get_form_kwargs()
+        kwargs.update({
+            'file_label': 'Fichier des étudiants',
+            'mandatory_headers': self.student_mapping.keys(),
+        })
+        return kwargs
 
     def import_data(self, up_file):
         """ Import Student data from uploaded file. """
-        student_mapping = settings.STUDENT_IMPORT_MAPPING
-        corporation_mapping = settings.CORPORATION_IMPORT_MAPPING
 
         def strip(val):
             return val.strip() if isinstance(val, str) else val
@@ -79,7 +109,7 @@ class StudentImportView(ImportViewBase):
         seen_students_ids = set()
         for line in up_file:
             student_defaults = {
-                val: strip(line[key]) for key, val in student_mapping.items()
+                val: strip(line[key]) for key, val in self.student_mapping.items()
             }
             if student_defaults['ext_id'] in seen_students_ids:
                 # Second line for student, ignore it
@@ -98,7 +128,7 @@ class StudentImportView(ImportViewBase):
                 del student_defaults['option_ase']
 
             corporation_defaults = {
-                val: strip(line[key]) for key, val in corporation_mapping.items()
+                val: strip(line[key]) for key, val in self.corporation_mapping.items()
             }
             student_defaults['corporation'] = self.get_corporation(corporation_defaults)