Changeset 7795 for main/waeup.sirp/trunk/src/waeup/sirp/applicants

Timestamp:

8 Mar 2012, 03:30:30 (13 years ago)

Author:

uli

Message:

Merge changes from ulif-schoolgrades back into trunk.

Location:

main/waeup.sirp/trunk

Files:

• . (modified) (1 prop)
• src/waeup/sirp/applicants/interfaces.py (modified) (4 diffs)
• src/waeup/sirp/applicants/tests/test_browser.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/interfaces.py

@@ -18 +18 @@
 """Interfaces of the university application package.
 """
-
 from grokcore.content.interfaces import IContainer
-
+from zc.sourcefactory.basic import BasicSourceFactory
+from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from zope import schema
-from zope.interface import Interface, Attribute, implements, directlyProvides
 from zope.component import getUtilitiesFor, queryUtility, getUtility
 from zope.catalog.interfaces import ICatalog
+from zope.interface import Interface, Attribute, implements, directlyProvides
 from zope.schema.interfaces import (
     ValidationError, ISource, IContextSourceBinder)
-from zc.sourcefactory.basic import BasicSourceFactory
-from zc.sourcefactory.contextual import BasicContextualSourceFactory
 from waeup.sirp.schema import TextLineChoice
 from waeup.sirp.interfaces import (
     ISIRPObject, year_range, validate_email, academic_sessions_vocab)
 from waeup.sirp.interfaces import MessageFactory as _
+from waeup.sirp.payments.interfaces import IOnlinePayment
+from waeup.sirp.schoolgrades import ResultEntryField
+from waeup.sirp.students.vocabularies import (
+    lgas_vocab, CertificateSource, GenderSource)
 from waeup.sirp.university.vocabularies import (
     course_levels, AppCatSource)
-from waeup.sirp.students.vocabularies import (
-    lgas_vocab, CertificateSource, GenderSource)
-from waeup.sirp.payments.interfaces import IOnlinePayment
 
 #: Maximum upload size for applicant passport photographs (in bytes)
@@ -77 +76 @@
     return source
 directlyProvides(contextual_reg_num_source, IContextSourceBinder)
+
 
 class AppCatCertificateSource(CertificateSource):
@@ -360 +360 @@
     state, depending on use-case.
 
-    This base interface is also implemented by the StudentApplication
-    class in the students package. Thus, these are the data which are saved
-    after admission.
-    """
-
+    This base interface is also implemented by the
+    :class:`waeup.sirp.students.StudentApplication` class in the
+    students package. Thus, these are the data which are saved after
+    admission.
+    """
     applicant_id = schema.TextLine(
         title = _(u'Applicant Id'),
@@ -430 +430 @@
         required = False,
         )
+    school_grades = schema.List(
+        title = _(u'School Grades'),
+        value_type = ResultEntryField(),
+        required = True,
+        default = [],
+        )
 
     #

main/waeup.sirp/trunk/src/waeup/sirp/applicants/tests/test_browser.py

@@ -752 +752 @@
         self.browser.open(self.edit_path)
         self.assertTrue(
-            '<option selected="selected" value="CERT1">' in self.browser.contents)
+            '<option selected="selected" value="CERT1">'
+            in self.browser.contents)
+
+    def test_school_grades(self):
+        # we can add school grades
+        self.login()
+        self.browser.open(self.edit_path)
+        self.fill_correct_values() # Fill other fields
+        # add a new (empty) row with subject/grade
+        self.browser.getControl(name="form.school_grades.add").click()
+        # pick first subject (after <no value>)...
+        ctrl_subj = self.browser.getControl(
+            name="form.school_grades.0.subject")
+        ctrl_subj.value = [ctrl_subj.options[1]]
+        display_subj = ctrl_subj.displayOptions[1]
+        # pick first grade (after <no value>)...
+        ctrl_grade = self.browser.getControl(
+            name="form.school_grades.0.grade")
+        ctrl_grade.value = [ctrl_grade.options[1]]
+        display_grade = ctrl_grade.displayOptions[1]
+        # save everything
+        self.browser.getControl("Save").click()
+        self.assertTrue(
+            '<input type="hidden" name="form.school_grades.count" value="1" />'
+            in self.browser.contents)
+        # we can also see the new subject/grade in display view
+        self.browser.open(self.view_path)
+        self.assertTrue(
+            display_subj in self.browser.contents)
+        self.assertTrue(
+            display_grade in self.browser.contents)
+        return
 
 class ApplicantRegisterTests(ApplicantsFullSetup):