Index: /main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py	(revision 16151)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py	(revision 16152)
@@ -23,6 +23,6 @@
 from zope import schema
 #from zope.interface import invariant, Invalid
-#from zope.component import getUtility
-#from zope.catalog.interfaces import ICatalog
+from zope.component import getUtility
+from zope.catalog.interfaces import ICatalog
 from zc.sourcefactory.basic import BasicSourceFactory
 from waeup.kofa.applicants.interfaces import (
@@ -55,4 +55,26 @@
 from waeup.uniben.payments.interfaces import ICustomOnlinePayment
 
+class TranscriptCertificateSource(CertificateSource):
+    """Include Department and Faculty in Title.
+    """
+    def getValues(self, context):
+        catalog = getUtility(ICatalog, name='certificates_catalog')
+        resultset = catalog.searchResults(code=(None, None))
+        resultlist = sorted(resultset, key=lambda
+            value: value.__parent__.__parent__.__parent__.code +
+            value.__parent__.__parent__.code +
+            value.code)
+        return resultlist
+
+    def getTitle(self, context, value):
+        """
+        """
+        try: title = "%s / %s / %s (%s)" % (
+            value.__parent__.__parent__.__parent__.title,
+            value.__parent__.__parent__.title,
+            value.title, value.code)
+        except AttributeError:
+            title = "NA / %s (%s)" % (value.title, value.code)
+        return title
 
 REGISTRATION_CATS = {
@@ -340,5 +362,6 @@
     course_studied = schema.Choice(
         title = _(u'Course of Study'),
-        source = CertificateSource(),
+        source = TranscriptCertificateSource(),
+        description = u'Faculty / Department / Study Course',
         required = False,
         readonly = False,
@@ -348,5 +371,5 @@
         title = _(u'Change of Study Course / Transfer'),
         description = u'If yes, select previous course of study.',
-        source = CertificateSource(),
+        source = TranscriptCertificateSource(),
         readonly = False,
         required = False,
