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

Updated imputation names

Browse source
This commit is contained in:
Claude Paroz 2017-08-21 10:25:49 +02:00
parent 3c0e8af223
commit 0c9355d773
3 changed files with 14 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
stages/migrations/0001_squashed_0024_course_public_length2.py
View file

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

5
stages/models.py
View file

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

19
stages/views.py
View file

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