Changeset 13011 for main/waeup.uniben/trunk/src/waeup

Timestamp:

28 May 2015, 13:00:16 (10 years ago)

Author:

Henrik Bettermann

Message:

Reorganize pg application categorization.

Location:

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

Files:

• applicants/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (1 diff)

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

@@ -32 +32 @@
     APP_TYPES_DICT = {
         'pude': ['Post-UDE Screening', 'PUDE'],
-        'prence': ['Pre-NCE Programme', 'PRE'],
+        #'prence': ['Pre-NCE Programme', 'PRE'],
         'sandwich': ['Part-Time Degree in Education', 'SAND'],
         'pt': ['Part-Time Degree Programmes', 'PTP'],
@@ -42 +42 @@
         'dp': ['Diploma Programmes', 'DPP'],
         'dpft': ['Diploma Full-Time Programmes', 'DPP'],
-        'pce': ['PCE Screening', 'PCE'],
-        #'pg': ['Postgraduate Programmes', 'PG'],
-        'pgft': ['Postgraduate Full-Time Programmes', 'PG'],
-        'pgpt': ['Postgraduate Part-Time Programmes', 'PG'],
-        'pgnew': ['Postgraduate Programmes (supplementary application #1)', 'PG'],
-        'pgnewtwo': ['Postgraduate Programmes (supplementary application #2)', 'PG'],
-        'pgext': ['Postgraduate Programmes (extended application)', 'PG']
+        #'pce': ['PCE Screening', 'PCE'],
+        'pg': ['Postgraduate Programmes (main advert)', 'PG'],
+        'pga': ['Postgraduate Programmes (1st supplementary advert)', 'PG'],
+        'pgb': ['Postgraduate Programmes (2nd supplementary advert)', 'PG'],
+        'pgc': ['Postgraduate Programmes (3rd supplementary advert)', 'PG'],
+
+        #'pgft': ['Postgraduate Full-Time Programmes', 'PG'],
+        #'pgpt': ['Postgraduate Part-Time Programmes', 'PG'],
+        #'pgnew': ['Postgraduate Programmes (supplementary application #1)', 'PG'],
+        #'pgnewtwo': ['Postgraduate Programmes (supplementary application #2)', 'PG'],
+        #'pgext': ['Postgraduate Programmes (extended application)', 'PG']
         }
 

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

@@ -40 +40 @@
         'dp_ft': 'Diploma Full-Time Programmes',
         'pt_ext': 'Part-Time (extended application)',
-        #'pg': 'Postgraduate',
-        'pg_ft': 'Postgraduate Full-Time',
-        'pg_pt': 'Postgraduate Part-Time',
-        'pg_ext': 'Postgraduate (extended application)',
-        'pg_new': 'Postgraduate (supplementary application #1)',
-        'pg_new2': 'Postgraduate (supplementary application #2)',
+        'pg': 'Postgraduate (main advert)',
+        'pga': 'Postgraduate (1st supplementary advert)',
+        'pgb': 'Postgraduate (2nd supplementary advert)',
+        'pgc': 'Postgraduate (3rd supplementary advert)',
+        'pg_ft': 'Postgraduate Full-Time (deprecated)',
+        'pg_pt': 'Postgraduate Part-Time (deprecated)',
+        'pg_ext': 'Postgraduate (extended application, deprecated)',
+        'pg_new': 'Postgraduate (supplementary application #1, deprecated)',
+        'pg_new2': 'Postgraduate (supplementary application #2, deprecated)',
         }