Changeset 6254

Timestamp:

31 May 2011, 07:12:39 (13 years ago)

Author:

Henrik Bettermann

Message:

Render Admitted Course of Study seperately and provide URL to certificate.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• browser_templates/form_display.pt (added)
• interfaces.py (modified) (3 diffs)

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

@@ -44 +44 @@
     )
 from waeup.sirp.interfaces import IWAeUPObject, ILocalRolesAssignable
+from waeup.sirp.university.interfaces import ICertificate
 from waeup.sirp.widgets.datewidget import (
     FriendlyDateWidget, FriendlyDateDisplayWidget)
@@ -435 +436 @@
     grok.name('index')
     grok.require('waeup.handleApplication')
-    form_fields = grok.AutoFields(IApplicant).omit('locked')
+    form_fields = grok.AutoFields(IApplicant).omit('locked').omit('course_admitted')
     #form_fields['fst_sit_results'].custom_widget = list_results_display_widget
     form_fields['passport'].custom_widget = ThumbnailWidget
     form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     label = 'Applicant'
+    grok.template('form_display')
     pnav = 3
 
@@ -450 +452 @@
         container_title = self.context.__parent__.title
         return '%s Application Record' % container_title
+
+    @property
+    def getCourseAdmitted(self):
+        course_admitted = self.context.course_admitted
+        #import pdb; pdb.set_trace()
+        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,title,code)
+        return 'not yet admitted'
 
 class ApplicantsManageActionButton(ManageActionButton):

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

@@ -389 +389 @@
         source = lgas_vocab,
         title = u'State/LGA',
-        required = False,
+        default = 'foreigner',
+        required = True,
         )
     sex = schema.Choice(
@@ -439 +440 @@
         )
     course_admitted = schema.Choice(
-        # XXX: should be choice
         title = u'Admitted Course of Study',
         source = CertificateSource(),
+        default = None,
         required = False,
         )
@@ -489 +490 @@
         required = False,
         readonly = True,
+        default = None,
         )
     entry_session = schema.TextLine(