From: Guillaume Pellerin Date: Wed, 3 Feb 2016 16:24:17 +0000 (+0100) Subject: test form qs X-Git-Tag: 1.1~164 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5ff3df0e7f144836a4c7702564fef93000b87dc3;p=teleforma.git test form qs --- diff --git a/teleforma/forms.py b/teleforma/forms.py index c434d503..3a6c0943 100644 --- a/teleforma/forms.py +++ b/teleforma/forms.py @@ -63,5 +63,9 @@ class StudentInline(InlineFormSet): model = Student can_delete = False - fields = ['iej', 'period',] + fields = ['iej', 'period', 'procedure', 'written_speciality', 'oral_speciality', + 'oral_1', ] + def __init__(self, *args, **kwargs): + super(StudentInline,self ).__init__(*args,**kwargs) # populates the post + self.fields['procedure'].queryset = Course.objects.filter(name__in='civil') diff --git a/teleforma/models/core.py b/teleforma/models/core.py index 5d271e9f..61341a90 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -200,6 +200,21 @@ class Course(Model): ordering = ['number'] +class CourseGroup(models.Model): + """(CourseGroup description)""" + + name = models.CharField(_('name'), max_length=255) + courses = models.ManyToManyField(Course, related_name="course_groups", verbose_name=_('courses'), + blank=True, null=True) + + def __unicode__(self): + return u"CourseGroup" + + class Meta(MetaCore): + db_table = app_label + '_' + 'course_group' + verbose_name = _('course group') + + class Professor(Model): user = models.ForeignKey(User, related_name='professor',