Changeset 7795

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)
• src/waeup/sirp/interfaces.py (modified) (4 diffs)
• src/waeup/sirp/schoolgrades.py (copied) (copied from main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/schoolgrades.py)
• src/waeup/sirp/tests/test_schoolgrades.py (copied) (copied from main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/tests/test_schoolgrades.py)
• src/waeup/sirp/widgets/objectwidget.pt (modified) (1 diff)
• src/waeup/sirp/widgets/objectwidget.py (modified) (1 diff)
• src/waeup/sirp/widgets/sequencewidget.pt (copied) (copied from main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/widgets/sequencewidget.pt)
• src/waeup/sirp/widgets/sequencewidget.py (copied) (copied from main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/widgets/sequencewidget.py)
• src/waeup/sirp/widgets/tests/test_objectwidget.py (modified) (9 diffs)

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

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

@@ -31 +31 @@
 from zope.container.interfaces import INameChooser
 from zope.interface import Interface, Attribute, implements
+from zope.schema.interfaces import IObject
 from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
 
@@ -79 +80 @@
     )
 
+SUBJECTS = dict(math=_(u'Math'),
+                bio=_(u'Biology'),
+                eng=_(u'English'),
+                )
+class SubjectSource(BasicSourceFactory):
+    def getValues(self):
+        return sorted(SUBJECTS.keys())
+    def getTitle(self, value):
+        return SUBJECTS.get(value, None)
+
+GRADES = {'A':_(u'Very Good'),
+          'B':_(u'Good'),
+          'C':_(u'Satisfactory'),
+          'D':_(u'Sufficient'),
+          'E':_(u'Fail'),
+          }
+class GradeSource(BasicSourceFactory):
+    def getValues(self):
+        return sorted(GRADES.keys())
+    def getTitle(self, value):
+        return GRADES.get(value, None)
+
 # Define a valiation method for email addresses
 class NotAnEmailAddress(schema.ValidationError):
@@ -145 +168 @@
         return value
 
+class IResultEntry(Interface):
+    """A school grade entry.
+    """
+    subject = schema.Choice(
+        title = _(u'Subject'),
+        source = SubjectSource(),
+        )
+    grade = schema.Choice(
+        title = _(u'Grade'),
+        source = GradeSource(),
+        )
+
+class IResultEntryField(IObject):
+    """A zope.schema-like field for usage in interfaces.
+
+    Marker interface to distuingish result entries from ordinary
+    object fields. Needed for registration of widgets.
+    """
+
 class ISIRPUtils(Interface):
     """A collection of methods which are subject to customization.
@@ -970 +1012 @@
         required = True,
         )
-

main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.pt

@@ -1 @@
-  <td class="row" tal:repeat="widget context/subwidgets">
-    <span tal:define="error widget/error"
-          tal:replace="structure error" tal:condition="error" />
-    <span tal:replace="structure widget" />
-  </td>
+  <div class="row">
+    <span tal:repeat="widget context/subwidgets">
+      <span tal:define="error widget/error"
+            tal:replace="structure error" tal:condition="error" />
+      <span tal:replace="structure widget" />
+    </span>
+  </div>

main/waeup.sirp/trunk/src/waeup/sirp/widgets/objectwidget.py

@@ -60 +60 @@
         return SIRPObjectWidgetView(self, request)
 
+
 class SIRPObjectDisplayWidget(SIRPObjectWidget):
 

main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_objectwidget.py

@@ -21 +21 @@
 import unittest
 import sys
-from zope.component import testing
 from zope.interface import Interface, implements
 from zope.interface.verify import verifyClass
@@ -45 +44 @@
     name = TextLine()
     email = TextLine()
-    
+
 class TestContact(object):
     implements(ITestContact)
@@ -51 +50 @@
 class ITestContent(Interface):
     foo = Object(
-        ITestContact, 
+        ITestContact,
         title = u'Foo Title',
         description = u'',
         )
-    
+
 class ObjectWidgetInputErrorView(object):
     implements(IWidgetInputErrorView)
@@ -82 +81 @@
         provideAdapter(TextWidget, (ITextLine, IDefaultBrowserLayer),
                        IInputWidget)
-        
+
         class TestObject(object):
             implements(ITestContent)
@@ -120 +119 @@
         error_html = widget.error()
         if sys.version_info < (2, 5):
-            self.assertTrue("email: <zope.formlib.interfaces.Mis" 
+            self.assertTrue("email: <zope.formlib.interfaces.Mis"
                              in error_html)
             self.assertTrue("name: <zope.formlib.interfaces.Miss"
@@ -161 +160 @@
         widget1, widget2 = widget.subwidgets()
         self.assertTrue(widget1 is name_widget)
-        
-        
+
+
 class ObjectDisplayWidgetTest(BrowserWidgetTest):
     """Documents and tests the display variant of object widget.
@@ -184 +183 @@
         # adapter that can turn nearly any object into an ITraversable.
         provideAdapter(DefaultTraversable, (None,), ITraversable)
-        
+
         class TestObject(object):
             implements(ITestContent)
@@ -206 +205 @@
                        IDisplayWidget)
 
-        
+
     def test_interfaces(self):
-        from zope.interface.verify import DoesNotImplement
         self.assertTrue(IDisplayWidget.providedBy(self._widget))
         self.assertFalse(IInputWidget.providedBy(self._widget))
@@ -219 +217 @@
 
         check_list = [
-            '<td', 'class=', 'row',
+            '<div', 'class=', 'row',
+            '<span',
             'Foo Name',
-            '</td>', '<td', 'class=', 'row',
+            '</span>', '<span',
             'foo@foo.test',
-            '</td>']
-        self.verifyResult(widget(), check_list, inorder=True)    
+            '</div>']
+        self.verifyResult(widget(), check_list, inorder=True)
 
 def test_suite():