Index: /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/utils/utils.py
===================================================================
--- /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/utils/utils.py	(revision 15072)
+++ /main/kofacustom.edopoly/trunk/src/kofacustom/edopoly/utils/utils.py	(revision 15073)
@@ -66,38 +66,38 @@
 
     STUDY_MODES_DICT = {
-        'ume_ft': 'UME Full Time',
-        'ug_ft': 'Undergraduate Full Time',
-        'ug_pt': 'Undergraduate Part Time',
-        'dp_pt': 'Diploma Part Time',
-        'ct_ft': 'Certificate Full Time',
-        'dp_ft': 'Diploma Full Time',
-        'de_ft': 'Direct Entry Full Time',
-        'de_pt': 'Direct Entry Part Time',
+        #'ume_ft': 'UME Full Time',
+        'ug_ft': 'Undergraduate Full Time (not used in EdoPoly)',
+        #'ug_pt': 'Undergraduate Part Time',
+        #'dp_pt': 'Diploma Part Time',
+        #'ct_ft': 'Certificate Full Time',
+        #'dp_ft': 'Diploma Full Time',
+        #'de_ft': 'Direct Entry Full Time',
+        #'de_pt': 'Direct Entry Part Time',
         'nd_ft': 'National Diploma Full Time',
         'nd_pt': 'National Diploma Part Time',
         'hnd_ft': 'Higher National Diploma Full Time',
         'hnd_pt': 'Higher National Diploma Part Time',
-        'pg_ft': 'Postgraduate Full Time',
-        'pg_pt': 'Postgraduate Part Time',
-        'pgd_ft': 'Postgraduate Diploma Full Time',
-        'pgd_pt': 'Postgraduate Diploma Part Time',
-        'special_pg_pt': 'Special Postgraduate Part Time',
-        'nce_ft': 'NCE Full Time',
-        'nce_pt': 'NCE Part Time',
-        'ug_sw': 'Undergraduate Sandwich',
-        'nce_sw': 'NCE Sandwich',
-        'jm_ft': 'Joint Matriculation Full Time',
-        'ph_ft': 'Post Higher Education Full Time',
-        'transfer_pt': 'Transfer Part Time',
-        'transfer_ft': 'Transfer Full Time',
-        'ct_pt': 'Certificate Part Time',
-        'rmd_ft': 'Remedial with deficiencies',
-        'rm_ft': 'Remedial',
+        #'pg_ft': 'Postgraduate Full Time',
+        #'pg_pt': 'Postgraduate Part Time',
+        #'pgd_ft': 'Postgraduate Diploma Full Time',
+        #'pgd_pt': 'Postgraduate Diploma Part Time',
+        #'special_pg_pt': 'Special Postgraduate Part Time',
+        #'nce_ft': 'NCE Full Time',
+        #'nce_pt': 'NCE Part Time',
+        #'ug_sw': 'Undergraduate Sandwich',
+        #'nce_sw': 'NCE Sandwich',
+        #'jm_ft': 'Joint Matriculation Full Time',
+        #'ph_ft': 'Post Higher Education Full Time',
+        #'transfer_pt': 'Transfer Part Time',
+        #'transfer_ft': 'Transfer Full Time',
+        #'ct_pt': 'Certificate Part Time',
+        #'rmd_ft': 'Remedial with deficiencies',
+        #'rm_ft': 'Remedial',
         'transfer': 'Transfer',
-        'prence': 'Pre-NCE',
-        'prend': 'Pre-ND',
-        'pce': 'PCE',
-        'pd_ft': 'Professional Diploma in Education',
-        'found': 'Foundation',
+        #'prence': 'Pre-NCE',
+        #'prend': 'Pre-ND',
+        #'pce': 'PCE',
+        #'pd_ft': 'Professional Diploma in Education',
+        #'found': 'Foundation',
         'no': 'no application',
         }
@@ -105,7 +105,7 @@
     MODE_GROUPS = {
         'All': ('all',),
-        'Undergraduate Full-Time': ('ug_ft',),
-        'Undergraduate Part-Time': ('ug_pt',),
-        'Postgraduate Full-Time': ('pg_ft',),
-        'Postgraduate Part-Time': ('pg_pt',),
+        'Undergraduate Full-Time': ('hnd_ft', 'nd_ft'),
+        'Undergraduate Part-Time': ('hnd_pt', 'nd_pt'),
+        #'Postgraduate Full-Time': ('pg_ft',),
+        #'Postgraduate Part-Time': ('pg_pt',),
         }
