add limits to student courses

diff --git a/teleforma/forms.py b/teleforma/forms.py
index 9d6a52c5981b5abd0f6f20285f9e21af59d6dc86..1ea97786b0aabfad94db80800aae87e987d7f402 100644 (file)
--- a/teleforma/forms.py
+++ b/teleforma/forms.py
@@ -37,7 +37,7 @@ class StudentForm(ModelForm):
 
     def has_changed(self):
         """
-        Overriding this, as the initial data passed to the form does not get noticed, 
+        Overriding this, as the initial data passed to the form does not get noticed,
         and so does not get saved, unless it actually changes
         """
         changed_data = super(ModelForm, self).has_changed()
@@ -71,6 +71,6 @@ class StudentInline(InlineFormSet):
 
     model = Student
     can_delete = False
-    fields = ['iej', 'period', 'procedure', 'written_speciality', 'oral_speciality',
+    fields = ['iej', 'period', 'trainings', 'procedure', 'written_speciality', 'oral_speciality',
                 'oral_1', ]
-
+                

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 61341a90f27df24173611556de7dafd7d0656f41..7cf32acc77287c2d921fa2d2cf8602ea9b3f41f7 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -164,6 +164,11 @@ class Course(Model):
     synthesis_note  = models.BooleanField(_('synthesis note'))
     obligation      = models.BooleanField(_('obligations'))
     magistral       = models.BooleanField(_('magistral'))
+    procedure = models.BooleanField(_('procedure'))
+    written_speciality = models.BooleanField(_('written_speciality'))
+    oral_speciality = models.BooleanField(_('oral_speciality'))
+    oral_1 = models.BooleanField(_('oral_1'))
+    oral_2 = models.BooleanField(_('oral_2'))
 
     def __unicode__(self):
         return self.title

diff --git a/teleforma/models/crfpa.py b/teleforma/models/crfpa.py
index 335f99c685b034f06af6377c0bf66a78c7106edf..0bc70d985f6749fd57da25b77e340d2f2a7b620a 100644 (file)
--- a/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py
@@ -40,7 +40,6 @@ from telemeta.models.core import *
 from teleforma.models.core import *
 
 
-# CRFPA
 
 class IEJ(Model):
 
@@ -61,6 +60,7 @@ class Training(Model):
 
     code            = models.CharField(_('code'), max_length=255)
     name            = models.CharField(_('name'), max_length=255, blank=True)
+    description     = models.CharField(_('description'), max_length=512, blank=True)
     period          = models.ForeignKey('Period', related_name='training', verbose_name=_('period'),
                                  blank=True, null=True)
     synthesis_note  = models.ManyToManyField('CourseType', related_name="training_synthesis_note",
@@ -113,17 +113,17 @@ class Student(Model):
                                       blank=True, null=True)
     procedure       = models.ForeignKey('Course', related_name="procedure",
                                         verbose_name=_('procedure'),
-                                        blank=True, null=True)
+                                        blank=True, null=True, limit_choices_to={'procedure': True})
     written_speciality = models.ForeignKey('Course', related_name="written_speciality",
                                         verbose_name=_('written speciality'),
-                                        blank=True, null=True)
+                                        blank=True, null=True, limit_choices_to={'written_speciality': True})
     oral_speciality = models.ForeignKey('Course', related_name="oral_speciality",
                                         verbose_name=_('oral speciality'),
-                                        blank=True, null=True)
+                                        blank=True, null=True, limit_choices_to={'oral_speciality': True})
     oral_1          = models.ForeignKey('Course', related_name="oral_1", verbose_name=_('oral 1'),
-                                        blank=True, null=True)
+                                        blank=True, null=True, limit_choices_to={'oral_1': True})
     oral_2          = models.ForeignKey('Course', related_name="oral_2", verbose_name=_('oral 2'),
-                                        blank=True, null=True)
+                                        blank=True, null=True, limit_choices_to={'oral_2': True})
     options         = models.ForeignKey('Course', related_name="options", verbose_name=_('options'),
                                         blank=True, null=True)
     period          = models.ForeignKey('Period', related_name='student', verbose_name=_('period'),