Index: /WAeUP_SRP/trunk/Students.py
===================================================================
--- /WAeUP_SRP/trunk/Students.py	(revision 471)
+++ /WAeUP_SRP/trunk/Students.py	(revision 472)
@@ -102,6 +102,6 @@
                 logger.info('%(tr_count)s: Creating Student with ID %(sid)s Matric_no %(matric_no)s ' % vars())
                 s = getattr(self,sid)
-                s.invokeFactory('StudentAdmission','admission')
-                da = {'Title': 'Admission Data'}
+                s.invokeFactory('StudentApplication','application')
+                da = {'Title': 'Application Data'}
                 s.invokeFactory('StudentPersonal','personal')
                 da['jamb_reg_no'] = student.get('EntryRegNo')
@@ -112,5 +112,5 @@
                 dc = {'Title': 'Clearance Data'}
                 dc['matric_no'] = matric_no
-                lga = student.get('State') + ' / ' + student.get('LGA')               
+                lga = student.get('State') + ' / ' + student.get('LGA')
                 dc['lga'] = lga
                 dc['nationality'] = student.get('Nationality')
@@ -125,5 +125,5 @@
                 d['campus_address'] = student.get('CampusAddress')
                 d['phone'] = student.get('PhoneNumber')
-                s.admission.getContent().edit(mapping=da)
+                s.application.getContent().edit(mapping=da)
                 sp.getContent().edit(mapping=d)
                 sc.getContent().edit(mapping=dc)
@@ -295,5 +295,5 @@
             logger.info('processing %(REG-NO)s,%(NAME)s,%(SEX)s,%(STATE)s,%(LGA)s,%(ENG-SCORE)s,%(SUBJ1)s,%(SUBJ1-SCORE)s,%(SUBJ2)s,%(SUBJ2-SCORE)s,%(SUBJ3)s,%(SUBJ3-SCORE)s,%(AGGREGATE)s,%(UNIV1)s,%(FACULTY1)s,%(COURSE1)s,%(UNIV2)s,%(FACULTY2)s,%(COURSE2)s\n' % jamb)
             jamb_reg_no = jamb.get('REG-NO')
