diff --git a/stages/migrations/0015_auto_20170717_1515.py b/stages/migrations/0015_auto_20170717_1515.py index 58c2f84..e946f80 100644 --- a/stages/migrations/0015_auto_20170717_1515.py +++ b/stages/migrations/0015_auto_20170717_1515.py @@ -21,9 +21,4 @@ class Migration(migrations.Migration): model_name='course', name='section', ), - migrations.AlterField( - model_name='course', - name='imputation', - field=models.CharField(blank=True, default='', max_length=10, verbose_name='Imputation'), - ), ] diff --git a/stages/models.py b/stages/models.py index b816752..95c3555 100644 --- a/stages/models.py +++ b/stages/models.py @@ -377,9 +377,8 @@ class Course(models.Model): """Cours et mandats attribués aux enseignants""" teacher = models.ForeignKey(Teacher, blank=True, null=True, verbose_name="Enseignant-e", on_delete=models.SET_NULL) - klass = models.CharField("Classe(s)", max_length=40, default='') + public = models.CharField("Classe(s)", max_length=40, default='') subject = models.CharField("Sujet", max_length=100, default='') - section = models.CharField("Section", max_length=10, default='') period = models.IntegerField("Nb de périodes", default=0) # Imputation comptable: compte dans lequel les frais du cours seront imputés imputation = models.CharField("Imputation", max_length=10, choices=IMPUTATION_CHOICES) diff --git a/stages/views.py b/stages/views.py index a358d58..0b5fce7 100644 --- a/stages/views.py +++ b/stages/views.py @@ -356,7 +356,7 @@ class HPImportView(ImportViewBase): mapping = { 'NOMPERSO_ENS': 'teacher', 'LIBELLE_MAT': 'subject', - 'NOMPERSO_DIP': 'klass', + 'NOMPERSO_DIP': 'public', 'TOTAL': 'period', } # Mapping between klass field and imputation @@ -392,20 +392,20 @@ class HPImportView(ImportViewBase): defaults = { 'teacher': profs[line['NOMPERSO_ENS']], 'subject': line['LIBELLE_MAT'], - 'klass': line['NOMPERSO_DIP'], + 'public': line['NOMPERSO_DIP'], } obj, created = Course.objects.get_or_create( teacher = defaults['teacher'], subject = defaults['subject'], - klass = defaults['klass']) + public = defaults['public']) period = int(float(line['TOTAL'])) if created: obj.period = period obj_created += 1 for k, v in self.account_categories.items(): - if k in obj.klass: + if k in obj.public: obj.imputation = v break else: