Changeset 8064

Timestamp:

8 Apr 2012, 09:59:47 (13 years ago)

Author:

Henrik Bettermann

Message:

Add more phone prefixes.

Temporarily remove language selector.

Split pg application into pg full-time and pg part-time.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• applicants/tests.py (modified) (3 diffs)
• applicants/utils.py (modified) (1 diff)
• browser/static/favicon.ico (added)
• utils/utils.py (modified) (4 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/applicants/tests.py

@@ -61 +61 @@
         # Add an two different applicants containers
         self.pgcontainer = ApplicantsContainer()
-        self.pgcontainer.code = u'pg2011'
-        self.pgcontainer.prefix = u'pg'
-        self.app['applicants']['pg2011'] = self.pgcontainer
+        self.pgcontainer.code = u'pgft2011'
+        self.pgcontainer.prefix = u'pgft'
+        self.app['applicants']['pgft2011'] = self.pgcontainer
         self.ugcontainer = ApplicantsContainer()
         self.ugcontainer.code = u'app2011'
@@ -84 +84 @@
         pgapplicant.firstname = u'Anna'
         pgapplicant.lastname = u'Post'
-        self.app['applicants']['pg2011'].addApplicant(pgapplicant)
+        self.app['applicants']['pgft2011'].addApplicant(pgapplicant)
         self.pgapplication_number = pgapplicant.application_number
-        self.pgapplicant = self.app['applicants']['pg2011'][
+        self.pgapplicant = self.app['applicants']['pgft2011'][
             self.pgapplication_number]
 
@@ -108 +108 @@
     def test_manage_and_view_applicant(self):
         # Managers can manage pg applicants
-        pgapplicant_path = ('http://localhost/app/applicants/pg2011/%s'
+        pgapplicant_path = ('http://localhost/app/applicants/pgft2011/%s'
             % self.pgapplication_number)
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')

main/waeup.uniben/trunk/src/waeup/uniben/applicants/utils.py

@@ -38 +38 @@
         'dp': ['Diploma Programmes', 'DPP'],
         'pce': ['PCE Screening', 'PCE'],
-        'pg': ['Postgraduate Programmes', 'PCE']
+        'pgft': ['Postgraduate Full-Time Programmes', 'PG'],
+        'pgpt': ['Postgraduate Part-Time Programmes', 'PG']
         }
 

main/waeup.uniben/trunk/src/waeup/uniben/utils/utils.py

@@ -19 +19 @@
 """
 import os
-from waeup.kofa.utils.utils import KofaUtils
+from waeup.kofa.utils.utils import KofaUtils, sorted_phone_prefixes
 from waeup.kofa.accesscodes import create_accesscode
 from waeup.uniben.interfaces import MessageFactory as _
@@ -51 +51 @@
     return
 
+INT_PHONE_PREFIXES = [
+    (99, _('Germany'), '49'),
+    ( 1, _('Nigeria'), '234'),
+    (99, _('United States'), '1'),
+    (99, _('Niger'), '234'),
+    (99, _('Benin'), '229'),
+    (99, _('Cameroon'), '237'),
+    (99, _('United Kingdom'), '44'),
+    (99, _('France'), '33'),
+    ]
 
 class KofaUtils(KofaUtils):
@@ -57 +67 @@
     PORTAL_LANGUAGE = 'en'
 
+    # We do not dosplay the language selector at the moment.
     PREFERRED_LANGUAGES_DICT = {
-        'en':(1, u'English'),
-        'fr':(2, u'Français'),
-        'de':(3, u'Deutsch'),
-        'ha':(4, u'Hausa'),
-        'yo':(5, u'Yoruba'),
-        'ig':(6, u'Igbo'),
-        }
+        }
+
+    #: A function to return
+    @classmethod
+    def sorted_phone_prefixes(cls, data=INT_PHONE_PREFIXES, request=None):
+        return sorted_phone_prefixes(data, request)
 
     EXAM_SUBJECTS_DICT = {
@@ -200 +210 @@
         'basic': 'PUME, PDE, PCE, PRENCE',
         'no': 'no application',
-        'pg': 'Postgraduate',
+        'pg_ft': 'Postgraduate Full-Time',
+        'pg_pt': 'Postgraduate Part-Time',
         'sandwich': 'Sandwich',
         'cest': 'Part-Time, Diploma, Certificate'