-            res = self.portal_catalog({'meta_type': "StudentAdmission",
+            res = self.portal_catalog({'meta_type': "StudentApplication",
                                      'jamb_reg_no': jamb_reg_no })
             if res:
@@ -314,6 +314,6 @@
             logger.info('%(tr_count)s: Creating Student with ID %(sid)s REG-NO %(jamb_reg_no)s ' % vars())
             s = getattr(self,sid)
-            s.invokeFactory('StudentAdmission','admission')
-            da = {'Title': 'Admission Data'}
+            s.invokeFactory('StudentApplication','application')
+            da = {'Title': 'Application Data'}
 ##            s.invokeFactory('StudentPersonal','personal')
 ##            sp = s.personal
@@ -334,9 +334,9 @@
             da["jamb_second_uni"] = jamb.get("UNIV2")
 ##            s.personal.getContent().edit(mapping=d)
-            s.admission.getContent().edit(mapping=da)
+            s.application.getContent().edit(mapping=da)
         return self.REQUEST.RESPONSE.redirect("%s" % self.REQUEST.get('URL1'))
     ###)
-                
-            
+
+
 
     security.declareProtected(View,"Title")
@@ -369,5 +369,5 @@
             content = data.getContent()
             return "%s %s" % (content.firstname,content.lastname)
-        data = getattr(self,'admission',None)
+        data = getattr(self,'application',None)
         if data:
             content = data.getContent()
@@ -446,5 +446,5 @@
         """compose title"""
         return "Level %s" % self.aq_parent.getId()
-    
+
 
 InitializeClass(StudyLevel)
@@ -489,5 +489,5 @@
             return sum/course_count
         return 0.0
-    
+
 InitializeClass(StudentStudyLevel)
 
@@ -523,23 +523,23 @@
 ###)
 
-class StudentAdmission(CPSDocument): ###(
-    """
-    WAeUP Student container for the various student data
-    """
-    meta_type = 'StudentAdmission'
-    portal_type = meta_type
-    security = ClassSecurityInfo()
-
-    security.declareProtected(View,"Title")
-    def Title(self):
-        """compose title"""
-        return "Admission Data"
-
-
-InitializeClass(StudentAdmission)
-
-def addStudentAdmission(container, id, REQUEST=None, **kw):
+class StudentApplication(CPSDocument): ###(
+    """
+    WAeUP Student container for the various student data
+    """
+    meta_type = 'StudentApplication'
+    portal_type = meta_type
+    security = ClassSecurityInfo()
+
+    security.declareProtected(View,"Title")
+    def Title(self):
+        """compose title"""
+        return "Application Data"
+
+
+InitializeClass(StudentApplication)
+
+def addStudentApplication(container, id, REQUEST=None, **kw):
     """Add a Students eligibility data."""
-    ob = StudentAdmission(id, **kw)
+    ob = StudentApplication(id, **kw)
     return CPSBase_adder(container, ob, REQUEST=REQUEST)
 
@@ -587,5 +587,5 @@
     portal_type = meta_type
     security = ClassSecurityInfo()
-    
+
     def getCourseEntry(self,cid):
         res = self.portal_catalog({'meta_type': "StudentCourse",
Index: /WAeUP_SRP/trunk/Widgets.py
===================================================================
--- /WAeUP_SRP/trunk/Widgets.py	(revision 471)
+++ /WAeUP_SRP/trunk/Widgets.py	(revision 472)
@@ -232,8 +232,8 @@
                 err = 'Invalid Registration Number in the format: %s%s with N = Number, L = Letter' % (self.digits_str,self.letters_str)
             else:
-                search = self.portal_catalog({'meta_type': 'StudentAdmission',
+                search = self.portal_catalog({'meta_type': 'StudentApplication',
                                               'jamb_reg_no': value,
                                               })
-                if len(search) < 1: 
+                if len(search) < 1:
                     err = 'No JAMB data for %s' % (value)
             if err:
Index: /WAeUP_SRP/trunk/__init__.py
===================================================================
--- /WAeUP_SRP/trunk/__init__.py	(revision 471)
+++ /WAeUP_SRP/trunk/__init__.py	(revision 472)
@@ -41,5 +41,5 @@
          "StudentStudyCourse",
          "StudentCourseResult",
-         "StudentAdmission",
+         "StudentApplication",
          "StudentClearance",
          "StudentPersonal",
Index: /WAeUP_SRP/trunk/profiles/default/layouts.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 471)
+++ /WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 472)
@@ -13,6 +13,6 @@
  <object name="student_check_pin" meta_type="CPS Layout"/>
  <object name="student_study_course" meta_type="CPS Layout"/>
- <object name="student_admission" meta_type="CPS Layout"/>
- <object name="student_admission_fe" meta_type="CPS Layout"/>
+ <object name="student_application" meta_type="CPS Layout"/>
+ <object name="student_application_fe" meta_type="CPS Layout"/>
  <object name="student_clearance" meta_type="CPS Layout"/>
  <object name="student_clearance_fe" meta_type="CPS Layout"/>
Index: eUP_SRP/trunk/profiles/default/layouts/student_admission.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_admission.xml	(revision 471)
+++ 	(revision )
@@ -1,329 +1,0 @@
-<?xml version="1.0"?>
-<object name="student_admission" meta_type="CPS Layout">
- <property name="layout_create_method"></property>
- <property name="layout_edit_method"></property>
- <property name="layout_view_method"></property>
- <property name="style_prefix">layout_waeup_</property>
- <property name="flexible_widgets"/>
- <property name="validate_values_expr"></property>
-
- <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Application PIN</property>
-  <property name="fields">
-   <element value="app_ac_pin"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Application PIN</property>
-  <property name="label_edit">Application PIN</property>
-  <property
-     name="help"></property>
-  <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes">
-   <element value="create"/>
-  </property>
-  <property name="size_max">12</property>
- </widget>
-
- <widget name="jamb_reg_no" meta_type="StudentId Widget">
-  <property name="title">JAMB Registration Number</property>
-  <property name="fields">
-   <element value="jamb_reg_no"/>
-  </property>
-  <property name="is_required">False</property>
-  <property name="label">JAMB Registration Number</property>
-  <property name="label_edit">JAMB Registration Number</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="display_width">10</property>
-  <property name="size_max">10</property>
- </widget>
-
- <widget name="jamb_firstname" meta_type="String Widget">
-  <property name="title">JAMB First Name</property>
-  <property name="fields">
-   <element value="jamb_firstname"/>
-  </property>
-  <property name="is_required">False</property>
-  <property name="label">JAMB First Name</property>
-  <property name="label_edit">JAMB First Name</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_lastname" meta_type="String Widget">
-  <property name="title">JAMB Lastname</property>
-  <property name="fields">
-   <element value="jamb_lastname"/>
-  </property>
-  <property name="label">JAMB Lastname</property>
-  <property name="label_edit">JAMB Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_middlename" meta_type="String Widget">
-  <property name="title">JAMB Middle Name</property>
-  <property name="fields">
-   <element value="jamb_middlename"/>
-  </property>
-  <property name="label">JAMB Middl Name</property>
-  <property name="label_edit">JAMB Middle Name</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
- 
- <widget name="entry_mode" meta_type="String Widget">
-  <property name="title">Mode of Entry</property>
-  <property name="fields">
-   <element value="entry_mode"/>
-  </property>
-  <property name="label">Mode of Entry</property>
-  <property name="label_edit">Mode of Entry</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget> 
-
- <widget name="jamb_sex" meta_type="Boolean Widget">
-  <property name="title">JAMB Sex</property>
-  <property name="fields">
-   <element value="jamb_sex"/>
-  </property>
-  <property name="label">JAMB Sex</property>
-  <property name="label_edit">JAMB Sex</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="label_false">male</property>
-  <property name="label_true">female</property>
- </widget>
-
- <widget name="jamb_age" meta_type="Int Widget">
-  <property name="title">JAMB Age</property>
-  <property name="fields">
-   <element value="jamb_age"/>
-  </property>
-  <property name="label">JAMB Age</property>
-  <property name="label_edit">JAMB Age</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_state" meta_type="String Widget">
-  <property name="title">JAMB State</property>
-  <property name="fields">
-   <element value="jamb_state"/>
-  </property>
-  <property name="label">JAMB State</property>
-  <property name="label_edit">JAMB State</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_lga" meta_type="String Widget">
-  <property name="title">JAMB Local Government Area</property>
-  <property name="fields">
-   <element value="jamb_lga"/>
-  </property>
-  <property name="label">JAMB Local Government Area</property>
-  <property name="label_edit">JAMB Local Government Area</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_score" meta_type="String Widget">
-  <property name="title">JAMB Score</property>
-  <property name="fields">
-   <element value="jamb_score"/>
-  </property>
-  <property name="label">JAMB Score</property>
-  <property name="label_edit">JAMB Score</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_first_cos" meta_type="String Widget">
-  <property name="title">JAMB First Choice Course of Study</property>
-  <property name="fields">
-   <element value="jamb_first_cos"/>
-  </property>
-  <property name="label">JAMB First Choice Course of Study</property>
-  <property name="label_edit">JAMB First Choice Course of Study</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_second_cos" meta_type="String Widget">
-  <property name="title">JAMB Second Choice Course of Study</property>
-  <property name="fields">
-   <element value="jamb_second_cos"/>
-  </property>
-  <property name="label">JAMB Second Choice Course of Study</property>
-  <property name="label_edit">JAMB Second Choice Course of Study</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_first_uni" meta_type="String Widget">
-  <property name="title">JAMB First Choice University</property>
-  <property name="fields">
-   <element value="jamb_first_uni"/>
-  </property>
-  <property name="label">JAMB First Choice University</property>
-  <property name="label_edit">JAMB First Choice University</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_second_uni" meta_type="String Widget">
-  <property name="title">JAMB Second Choice University</property>
-  <property name="fields">
-   <element value="jamb_second_uni"/>
-  </property>
-  <property name="label">JAMB Second Choice University</property>
-  <property name="label_edit">JAMB Second Choice University</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="pume_gen_paper" meta_type="String Widget">
-  <property name="title">PUME General Paper</property>
-  <property name="fields">
-   <element value="pume_gen_paper"/>
-  </property>
-  <property name="label">PUME General Paper</property>
-  <property name="label_edit">PUME General Paper</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="pume_eng_score" meta_type="String Widget">
-  <property name="title">PUME English Score</property>
-  <property name="fields">
-   <element value="pume_eng_score"/>
-  </property>
-  <property name="label">PUME English Score</property>
-  <property name="label_edit">PUME English Score</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="pume_math_score" meta_type="String Widget">
-  <property name="title">PUME Mathematics Score</property>
-  <property name="fields">
-   <element value="pume_math_score"/>
-  </property>
-  <property name="label">PUME Mathematics Score</property>
-  <property name="label_edit">PUME Mathematics Score</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="pume_tot_score" meta_type="String Widget">
-  <property name="title">PUME Total Score</property>
-  <property name="fields">
-   <element value="pume_tot_score"/>
-  </property>
-  <property name="label">PUME Total Score</property>
-  <property name="label_edit">PUME Total Score</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="passport" meta_type="Image Widget">
-  <property name="title">Passport Picture</property>
-  <property name="fields">
-   <element value="passport"/>
-  </property>
-  <property name="label">Passport Picture</property>
-  <property name="label_edit">Passport Picture</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="help">Upload passport photograph with red background</property>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <table>
-  <row>
-   <cell name="app_ac_pin"/>
-  </row>
-  <row>
-   <cell name="jamb_reg_no"/>
-  </row>
-  <row>
-   <cell name="jamb_firstname"/>
-  </row>
-  <row>
-   <cell name="jamb_middlename"/>
-  </row>
-  <row>
-   <cell name="jamb_lastname"/>
-  </row>
-  <row>
-   <cell name="jamb_sex"/>
-  </row>
-  <row>
-   <cell name="jamb_age"/>
-  </row>
-  <row>
-   <cell name="jamb_state"/>
-  </row>
-  <row>
-   <cell name="jamb_lga"/>
-  </row>
-  <row>
-   <cell name="jamb_score"/>
-  </row>
-  <row>
-   <cell name="jamb_first_cos"/>
-  </row>
-  <row>
-   <cell name="jamb_second_cos"/>
-  </row>
-  <row>
-   <cell name="jamb_first_uni"/>
-  </row>
-  <row>
-   <cell name="jamb_second_uni"/>
-  </row>
-  <row>
-   <cell name="pume_gen_paper"/>
-  </row>
-  <row>
-   <cell name="pume_eng_score"/>
-  </row>
-  <row>
-   <cell name="pume_math_score"/>
-  </row>
-  <row>
-   <cell name="pume_tot_score"/>
-  </row>
-  <row>
-   <cell name="passport"/>
-  </row>
- </table>
-
-</object>
-
Index: eUP_SRP/trunk/profiles/default/layouts/student_admission_fe.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_admission_fe.xml	(revision 471)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0"?>
-<object name="student_admission_fe" meta_type="CPS Layout">
- <property name="layout_create_method"></property>
- <property name="layout_edit_method"></property>
- <property name="layout_view_method"></property>
- <property name="style_prefix">layout_waeup_</property>
- <property name="flexible_widgets"/>
- <property name="validate_values_expr"></property>
-
- <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Application PIN</property>
-  <property name="fields">
-   <element value="app_ac_pin"/>
-  </property>
-  <property name="is_required"></property>
-  <property name="label">Application PIN</property>
-  <property name="label_edit">Application PIN</property>
-  <property
-     name="help"></property>
-  <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="size_max">12</property>
- </widget>
-
- <widget name="jamb_reg_no" meta_type="StudentId Widget">
-  <property name="title">JAMB Registration Number</property>
-  <property name="fields">
-   <element value="jamb_reg_no"/>
-  </property>
-  <property name="is_required">False</property>
-  <property name="label">JAMB Registration Number</property>
-  <property name="label_edit">JAMB Registration Number</property>
-    <property name="readonly_layout_modes">
-   <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="display_width">10</property>
-  <property name="size_max">10</property>
- </widget>
-
- <widget name="passport" meta_type="Image Widget">
-  <property name="title">Passport Picture</property>
-  <property name="fields">
-   <element value="passport"/>
-  </property>
-  <property name="label">Passport Picture</property>
-  <property name="label_edit">Passport Picture</property>
-    <property name="readonly_layout_modes">
-   <element value=""/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="help">Upload passport photograph with red background</property>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
-
- <table>
-  <row>
-   <cell name="app_ac_pin"/>
-  </row>
-  <row>
-   <cell name="jamb_reg_no"/>
-  </row>
-  <row>
-   <cell name="passport"/>
-  </row>
- </table>
-
-</object>
-
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml	(revision 472)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml	(revision 472)
@@ -0,0 +1,327 @@
+<?xml version="1.0"?>
+<object name="student_application" meta_type="CPS Layout">
+ <property name="layout_create_method"></property>
+ <property name="layout_edit_method"></property>
+ <property name="layout_view_method"></property>
+ <property name="style_prefix">layout_waeup_</property>
+ <property name="flexible_widgets"/>
+ <property name="validate_values_expr"></property>
+
+ <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
+  <property name="title">Application PIN</property>
+  <property name="fields">
+   <element value="app_ac_pin"/>
+  </property>
+  <property name="is_required"></property>
+  <property name="label">Application PIN</property>
+  <property name="label_edit">Application PIN</property>
+  <property
+     name="help"></property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="size_max">12</property>
+ </widget>
+
+ <widget name="jamb_reg_no" meta_type="StudentId Widget">
+  <property name="title">JAMB Registration Number</property>
+  <property name="fields">
+   <element value="jamb_reg_no"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">JAMB Registration Number</property>
+  <property name="label_edit">JAMB Registration Number</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="display_width">10</property>
+  <property name="size_max">10</property>
+ </widget>
+
+ <widget name="jamb_firstname" meta_type="String Widget">
+  <property name="title">JAMB First Name</property>
+  <property name="fields">
+   <element value="jamb_firstname"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">JAMB First Name</property>
+  <property name="label_edit">JAMB First Name</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_lastname" meta_type="String Widget">
+  <property name="title">JAMB Lastname</property>
+  <property name="fields">
+   <element value="jamb_lastname"/>
+  </property>
+  <property name="label">JAMB Lastname</property>
+  <property name="label_edit">JAMB Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_middlename" meta_type="String Widget">
+  <property name="title">JAMB Middle Name</property>
+  <property name="fields">
+   <element value="jamb_middlename"/>
+  </property>
+  <property name="label">JAMB Middl Name</property>
+  <property name="label_edit">JAMB Middle Name</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="entry_mode" meta_type="String Widget">
+  <property name="title">Mode of Entry</property>
+  <property name="fields">
+   <element value="entry_mode"/>
+  </property>
+  <property name="label">Mode of Entry</property>
+  <property name="label_edit">Mode of Entry</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_sex" meta_type="String Widget">
+  <property name="title">JAMB Sex</property>
+  <property name="fields">
+   <element value="jamb_sex"/>
+  </property>
+  <property name="label">JAMB Sex</property>
+  <property name="label_edit">JAMB Sex</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_age" meta_type="Int Widget">
+  <property name="title">JAMB Age</property>
+  <property name="fields">
+   <element value="jamb_age"/>
+  </property>
+  <property name="label">JAMB Age</property>
+  <property name="label_edit">JAMB Age</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_state" meta_type="String Widget">
+  <property name="title">JAMB State</property>
+  <property name="fields">
+   <element value="jamb_state"/>
+  </property>
+  <property name="label">JAMB State</property>
+  <property name="label_edit">JAMB State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_lga" meta_type="String Widget">
+  <property name="title">JAMB Local Government Area</property>
+  <property name="fields">
+   <element value="jamb_lga"/>
+  </property>
+  <property name="label">JAMB Local Government Area</property>
+  <property name="label_edit">JAMB Local Government Area</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_score" meta_type="String Widget">
+  <property name="title">JAMB Score</property>
+  <property name="fields">
+   <element value="jamb_score"/>
+  </property>
+  <property name="label">JAMB Score</property>
+  <property name="label_edit">JAMB Score</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_first_cos" meta_type="String Widget">
+  <property name="title">JAMB First Choice Course of Study</property>
+  <property name="fields">
+   <element value="jamb_first_cos"/>
+  </property>
+  <property name="label">JAMB First Choice Course of Study</property>
+  <property name="label_edit">JAMB First Choice Course of Study</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_second_cos" meta_type="String Widget">
+  <property name="title">JAMB Second Choice Course of Study</property>
+  <property name="fields">
+   <element value="jamb_second_cos"/>
+  </property>
+  <property name="label">JAMB Second Choice Course of Study</property>
+  <property name="label_edit">JAMB Second Choice Course of Study</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_first_uni" meta_type="String Widget">
+  <property name="title">JAMB First Choice University</property>
+  <property name="fields">
+   <element value="jamb_first_uni"/>
+  </property>
+  <property name="label">JAMB First Choice University</property>
+  <property name="label_edit">JAMB First Choice University</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="jamb_second_uni" meta_type="String Widget">
+  <property name="title">JAMB Second Choice University</property>
+  <property name="fields">
+   <element value="jamb_second_uni"/>
+  </property>
+  <property name="label">JAMB Second Choice University</property>
+  <property name="label_edit">JAMB Second Choice University</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="pume_gen_paper" meta_type="String Widget">
+  <property name="title">PUME General Paper</property>
+  <property name="fields">
+   <element value="pume_gen_paper"/>
+  </property>
+  <property name="label">PUME General Paper</property>
+  <property name="label_edit">PUME General Paper</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="pume_eng_score" meta_type="String Widget">
+  <property name="title">PUME English Score</property>
+  <property name="fields">
+   <element value="pume_eng_score"/>
+  </property>
+  <property name="label">PUME English Score</property>
+  <property name="label_edit">PUME English Score</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="pume_math_score" meta_type="String Widget">
+  <property name="title">PUME Mathematics Score</property>
+  <property name="fields">
+   <element value="pume_math_score"/>
+  </property>
+  <property name="label">PUME Mathematics Score</property>
+  <property name="label_edit">PUME Mathematics Score</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="pume_tot_score" meta_type="String Widget">
+  <property name="title">PUME Total Score</property>
+  <property name="fields">
+   <element value="pume_tot_score"/>
+  </property>
+  <property name="label">PUME Total Score</property>
+  <property name="label_edit">PUME Total Score</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <widget name="passport" meta_type="Image Widget">
+  <property name="title">Passport Picture</property>
+  <property name="fields">
+   <element value="passport"/>
+  </property>
+  <property name="label">Passport Picture</property>
+  <property name="label_edit">Passport Picture</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="help">Upload passport photograph with red background</property>
+  <property name="size_max">204800</property>
+  <property name="display_width">300</property>
+  <property name="display_height">600</property>
+  <property name="allow_resize">True</property>
+ </widget>
+
+ <table>
+  <row>
+   <cell name="app_ac_pin"/>
+  </row>
+  <row>
+   <cell name="jamb_reg_no"/>
+  </row>
+  <row>
+   <cell name="jamb_firstname"/>
+  </row>
+  <row>
+   <cell name="jamb_middlename"/>
+  </row>
+  <row>
+   <cell name="jamb_lastname"/>
+  </row>
+  <row>
+   <cell name="jamb_sex"/>
+  </row>
+  <row>
+   <cell name="jamb_age"/>
+  </row>
+  <row>
+   <cell name="jamb_state"/>
+  </row>
+  <row>
+   <cell name="jamb_lga"/>
+  </row>
+  <row>
+   <cell name="jamb_score"/>
+  </row>
+  <row>
+   <cell name="jamb_first_cos"/>
+  </row>
+  <row>
+   <cell name="jamb_second_cos"/>
+  </row>
+  <row>
+   <cell name="jamb_first_uni"/>
+  </row>
+  <row>
+   <cell name="jamb_second_uni"/>
+  </row>
+  <row>
+   <cell name="pume_gen_paper"/>
+  </row>
+  <row>
+   <cell name="pume_eng_score"/>
+  </row>
+  <row>
+   <cell name="pume_math_score"/>
+  </row>
+  <row>
+   <cell name="pume_tot_score"/>
+  </row>
+  <row>
+   <cell name="passport"/>
+  </row>
+ </table>
+
+</object>
+
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml	(revision 472)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml	(revision 472)
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<object name="student_application_fe" meta_type="CPS Layout">
+ <property name="layout_create_method"></property>
+ <property name="layout_edit_method"></property>
+ <property name="layout_view_method"></property>
+ <property name="style_prefix">layout_waeup_</property>
+ <property name="flexible_widgets"/>
+ <property name="validate_values_expr"></property>
+
+ <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
+  <property name="title">Application PIN</property>
+  <property name="fields">
+   <element value="app_ac_pin"/>
+  </property>
+  <property name="is_required"></property>
+  <property name="label">Application PIN</property>
+  <property name="label_edit">Application PIN</property>
+  <property
+     name="help"></property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="size_max">12</property>
+ </widget>
+
+ <widget name="jamb_reg_no" meta_type="StudentId Widget">
+  <property name="title">JAMB Registration Number</property>
+  <property name="fields">
+   <element value="jamb_reg_no"/>
+  </property>
+  <property name="is_required">False</property>
+  <property name="label">JAMB Registration Number</property>
+  <property name="label_edit">JAMB Registration Number</property>
+    <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="display_width">10</property>
+  <property name="size_max">10</property>
+ </widget>
+
+ <widget name="passport" meta_type="Image Widget">
+  <property name="title">Passport Picture</property>
+  <property name="fields">
+   <element value="passport"/>
+  </property>
+  <property name="label">Passport Picture</property>
+  <property name="label_edit">Passport Picture</property>
+    <property name="readonly_layout_modes">
+   <element value=""/>
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="help">Upload passport photograph with red background</property>
+  <property name="size_max">204800</property>
+  <property name="display_width">300</property>
+  <property name="display_height">600</property>
+  <property name="allow_resize">True</property>
+ </widget>
+
+ <table>
+  <row>
+   <cell name="app_ac_pin"/>
+  </row>
+  <row>
+   <cell name="jamb_reg_no"/>
+  </row>
+  <row>
+   <cell name="passport"/>
+  </row>
+ </table>
+
+</object>
+
Index: /WAeUP_SRP/trunk/profiles/default/schemas.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/schemas.xml	(revision 471)
+++ /WAeUP_SRP/trunk/profiles/default/schemas.xml	(revision 472)
@@ -16,5 +16,5 @@
  <object name="scratch_card_batch.xml" meta_type="CPS Schema"/>
  <object name="student_accommodation" meta_type="CPS Schema"/>
- <object name="student_admission" meta_type="CPS Schema"/>
+ <object name="student_application" meta_type="CPS Schema"/>
  <object name="student_clearance" meta_type="CPS Schema"/>
  <object name="student_personal" meta_type="CPS Schema"/>
Index: eUP_SRP/trunk/profiles/default/schemas/student_admission.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/schemas/student_admission.xml	(revision 471)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0"?>
-<object name="student_admission" meta_type="CPS Schema">
-
- <field name="app_ac_pin" meta_type="CPS String Field">
-  <property name="is_searchabletext">True</property>
- </field>
-
- <field name="jamb_reg_no" meta_type="CPS String Field">
-  <property name="is_searchabletext">True</property>
- </field>
- <field name="jamb_firstname" meta_type="CPS String Field" />
- <field name="jamb_lastname" meta_type="CPS String Field">
-  <property name="is_searchabletext">True</property>
- </field>
- <field name="jamb_middlename" meta_type="CPS String Field" />
- <field name="jamb_sex" meta_type="CPS Boolean Field">
-  <property name="default_expr">python:0</property>
- </field>
- <field name="jamb_age" meta_type="CPS Int Field"/>
- <field name="jamb_state" meta_type="CPS String Field"/>
- <field name="jamb_lga" meta_type="CPS String Field"/>
- <field name="jamb_score" meta_type="CPS String Field"/>
- <field name="jamb_first_cos" meta_type="CPS String Field"/>
- <field name="jamb_second_cos" meta_type="CPS String Field"/>
- <field name="jamb_first_uni" meta_type="CPS String Field"/>
- <field name="jamb_second_uni" meta_type="CPS String Field"/>
-
- <field name="entry_mode" meta_type="CPS String Field"/>
-
- <field name="pume_gen_paper" meta_type="CPS String Field"/>
- <field name="pume_eng_score" meta_type="CPS String Field"/>
- <field name="pume_math_score" meta_type="CPS String Field"/>
- <field name="pume_tot_score" meta_type="CPS String Field"/>
-
- <field name="passport" meta_type="CPS Image Field"/>
-</object>
Index: /WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml	(revision 472)
+++ /WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml	(revision 472)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<object name="student_application" meta_type="CPS Schema">
+
+ <field name="app_ac_pin" meta_type="CPS String Field">
+  <property name="is_searchabletext">True</property>
+ </field>
+
+ <field name="jamb_reg_no" meta_type="CPS String Field">
+  <property name="is_searchabletext">True</property>
+ </field>
+ <field name="jamb_firstname" meta_type="CPS String Field" />
+ <field name="jamb_lastname" meta_type="CPS String Field">
+  <property name="is_searchabletext">True</property>
+ </field>
+ <field name="jamb_middlename" meta_type="CPS String Field" />
+ <field name="jamb_sex" meta_type="CPS String Field" />
+ <field name="jamb_age" meta_type="CPS Int Field"/>
+ <field name="jamb_state" meta_type="CPS String Field"/>
+ <field name="jamb_lga" meta_type="CPS String Field"/>
+ <field name="jamb_score" meta_type="CPS String Field"/>
+ <field name="jamb_first_cos" meta_type="CPS String Field"/>
+ <field name="jamb_second_cos" meta_type="CPS String Field"/>
+ <field name="jamb_first_uni" meta_type="CPS String Field"/>
+ <field name="jamb_second_uni" meta_type="CPS String Field"/>
+
+ <field name="entry_mode" meta_type="CPS String Field"/>
+
+ <field name="pume_gen_paper" meta_type="CPS String Field"/>
+ <field name="pume_eng_score" meta_type="CPS String Field"/>
+ <field name="pume_math_score" meta_type="CPS String Field"/>
+ <field name="pume_tot_score" meta_type="CPS String Field"/>
+
+ <field name="passport" meta_type="CPS Image Field"/>
+</object>
Index: /WAeUP_SRP/trunk/profiles/default/types.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types.xml	(revision 471)
+++ /WAeUP_SRP/trunk/profiles/default/types.xml	(revision 472)
@@ -21,5 +21,5 @@
  <object name="StudentCourseResult" meta_type="CPS Flexible Type Information"/>
  <object name="StudentPersonal" meta_type="CPS Flexible Type Information"/>
- <object name="StudentAdmission" meta_type="CPS Flexible Type Information"/>
+ <object name="StudentApplication" meta_type="CPS Flexible Type Information"/>
  <object name="StudentSemester" meta_type="CPS Flexible Type Information"/>
  <object name="StudentsFolder" meta_type="CPS Flexible Type Information"/>
Index: eUP_SRP/trunk/profiles/default/types/StudentAdmission.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/StudentAdmission.xml	(revision 471)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0"?>
-<object name="StudentAdmission" meta_type="CPS Flexible Type Information"
-   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
- <property name="title">WAeUP Student Admission Data</property>
- <property name="description"></property>
- <property name="content_icon"></property>
- <property name="content_meta_type">StudentAdmission</property>
- <property name="product">WAeUP_SRP</property>
- <property name="factory">addStudentAdmission</property>
- <property name="immediate_view">academics_contents</property>
- <property name="global_allow">True</property>
- <property name="filter_content_types">True</property>
- <property name="allowed_content_types"/>
- <property name="allow_discussion">False</property>
- <property name="cps_is_searchable">False</property>
- <property name="cps_proxy_type">document</property>
- <property name="cps_display_as_document_in_listing">True</property>
- <property name="schemas">
-  <element value="student_admission"/>
- </property>
- <property name="layouts">
-  <element value="student_admission"/>
- </property>
- <property name="layout_clusters">
-  <element value="adm_slip:student_admission_fe"/>
- </property>
- <property name="flexible_layouts"/>
- <property name="storage_methods"/>
- <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
- <alias from="view" to="academics_contents"/>
- <action title="Standard View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/academics_contents"
-    visible="True">
-  <permission value="View"/>
- </action>
- <action title="action_edit" action_id="edit" category="object"
-    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit"
-    visible="True">
-  <permission value="Modify portal content"/>
- </action>
- <action title="action_metadata" action_id="metadata" category="object"
-    condition_expr="python:member and 'Manager' in member.getRoles()"
-    url_expr="string:${object_url}/cpsdocument_metadata" visible="False">
-  <permission value="Modify portal content"/>
- </action>
-</object>
Index: /WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml	(revision 472)
+++ /WAeUP_SRP/trunk/profiles/default/types/StudentApplication.xml	(revision 472)
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<object name="StudentApplication" meta_type="CPS Flexible Type Information"
+   xmlns:i18n="http://xml.zope.org/namespaces/i18n">
+ <property name="title">WAeUP Student Application Data</property>
+ <property name="description"></property>
+ <property name="content_icon"></property>
+ <property name="content_meta_type">StudentApplication</property>
+ <property name="product">WAeUP_SRP</property>
+ <property name="factory">addStudentApplication</property>
+ <property name="immediate_view">academics_contents</property>
+ <property name="global_allow">True</property>
+ <property name="filter_content_types">True</property>
+ <property name="allowed_content_types"/>
+ <property name="allow_discussion">False</property>
+ <property name="cps_is_searchable">False</property>
+ <property name="cps_proxy_type">document</property>
+ <property name="cps_display_as_document_in_listing">True</property>
+ <property name="schemas">
+  <element value="student_application"/>
+ </property>
+ <property name="layouts">
+  <element value="student_application"/>
+ </property>
+ <property name="layout_clusters">
+  <element value="adm_slip:student_application_fe"/>
+ </property>
+ <property name="flexible_layouts"/>
+ <property name="storage_methods"/>
+ <property name="cps_is_portlet">False</property>
+ <alias from="(Default)" to="academics_contents"/>
+ <alias from="view" to="academics_contents"/>
+ <action title="Standard View" action_id="view" category="object"
+    condition_expr="" url_expr="string:${object_url}/academics_contents"
+    visible="True">
+  <permission value="View"/>
+ </action>
+ <action title="action_edit" action_id="edit" category="object"
+    condition_expr="" url_expr="string:${object_url}/cpsdocument_edit"
+    visible="True">
+  <permission value="Modify portal content"/>
+ </action>
+ <action title="action_metadata" action_id="metadata" category="object"
+    condition_expr="python:member and 'Manager' in member.getRoles()"
+    url_expr="string:${object_url}/cpsdocument_metadata" visible="False">
+  <permission value="Modify portal content"/>
+ </action>
+</object>
Index: /WAeUP_SRP/trunk/profiles/default/types/StudentsFolder.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/types/StudentsFolder.xml	(revision 471)
+++ /WAeUP_SRP/trunk/profiles/default/types/StudentsFolder.xml	(revision 472)
@@ -39,8 +39,8 @@
     condition_expr="" url_expr="string:${object/absolute_url}/create_jamb"
     visible="False"/>
- <action title="Check Admission Status" action_id="check_admission"
+ <action title="Check Application Status" action_id="check_application"
     category="object"
     condition_expr="object/portal_membership/isAnonymousUser"
-    url_expr="string:${object/absolute_url}/check_admission" visible="False">
+    url_expr="string:${object/absolute_url}/check_application" visible="False">
   <permission value="View"/>
  </action>
Index: /WAeUP_SRP/trunk/profiles/default/workflows.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows.xml	(revision 471)
+++ /WAeUP_SRP/trunk/profiles/default/workflows.xml	(revision 472)
@@ -71,5 +71,5 @@
    <bound-workflow workflow_id="waeup_student_wf"/>
   </type>
-  <type type_id="StudentAdmission">
+  <type type_id="StudentApplication">
    <bound-workflow workflow_id="waeup_student_wf"/>
   </type>
Index: /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 471)
+++ /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 472)
@@ -6,11 +6,11 @@
  <permission>Modify portal content</permission>
  <permission>View</permission>
- <state state_id="admission_pin_entered" title="">
-  <exit-transition transition_id="request_admission"/>
+ <state state_id="application_pin_entered" title="">
+  <exit-transition transition_id="apply"/>
  </state>
  <state state_id="admission_rejected" title="">
   <exit-transition transition_id="finally_reject"/>
  </state>
- <state state_id="admission_requested" title="">
+ <state state_id="applied" title="">
   <exit-transition transition_id="pume_fail"/>
   <exit-transition transition_id="pume_pass"/>
@@ -33,5 +33,5 @@
  <state state_id="created" title="">
   <exit-transition transition_id="create_content"/>
-  <exit-transition transition_id="enter_admission_pin"/>
+  <exit-transition transition_id="enter_application_pin"/>
   <exit-transition transition_id="open"/>
   <permission-map name="Modify portal content"
@@ -61,13 +61,9 @@
   <exit-transition transition_id="reject_admission"/>
  </state>
- <state state_id="rejected" title="">
- </state>
- <state state_id="sleeping_mode" title="">
-  <exit-transition transition_id="enter_admission_pin"/>
- </state>
+
  <transition transition_id="admit" title=""
              new_state="admitted" trigger="USER"
              before_script="" after_script="open_clearance">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -80,5 +76,5 @@
              trigger="USER" before_script=""
              after_script="open_personal">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -90,5 +86,5 @@
              new_state="closed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -99,5 +95,5 @@
              new_state="created" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -108,5 +104,5 @@
              new_state="" trigger="USER" before_script=""
              after_script="">
-  
+
   <guard>
   </guard>
@@ -114,10 +110,10 @@
   <transition-behavior behavior_id="allow-sub-delete"/>
  </transition>
- <transition transition_id="enter_admission_pin" title=""
-             new_state="admission_pin_entered"
+ <transition transition_id="enter_application_pin" title=""
+             new_state="application_pin_entered"
              trigger="USER"
-             before_script="validate_admission_pin"
-             after_script="open_admission">
-  
+             before_script="validate_application_pin"
+             after_script="open_application">
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -131,5 +127,5 @@
              before_script="validate_clearance_pin"
              after_script="open_clearance">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -141,5 +137,5 @@
              new_state="finally_rejected" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -151,5 +147,5 @@
              new_state="opened" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -160,5 +156,5 @@
              new_state="pume_failed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -170,5 +166,5 @@
              new_state="pume_passed" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -180,5 +176,5 @@
              new_state="rejected" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
   </guard>
@@ -187,5 +183,5 @@
              new_state="admission_rejected" trigger="USER"
              before_script="" after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -198,5 +194,5 @@
              trigger="USER" before_script="open_clearance"
              after_script="">
-  
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -205,8 +201,8 @@
   </guard>
  </transition>
- <transition transition_id="request_admission" title=""
-             new_state="admission_requested" trigger="USER"
-             before_script="" after_script="close_admission">
-  
+ <transition transition_id="apply" title=""
+             new_state="applied" trigger="USER"
+             before_script="" after_script="close_application">
+
   <guard>
    <guard-role>Manager</guard-role>
@@ -218,26 +214,26 @@
              new_state="clearence_requested" trigger="USER"
              before_script="" after_script="close_clearance">
-  
-  <guard>
-   <guard-role>Manager</guard-role>
-   <guard-role>SectionManager</guard-role>
-   <guard-role>Owner</guard-role>
-  </guard>
- </transition>
- <script script_id="close_admission" type="Script (Python)"
-         filename="workflows/waeup_student_wf/scripts/close_admission.py"/>
+
+  <guard>
+   <guard-role>Manager</guard-role>
+   <guard-role>SectionManager</guard-role>
+   <guard-role>Owner</guard-role>
+  </guard>
+ </transition>
+ <script script_id="close_application" type="Script (Python)"
+         filename="workflows/waeup_student_wf/scripts/close_application.py"/>
  <script script_id="close_clearance" type="Script (Python)"
          filename="workflows/waeup_student_wf/scripts/close_clearance.py"/>
  <script script_id="close_personal" type="Script (Python)"
          filename="workflows/waeup_student_wf/scripts/close_personal.py"/>
- <script script_id="open_admission" type="Script (Python)"
-         filename="workflows/waeup_student_wf/scripts/open_admission.py"/>
+ <script script_id="open_application" type="Script (Python)"
+         filename="workflows/waeup_student_wf/scripts/open_application.py"/>
  <script script_id="open_clearance" type="Script (Python)"
          filename="workflows/waeup_student_wf/scripts/open_clearance.py"/>
  <script script_id="open_personal" type="Script (Python)"
          filename="workflows/waeup_student_wf/scripts/open_personal.py"/>
- <script script_id="validate_admission_pin"
+ <script script_id="validate_application_pin"
          type="Script (Python)"
-         filename="workflows/waeup_student_wf/scripts/validate_admission_pin.py"/>
+         filename="workflows/waeup_student_wf/scripts/validate_application_pin.py"/>
  <script script_id="validate_clearance_pin"
          type="Script (Python)"
Index: eUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_admission.py
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_admission.py	(revision 471)
+++ 	(revision )
@@ -1,22 +1,0 @@
-## Script (Python) "close_admission"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Example code:
-
-# Import a standard function, and get the HTML request and response objects.
-from Products.PythonScripts.standard import html_quote
-request = container.REQUEST
-RESPONSE =  request.RESPONSE
-
-# Return a string identifying this script.
-print "This is the", script.meta_type, '"%s"' % script.getId(),
-if script.title:
-    print "(%s)" % html_quote(script.title),
-print "in", container.absolute_url()
-return printed
Index: /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_application.py
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_application.py	(revision 472)
+++ /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/close_application.py	(revision 472)
@@ -0,0 +1,22 @@
+## Script (Python) "close_application"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
+# Example code:
+
+# Import a standard function, and get the HTML request and response objects.
+from Products.PythonScripts.standard import html_quote
+request = container.REQUEST
+RESPONSE =  request.RESPONSE
+
+# Return a string identifying this script.
+print "This is the", script.meta_type, '"%s"' % script.getId(),
+if script.title:
+    print "(%s)" % html_quote(script.title),
+print "in", container.absolute_url()
+return printed
Index: eUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_admission.py
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_admission.py	(revision 471)
+++ 	(revision )
@@ -1,22 +1,0 @@
-## Script (Python) "open_admission"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Example code:
-
-# Import a standard function, and get the HTML request and response objects.
-from Products.PythonScripts.standard import html_quote
-request = container.REQUEST
-RESPONSE =  request.RESPONSE
-
-# Return a string identifying this script.
-print "This is the", script.meta_type, '"%s"' % script.getId(),
-if script.title:
-    print "(%s)" % html_quote(script.title),
-print "in", container.absolute_url()
-return printed
Index: /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_application.py
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_application.py	(revision 472)
+++ /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/open_application.py	(revision 472)
@@ -0,0 +1,22 @@
+## Script (Python) "open_application"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
+# Example code:
+
+# Import a standard function, and get the HTML request and response objects.
+from Products.PythonScripts.standard import html_quote
+request = container.REQUEST
+RESPONSE =  request.RESPONSE
+
+# Return a string identifying this script.
+print "This is the", script.meta_type, '"%s"' % script.getId(),
+if script.title:
+    print "(%s)" % html_quote(script.title),
+print "in", container.absolute_url()
+return printed
Index: eUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_admission_pin.py
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_admission_pin.py	(revision 471)
+++ 	(revision )
@@ -1,22 +1,0 @@
-## Script (Python) "validate_admission_pin"
-##bind container=container
-##bind context=context
-##bind namespace=
-##bind script=script
-##bind subpath=traverse_subpath
-##parameters=
-##title=
-##
-# Example code:
-
-# Import a standard function, and get the HTML request and response objects.
-from Products.PythonScripts.standard import html_quote
-request = container.REQUEST
-RESPONSE =  request.RESPONSE
-
-# Return a string identifying this script.
-print "This is the", script.meta_type, '"%s"' % script.getId(),
-if script.title:
-    print "(%s)" % html_quote(script.title),
-print "in", container.absolute_url()
-return printed
Index: /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_application_pin.py
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_application_pin.py	(revision 472)
+++ /WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/scripts/validate_application_pin.py	(revision 472)
@@ -0,0 +1,22 @@
+## Script (Python) "validate_application_pin"
+##bind container=container
+##bind context=context
+##bind namespace=
+##bind script=script
+##bind subpath=traverse_subpath
+##parameters=
+##title=
+##
+# Example code:
+
+# Import a standard function, and get the HTML request and response objects.
+from Products.PythonScripts.standard import html_quote
+request = container.REQUEST
+RESPONSE =  request.RESPONSE
+
+# Return a string identifying this script.
+print "This is the", script.meta_type, '"%s"' % script.getId(),
+if script.title:
+    print "(%s)" % html_quote(script.title),
+print "in", container.absolute_url()
+return printed
Index: /WAeUP_SRP/trunk/skins/waeup_academics/academics_contents_display_buttons.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_academics/academics_contents_display_buttons.py	(revision 471)
+++ /WAeUP_SRP/trunk/skins/waeup_academics/academics_contents_display_buttons.py	(revision 472)
@@ -10,5 +10,5 @@
 # $Id: folder_delete.py 30246 2005-12-02 20:10:18Z fguillaume $
 """
-buttons shouldn't be displayed if 
+buttons shouldn't be displayed if
 """
 
@@ -17,5 +17,5 @@
                            'StudyLevel',
                            'Student',
-                           'StudentAdmission',
+                           'StudentApplication',
                            'StudentClearance',
                            'StudentPersonal',
Index: /WAeUP_SRP/trunk/skins/waeup_default/display_content.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/display_content.py	(revision 471)
+++ /WAeUP_SRP/trunk/skins/waeup_default/display_content.py	(revision 472)
@@ -10,9 +10,9 @@
 # $Id: folder_delete.py 30246 2005-12-02 20:10:18Z fguillaume $
 """
-content  should be displayed if 
+content  should be displayed if
 """
 return context.portal_type in ('Certificate',
                                 'Department',
-                                'StudentAdmission',
+                                'StudentApplication',
                                 'StudentClearance',
                                 'StudentPersonal',
Index: /WAeUP_SRP/trunk/skins/waeup_default/process_waeup_login.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_default/process_waeup_login.py	(revision 471)
+++ /WAeUP_SRP/trunk/skins/waeup_default/process_waeup_login.py	(revision 472)
@@ -17,5 +17,5 @@
 ##member_id = str(member)
 ##ma = getattr(context,member_id)
-##jkw = {'admission_sc_pin': sc_pin}
+##jkw = {'application_sc_pin': sc_pin}
 ##jamb = getattr(ma,'JAMB')
 ##jamb.getContent().edit(mapping=jkw)
Index: /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_print.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_print.pt	(revision 472)
+++ /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_print.pt	(revision 472)
@@ -0,0 +1,27 @@
+<html>
+    <tal:block tal:condition="python:context.portal_type == 'Student'" tal:omit-tag="">  
+      <tal:block tal:define="
+                          appl python:here.application;
+                          appl_proxy python:appl.getContent();
+                          clear python:here.clearance;
+                          clear_proxy python:clear.getContent();
+                          pers python:here.personal;
+                          pers_proxy python:pers.getContent();"
+                          >
+
+      <h2>Acknowledgement Slip for <span tal:content="pers_proxy/firstname" /> <span tal:content="pers_proxy/lastname" /></h2>      
+  
+   
+      <tal:block  tal:content="structure python:appl_proxy.render(cluster='appl_slip')" />
+      <tal:block  tal:content="structure python:clear_proxy.render(cluster='appl_slip')" /> 
+      <tal:block  tal:content="structure python:pers_proxy.render(cluster='appl_slip')" />
+
+
+      </tal:block>  
+    </tal:block>
+    <tal:block condition="python:context.portal_type != 'Student'">
+    
+      This is not a student object!
+    
+    </tal:block>  
+</html>
Index: /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt	(revision 471)
+++ /WAeUP_SRP/trunk/skins/waeup_student/acknowledge_slip.pt	(revision 472)
@@ -18,6 +18,6 @@
     <tal:block tal:condition="python:context.portal_type == 'Student'" tal:omit-tag="">  
       <tal:block tal:define="
-                          adm python:here.admission;
-                          adm_proxy python:adm.getContent();
+                          appl python:here.application;
+                          appl_proxy python:appl.getContent();
                           clear python:here.clearance;
                           clear_proxy python:clear.getContent();
@@ -29,7 +29,7 @@
   
    
-      <tal:block tal:content="structure python:adm_proxy.render(cluster='adm_slip')" />
-      <tal:block tal:content="structure python:clear_proxy.render(cluster='adm_slip')" /> 
-      <tal:block tal:content="structure python:pers_proxy.render(cluster='adm_slip')" />
+      <tal:block tal:content="structure python:appl_proxy.render(cluster='appl_slip')" />
+      <tal:block tal:content="structure python:clear_proxy.render(cluster='appl_slip')" /> 
+      <tal:block tal:content="structure python:pers_proxy.render(cluster='appl_slip')" />
 
 
Index: eUP_SRP/trunk/skins/waeup_student/admission_status.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/admission_status.py	(revision 471)
+++ 	(revision )
@@ -1,38 +1,0 @@
-##parameters=
-# $Id$
-"""
-search for admitted students 
-return html renderer + psm
-"""
-##type_name = 'Jamb'
-##ti = context.portal_types[type_name]
-##
-##context.REQUEST.set('type_name',type_name)
-##
-##validate = REQUEST.has_key("cpsdocument_edit_button")
-
-request = context.REQUEST
-lt = context.portal_layouts
-catalog = context.portal_catalog
-
-rendered,psm,ds = lt.renderLayout(layout_id= 'admission_status',
-                      schema_id= 'jamb',
-                      context=context,
-                      mapping=request,
-                      ob={},
-                      layout_mode='create',
-                      )
-qs = ds.get('quick_search')
-list = []
-if qs:
-    res = catalog(SearchableText = "%s*" % qs)
-    if res:
-        for i in res:
-            o = i.getObject()
-            if o.portal_type == 'Jamb':
-                list.append(o)
-return context.admission_status_form(rendered = rendered,
-                                 psm = '',
-                                 list = list,
-                                 ds = ds
-                                 )
Index: eUP_SRP/trunk/skins/waeup_student/admission_status_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/admission_status_form.pt	(revision 471)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;
-                   data_storage options/ds;
-                   jamb options/jamb/getContent|nothing;
-                   edition python:1;"
-                   >
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing"
-                >
-    </metal:block>
-    <metal:block fill-slot="main">
-        <h1>List admitted students!</h1>
-        <p>
-          You may be seeing a long list of names or just the name of the person of your interest below. 
-          Click on the View Details against the name of the candidate of your interest to display the 
-          required information. If the candidate of your interest is not in the list displayed, 
-          you may type another name or registration number again in the Quick Search box below and click 
-          on GO button.
-        </p>
-      <div tal:replace="structure rendered_main" />
-        <span  tal:define="list options/list">
-          <span tal:condition="not: list">
-            No Records found
-          </span>
-          <span tal:condition="list">
-            <h2>The following entries match your query:</h2>
-          <table>
-            <tr tal:repeat="row list">
-              <td colspan="" tal:content="row/reg_nr"></td>
-              <td colspan="" tal:content="row/firstname"></td>
-              <td colspan="" tal:content="row/middlename"></td>
-              <td colspan="" tal:content="row/lastname"></td>
-            </tr>
-          </table>
-        </span>
-        </span>
-    </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-
-</metal:block>
-</metal:block>
-</tal:block>
Index: /WAeUP_SRP/trunk/skins/waeup_student/application.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/application.py	(revision 472)
+++ /WAeUP_SRP/trunk/skins/waeup_student/application.py	(revision 472)
@@ -0,0 +1,61 @@
+##parameters=REQUEST
+# $Id: application.py 173 2005-11-15 16:28:29Z joachim $
+"""
+process the Application Form
+return html renderer + psm
+"""
+import DateTime
+current = DateTime.DateTime()
+
+type_name = 'StudentApplication'
+
+ti = context.portal_types[type_name]
+
+REQUEST.set('type_name',type_name)
+
+validate = REQUEST.has_key("cpsdocument_edit_button")
+
+
+lt = context.portal_layouts
+pr = context.portal_registration
+
+res,psm,ds = lt.renderLayout(layout_id= 'student_check_pin',
+                      schema_id= 'student_application',
+                      context=context,
+                      mapping=validate and REQUEST,
+                      ob={},
+                      layout_mode='create',
+                      formaction = "application",
+                      submit = "check",
+                      )
+if psm == 'invalid':
+    return context.application_form(rendered = res,
+                                 psm = "Please correct your input",
+                                 ds = ds,
+                                 )
+elif psm == '':
+    return context.application_form(rendered = res,
+                                 psm = None,
+                                 ds = ds,
+                                 )
+elif psm == 'valid':
+    jamb_id = ds.get('jamb_id')
+    catalog = context.portal_catalog
+    search = catalog({'meta_type': 'StudentApplication',
+                     'jamb_reg_no': jamb_id
+                     })
+
+    if len(search) < 1:
+        psm = "No JAMB record %s" % (jamb_id)
+        return context.application_form(rendered = res,
+                                 psm = psm,
+                                 ds = ds,
+                                 )
+application = search[0].getObject()
+student = application.aq_parent
+student.invokeFactory('StudentClearance','clearance')
+student.invokeFactory('StudentPersonal','personal')
+# now display the passport form with jamb-data readonly
+return student.acknowledge_slip()
+
+
Index: /WAeUP_SRP/trunk/skins/waeup_student/application_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/application_form.pt	(revision 472)
+++ /WAeUP_SRP/trunk/skins/waeup_student/application_form.pt	(revision 472)
@@ -0,0 +1,30 @@
+<tal:block define="rendered_main options/rendered;
+                   portal_status_message options/psm;
+                   data_storage options/ds;
+                   jamb options/jamb/getContent|nothing;
+                   edition python:1;"
+                   >
+<metal:block define-macro="edit_form">
+<metal:block use-macro="here/content_lib_master/macros/master">
+  <metal:block fill-slot="header"
+    tal:define="creation creation|nothing;
+                edition edition|nothing;
+                metadata metadata|nothing"
+                >
+    </metal:block>
+      <metal:block fill-slot="main">
+        <h1>Apply for the Post University Matriculation Examination! </h1>
+        <div tal:replace="structure rendered_main" />
+          <p>Instructions :</p>
+          <ul>
+            <li>Buy an Application Scratch Card.</li> 
+            <li>Enter your JAMB registration number and the Application PIN above.</li> 
+            <li>Upload your passport picture.</li> 
+            <li>Print the Application Acknowledgement Slip.</li>
+          </ul>
+      </metal:block>
+      <metal:block fill-slot="sub">
+      </metal:block>
+    </metal:block>
+  </metal:block>
+</tal:block>
Index: /WAeUP_SRP/trunk/skins/waeup_student/application_status.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/application_status.py	(revision 472)
+++ /WAeUP_SRP/trunk/skins/waeup_student/application_status.py	(revision 472)
@@ -0,0 +1,38 @@
+##parameters=
+# $Id: application_status.py 71 2005-10-21 12:02:05Z joachim $
+"""
+search for admitted students
+return html renderer + psm
+"""
+##type_name = 'Jamb'
+##ti = context.portal_types[type_name]
+##
+##context.REQUEST.set('type_name',type_name)
+##
+##validate = REQUEST.has_key("cpsdocument_edit_button")
+
+request = context.REQUEST
+lt = context.portal_layouts
+catalog = context.portal_catalog
+
+rendered,psm,ds = lt.renderLayout(layout_id= 'application_status',
+                      schema_id= 'jamb',
+                      context=context,
+                      mapping=request,
+                      ob={},
+                      layout_mode='create',
+                      )
+qs = ds.get('quick_search')
+list = []
+if qs:
+    res = catalog(SearchableText = "%s*" % qs)
+    if res:
+        for i in res:
+            o = i.getObject()
+            if o.portal_type == 'Jamb':
+                list.append(o)
+return context.application_status_form(rendered = rendered,
+                                 psm = '',
+                                 list = list,
+                                 ds = ds
+                                 )
Index: eUP_SRP/trunk/skins/waeup_student/payed_hostel_fee.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/payed_hostel_fee.pt	(revision 471)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<html metal:use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="head_slot">
-  </metal:block>
-  <metal:block fill-slot="header">
-  </metal:block>
-  <metal:block fill-slot="main"
-               tal:define="student context/getContent;
-               dict options/dict"
-               >
-    You payed <span tal:content="student/accommodation" /><br /> 
-    with Scratchcard PIN <span tal:content="dict/sc_pin" /> <br />
-    on <span  tal:content="dict/sc_date"/>.
-    
-  </metal:block>
-  <metal:block fill-slot="sub">
-  </metal:block>
-</html>
Index: eUP_SRP/trunk/skins/waeup_student/request_admission.py
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/request_admission.py	(revision 471)
+++ 	(revision )
@@ -1,61 +1,0 @@
-##parameters=REQUEST
-# $Id: check_admission.py 173 2005-11-15 16:28:29Z joachim $
-"""
-process the Admission Form
-return html renderer + psm
-"""
-import DateTime
-current = DateTime.DateTime()
-
-type_name = 'StudentAdmission'
-
-ti = context.portal_types[type_name]
-
-REQUEST.set('type_name',type_name)
-
-validate = REQUEST.has_key("cpsdocument_edit_button")
-
-
-lt = context.portal_layouts
-pr = context.portal_registration
-
-res,psm,ds = lt.renderLayout(layout_id= 'student_check_pin',
-                      schema_id= 'student_admission',
-                      context=context,
-                      mapping=validate and REQUEST,
-                      ob={},
-                      layout_mode='create',
-                      formaction = "request_admission",
-                      submit = "check",
-                      )
-if psm == 'invalid':
-    return context.request_admission_form(rendered = res,
-                                 psm = "Please correct your input",
-                                 ds = ds,
-                                 )
-elif psm == '':
-    return context.request_admission_form(rendered = res,
-                                 psm = None,
-                                 ds = ds,
-                                 )
-elif psm == 'valid':
-    jamb_id = ds.get('jamb_id')
-    catalog = context.portal_catalog
-    search = catalog({'meta_type': 'StudentAdmission',
-                     'jamb_reg_no': jamb_id
-                     })
-    
-    if len(search) < 1:
-        psm = "No JAMB record %s" % (jamb_id)
-        return context.request_admission_form(rendered = res,
-                                 psm = psm, 
-                                 ds = ds,
-                                 )
-admission = search[0].getObject() 
-student = admission.aq_parent
-student.invokeFactory('StudentClearance','clearance')
-student.invokeFactory('StudentPersonal','personal')
-# now display the passport form with jamb-data readonly
-return student.acknowledge_slip()
-
-
Index: eUP_SRP/trunk/skins/waeup_student/request_admission_form.pt
===================================================================
--- /WAeUP_SRP/trunk/skins/waeup_student/request_admission_form.pt	(revision 471)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<tal:block define="rendered_main options/rendered;
-                   portal_status_message options/psm;
-                   data_storage options/ds;
-                   jamb options/jamb/getContent|nothing;
-                   edition python:1;"
-                   >
-<metal:block define-macro="edit_form">
-<metal:block use-macro="here/content_lib_master/macros/master">
-  <metal:block fill-slot="header"
-    tal:define="creation creation|nothing;
-                edition edition|nothing;
-                metadata metadata|nothing"
-                >
-    </metal:block>
-      <metal:block fill-slot="main">
-        <h1>Apply for the Post University Matriculation Examination! </h1>
-        <div tal:replace="structure rendered_main" />
-          <p>Instructions :</p>
-          <ul>
-            <li>Buy an Application Scratch Card.</li> 
-            <li>Enter your JAMB registration number and the Application PIN above.</li> 
-            <li>Upload your passport picture.</li> 
-            <li>Print the Application Acknowledgement Slip.</li>
-          </ul>
-      </metal:block>
-      <metal:block fill-slot="sub">
-      </metal:block>
-    </metal:block>
-  </metal:block>
-</tal:block>
