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

Updated Course fields to match the 0015 migration

Browse source
This commit is contained in:
Claude Paroz 2017-07-18 11:29:23 +02:00
parent e20887da1c
commit 72226fa405
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
stages/migrations/0015_auto_20170717_1515.py
View file

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

3
stages/models.py
View file

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

8
stages/views.py
View file

@ -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: