Changeset 7347 for main

Timestamp:

14 Dec 2011, 22:34:02 (13 years ago)

Author:

Henrik Bettermann

Message:

Rollback of r7341 as discussed on the phone. But now we get other problems (see email). A regression test will follow.

Location:

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

Files:

• __init__.py (modified) (2 diffs)
• applicant.py (modified) (2 diffs)
• browser.py (modified) (5 diffs)
• browser_templates/applicantdisplaypage.pt (modified) (1 diff)
• dynamicroles.py (added)
• interfaces.py (modified) (5 diffs)
• tests/test_dynamicroles.py (added)
• vocabularies.py (modified) (3 diffs)

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

@@ -10 +10 @@
     ApplicantsRoot, get_applicant_data, application_exists,
     )
+from waeup.sirp.applicants.dynamicroles import (
+    ApplicantPrincipalRoleManager,)
 
 __all__ = [
@@ -16 +18 @@
     'ApplicantImageNameChooser',
     'ApplicantImageStoreHandler',
+    'ApplicantPrincipalRoleManager',
     'ApplicantsContainer',
     'ApplicantsRoot',

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

@@ -93 +93 @@
             return False, 'Registration Number exists.'
         # Has the course_admitted field been properly filled?
-        code = self.course_admitted.get('code')
-        if code:
-            catalog = getUtility(ICatalog, name='certificates_catalog')
-            cert = [i for i in catalog.searchResults(code=(code,code))][0]
-        else:
+        if self.course_admitted is None:
             return False, 'No course admitted provided.'
         # Add student object
@@ -117 +113 @@
         student.phone = self.phone
         # Save the certificate
-        student['studycourse'].certificate = cert
+        student['studycourse'].certificate = self.course_admitted
         # Create StudentApplication object ...
         application = createObject(u'waeup.StudentApplication')

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

@@ -438 +438 @@
     grok.template('applicantdisplaypage')
     form_fields = grok.AutoFields(IApplicant).omit(
-        'locked',
-        'password')
+        'locked', 'course_admitted', 'password')
     form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     label = 'Applicant'
@@ -469 +468 @@
             container_title, self.context.application_number)
 
-    def getDepartmentAdmitted(self):
-        course_admitted = getattr(self.context,'course_admitted',None)
-        if course_admitted:
-            return course_admitted['dep']
-
-    def getFacultyAdmitted(self):
-        course_admitted = getattr(self.context,'course_admitted',None)
-        if course_admitted:
-            return course_admitted['fac']
+    def getCourseAdmitted(self):
+        """Return link, title and code in html format to the certificate
+           admitted.
+        """
+        course_admitted = self.context.course_admitted
+        if ICertificate.providedBy(course_admitted):
+            url = self.url(course_admitted)
+            title = course_admitted.title
+            code = course_admitted.code
+            return '<a href="%s">%s - %s</a>' %(url,code,title)
+        return ''
 
 class ApplicantBaseDisplayFormPage(ApplicantDisplayFormPage):
@@ -672 +673 @@
     grok.require('waeup.viewApplication')
     form_fields = grok.AutoFields(IApplicant).omit(
-        'locked',
-        )
+        'locked', 'course_admitted')
     form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     prefix = 'form'
@@ -683 +683 @@
             container_title, self.context.application_number)
 
-    def getDepartmentAdmitted(self):
-        course_admitted = getattr(self.context,'course_admitted',None)
-        if course_admitted:
-            return course_admitted['dep']
-
-    def getFacultyAdmitted(self):
-        course_admitted = getattr(self.context,'course_admitted',None)
-        if course_admitted:
-            return course_admitted['fac']
-
+    def getCourseAdmitted(self):
+        """Return title and code in html format to the certificate
+           admitted.
+        """
+        course_admitted = self.context.course_admitted
+        if ICertificate.providedBy(course_admitted):
+            title = course_admitted.title
+            code = course_admitted.code
+            return '%s - %s' %(code,title)
+        return ''
 
     def setUpWidgets(self, ignore_request=False):
@@ -755 +755 @@
             f_text = Paragraph(f_text, style["Normal"])
             data.append([f_label,f_text])
-        #f_label = '<font size=12>Admitted Course of Study:</font>'
-        #f_text = '<font size=12>%s</font>' % self.getCourseAdmitted()
-        #f_label = Paragraph(f_label, style["Normal"])
-        #f_text = Paragraph(f_text, style["Normal"])
-        #data.append([f_label,f_text])
-
-        f_label = '<font size=12>Department:</font>'
-        f_text = '<font size=12>%s</font>' % self.getDepartmentAdmitted()
+        course_admitted = self.getCourseAdmitted()
+        f_label = '<font size=12>Admitted Course of Study:</font>'
+        f_text = '<font size=12>%s</font>' % course_admitted
         f_label = Paragraph(f_label, style["Normal"])
         f_text = Paragraph(f_text, style["Normal"])
         data.append([f_label,f_text])
 
