From 0c9355d773e95239adf8155962afa9675f26750c Mon Sep 17 00:00:00 2001
From: Claude Paroz <claude@2xlibre.net>
Date: Mon, 21 Aug 2017 10:25:49 +0200
Subject: [PATCH] Updated imputation names

---
 ...001_squashed_0024_course_public_length2.py |  2 +-
 stages/models.py                              |  5 +++--
 stages/views.py                               | 19 ++++++++++---------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/stages/migrations/0001_squashed_0024_course_public_length2.py b/stages/migrations/0001_squashed_0024_course_public_length2.py
index 4417794..4ca9956 100644
--- a/stages/migrations/0001_squashed_0024_course_public_length2.py
+++ b/stages/migrations/0001_squashed_0024_course_public_length2.py
@@ -73,7 +73,7 @@ class Migration(migrations.Migration):
                 ('public', models.CharField(default='', max_length=200, verbose_name='Classe(s)')),
                 ('subject', models.CharField(default='', max_length=100, verbose_name='Sujet')),
                 ('period', models.IntegerField(default=0, verbose_name='Nb de périodes')),
-                ('imputation', models.CharField(choices=[('ASAFE', 'ASAFE'), ('ASEFE', 'ASEFE'), ('ASSCFE', 'ASSCFE'), ('EDEpe', 'EDEpe'), ('EDEps', 'EDEps'), ('EDE', 'EDE'), ('EDS', 'EDS'), ('CAS-FPP', 'CAS-FPP')], max_length=10, verbose_name='Imputation')),
+                ('imputation', models.CharField(choices=[('ASAFE', 'ASAFE'), ('ASEFE', 'ASEFE'), ('ASSCFE', 'ASSCFE'), ('MP', 'MP'), ('EDEpe', 'EDEpe'), ('EDEps', 'EDEps'), ('EDE', 'EDE'), ('EDS', 'EDS'), ('CAS_FPP', 'CAS_FPP')], max_length=10, verbose_name='Imputation')),
             ],
             options={
                 'verbose_name_plural': 'Cours',
diff --git a/stages/models.py b/stages/models.py
index 1bba56b..1b4f2db 100644
--- a/stages/models.py
+++ b/stages/models.py
@@ -102,7 +102,7 @@ class Teacher(models.Model):
         activities = self.calc_activity()
         imputations = OrderedDict(
             [('ASA', 0), ('ASSC', 0), ('ASE', 0), ('MP', 0), ('EDEpe', 0), ('EDEps', 0),
-             ('EDS', 0), ('CAS-FPP', 0), ('Direction', 0)]
+             ('EDS', 0), ('CAS_FPP', 0), ('Direction', 0)]
         )
         courses = self.course_set.all()
 
@@ -369,11 +369,12 @@ IMPUTATION_CHOICES = (
     ('ASAFE', 'ASAFE'),
     ('ASEFE', 'ASEFE'),
     ('ASSCFE', 'ASSCFE'),
+    ('MP', 'MP'),
     ('EDEpe', 'EDEpe'),
     ('EDEps', 'EDEps'),
     ('EDE', 'EDE'),
     ('EDS', 'EDS'),
-    ('CAS-FPP', 'CAS-FPP'),
+    ('CAS_FPP', 'CAS_FPP'),
 )
 
 
diff --git a/stages/views.py b/stages/views.py
index 18421ef..1197359 100644
--- a/stages/views.py
+++ b/stages/views.py
@@ -409,19 +409,20 @@ class HPImportView(ImportViewBase):
     }
     # Mapping between klass field and imputation
     account_categories = {
-        'ASAFE': 'ASA',
-        'ASEFE': 'ASE',
-        'ASSCFE': 'ASSC',
-        'MP': 'LEP',
+        'ASAFE': 'ASAFE',
+        'ASEFE': 'ASEFE',
+        'ASSCFE': 'ASSCFE',
+        'MP': 'MP',
         'EDEpe': 'EDEpe',
         'EDEps': 'EDEps',
         'EDE': 'EDE',
         'EDS': 'EDS',
-        'CAS-FPP': 'CAS-FPP',
-        'Mandat_ASSC': 'ASSC',
-        'Mandat_ASE': 'ASE',
+        'CAS_FPP': 'CAS_FPP',
+        'Mandat_ASA': 'ASAFE',
+        'Mandat_ASSC': 'ASSCFE',
+        'Mandat_ASE': 'ASEFE',
         'Mandat_EDE': 'EDE',
-        'Mandat_EDS': 'EDA',
+        'Mandat_EDS': 'EDS',
     }
 
     def import_data(self, up_file):
@@ -600,7 +601,7 @@ def stages_export(request, scope=None):
 IMPUTATIONS_EXPORT_FIELDS = [
     'Nom', 'Prénom', 'Report passé', 'Ens', 'Discipline',
     'Accomp.', 'Discipline', 'Total payé', 'Indice', 'Taux', 'Report futur',
-    'ASA', 'ASSC', 'ASE', 'MP', 'EDEpe', 'EDEps', 'EDS', 'CAS-FPP', 'Direction'
+    'ASA', 'ASSC', 'ASE', 'MP', 'EDEpe', 'EDEps', 'EDS', 'CAS_FPP', 'Direction'
 ]