From: Yoan Le Clanche Date: Tue, 27 Nov 2018 11:01:52 +0000 (+0100) Subject: Merge branch 'dev' of git.parisson.com:git/teleforma into dev X-Git-Tag: 1.4.0~21 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4e5d66624d44247c1fe48154dab195220db3e38d;p=teleforma.git Merge branch 'dev' of git.parisson.com:git/teleforma into dev --- 4e5d66624d44247c1fe48154dab195220db3e38d diff --cc teleforma/models/core.py index c091edee,f0649e39..6a37674d --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@@ -194,9 -194,7 +194,13 @@@ class Course(Model) oral_2 = models.BooleanField(_('oral_2')) has_exam_scripts = models.BooleanField(_("copies d'examen"), default=True) quiz = models.ManyToManyField(Quiz, verbose_name=_('quiz'), blank=True, null=True) + # last professor which received a student message on automatic mode + last_professor_sent = models.ForeignKey('Professor', blank=True, null=True) + ++ periods = models.ManyToManyField('Period', related_name="courses", ++ verbose_name=u'Périodes associées', ++ blank=True, null=True) + periods = models.ManyToManyField('Period', related_name="courses", verbose_name=u'Périodes associées', blank=True, null=True)