-        f_label = '<font size=12>Faculty:</font>'
-        f_text = '<font size=12>%s</font>' % self.getFacultyAdmitted()
-        f_label = Paragraph(f_label, style["Normal"])
-        f_text = Paragraph(f_text, style["Normal"])
-        data.append([f_label,f_text])
+        course_admitted = self.context.course_admitted
+        if ICertificate.providedBy(course_admitted):
+            f_label = '<font size=12>Department:</font>'
+            f_text = '<font size=12>%s</font>' % (
+                course_admitted.__parent__.__parent__.longtitle())
+            f_label = Paragraph(f_label, style["Normal"])
+            f_text = Paragraph(f_text, style["Normal"])
+            data.append([f_label,f_text])
+
+            f_label = '<font size=12>Faculty:</font>'
+            f_text = '<font size=12>%s</font>' % (
+                course_admitted.__parent__.__parent__.__parent__.longtitle())
+            f_label = Paragraph(f_label, style["Normal"])
+            f_text = Paragraph(f_text, style["Normal"])
+            data.append([f_label,f_text])
 
         # Create table

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantdisplaypage.pt

@@ -27 +27 @@
     <tr>
       <td class="fieldname">
-          Department:
+          Admitted Course of Study:
       </td>
       <td>
-        <span tal:replace="view/getDepartmentAdmitted" />
-      </td>
-    </tr>
-    <tr>
-      <td class="fieldname">
-          Faculty:
-      </td>
-      <td>
-        <span tal:replace="view/getFacultyAdmitted" />
+        <span tal:replace="structure view/getCourseAdmitted" />
       </td>
     </tr>

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

@@ -32 +32 @@
     ISIRPObject, year_range, validate_email, academic_sessions_vocab)
 from waeup.sirp.university.vocabularies import application_categories
-from waeup.sirp.students.vocabularies import lgas_vocab, GenderSource
+from waeup.sirp.students.vocabularies import (
+  lgas_vocab, CertificateSource, GenderSource,
+  )
 from waeup.sirp.applicants.vocabularies import (
   application_types_vocab, application_pins_vocab,
-  AppCatCertificateTitleSource, CertificateTitleSource
+  AppCatCertificateSource,
   )
 from waeup.sirp.payments.interfaces import IOnlinePayment
@@ -343 +345 @@
     course1 = schema.Choice(
         title = u'1st Choice Course of Study',
-        source = CertificateTitleSource(),
+        source = CertificateSource(),
         required = True,
         )
     course2 = schema.Choice(
         title = u'2nd Choice Course of Study',
-        source = CertificateTitleSource(),
+        source = CertificateSource(),
         required = False,
         )
@@ -363 +365 @@
         required = False,
         )
+    course_admitted = schema.Choice(
+        title = u'Admitted Course of Study',
+        source = CertificateSource(),
+        default = None,
+        required = False,
+        )
     notice = schema.Text(
         title = u'Notice',
-        required = False,
-        )
-    course_admitted = schema.Choice(
-        title = u'Admitted Course of Study',
-        source = CertificateTitleSource(),
-        default = None,
         required = False,
         )
@@ -423 +425 @@
     course1 = schema.Choice(
         title = u'1st Choice Course of Study',
-        source = AppCatCertificateTitleSource(),
+        source = AppCatCertificateSource(),
         required = True,
         )
     course2 = schema.Choice(
         title = u'2nd Choice Course of Study',
-        source = AppCatCertificateTitleSource(),
+        source = AppCatCertificateSource(),
         required = False,
         )
@@ -443 +445 @@
     course_admitted = schema.Choice(
         title = u'Admitted Course of Study',
-        source = CertificateTitleSource(),
+        source = CertificateSource(),
         default = None,
         required = False,

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

@@ -21 +21 @@
 from zope.catalog.interfaces import ICatalog
 from waeup.sirp.interfaces import SimpleSIRPVocabulary
-from zc.sourcefactory.contextual import BasicContextualSourceFactory
+from waeup.sirp.students.vocabularies import CertificateSource
 
 #: Types of applications we support.
@@ -44 +44 @@
     *[(u"%s (%s)" % (x[2],x[0]),x[2]) for x in APPLICATION_TYPES])
 
-class CertificateTitleSource(BasicContextualSourceFactory):
-    """A certificate title source delivers all certificates titles provided
-    in the portal.
-    """
-    def getValues(self, context):
-        catalog = getUtility(ICatalog, name='certificates_catalog')
-        certs = list(catalog.searchResults(code=('', 'z*')))
-        certs = [dict(
-            code = i.code,
-            title = i.title,
-            dep = i.__parent__.__parent__.longtitle(),
-            fac = i.__parent__.__parent__.__parent__.longtitle()
-            ) for i in certs]
-        return sorted(certs, key=lambda value: value['code'])
 
-    def getToken(self, context, value):
-        return value['code']
-
-    def getTitle(self, context, value):
-        return "%s - %s" % (value['code'], value['title'][:64])
-
-class AppCatCertificateTitleSource(CertificateTitleSource):
-    """An application certificate source delivers all course titles which belong to
+class AppCatCertificateSource(CertificateSource):
+    """An application certificate source delivers all courses which belong to
     a certain application_category.
     """
@@ -72 +52 @@
         appcat = context.__parent__.application_category
         catalog = getUtility(ICatalog, name='certificates_catalog')
-        certs = list(catalog.searchResults(code=('', 'z*'),
-            application_category=(appcat,appcat)))
-        certs = [dict(
-            code = i.code,
-            title = i.title,
-            dep = i.__parent__.__parent__.longtitle(),
-            fac = i.__parent__.__parent__.__parent__.longtitle()
-            ) for i in certs]
-        return sorted(certs, key=lambda value: value['code'])
-
-
+        return sorted(list(
+                catalog.searchResults(
+                    code=('', 'z*'),
+                    application_category=(appcat,appcat))),
+                    key=lambda value: value.code)