Index: /WAeUP_SRP/trunk/Students.py
===================================================================
--- /WAeUP_SRP/trunk/Students.py	(revision 422)
+++ /WAeUP_SRP/trunk/Students.py	(revision 423)
@@ -23,6 +23,6 @@
 def generateStudentId():
     import random
-    r = random.random()
-    return "%c%d" % (r.choice('ABCDEFGIJHKLMNOPQRSTUVWXYZ'),r.randint(99999,1000000))
+    r = random
+    return "%c%d" % (r.choice('ABCDEFGHKLMNPQRSTUVWXY'),r.randint(99999,1000000))
     
     
@@ -59,4 +59,5 @@
         for s in l:
             matrics.append(s.getObject().getContent().matric_no)
+        print matrics
         l = self.portal_catalog({'meta_type': "Certificate"})
         certs = {}
@@ -167,4 +168,5 @@
                 tr_count = 0
             tr_count += 1
+        return self.REQUEST.RESPONSE.redirect("%s" % self.REQUEST.get('URL1'))
         return self.students.academics_contents()
     ###)
@@ -391,4 +393,29 @@
 ###)
 
+class StudentClearance(CPSDocument): ###(
+    """
+    WAeUP Student container for the various student data
+    """
+    meta_type = 'StudentClearance'
+    portal_type = meta_type
+    security = ClassSecurityInfo()
+
+    security.declareProtected(View,"Title")
+    def Title(self):
+        """compose title"""
+        content = self.getContent()
+        #return "Clearance Data for %s %s" % (content.firstname,content.lastname)
+        return "Clearance Data"
+
+
+InitializeClass(StudentClearance)
+
+def addStudentClearance(container, id, REQUEST=None, **kw):
+    """Add a Students personal data."""
+    ob = StudentClearance(id, **kw)
+    return CPSBase_adder(container, ob, REQUEST=REQUEST)
+
+###)
+
 class StudentStudyCourse(CPSDocument): ###(
     """
@@ -415,23 +442,23 @@
 ###)
 
-class StudentEligibility(CPSDocument): ###(
+class StudentAdmission(CPSDocument): ###(
     """
     WAeUP Student container for the various student data
     """
-    meta_type = 'StudentEligibility'
-    portal_type = meta_type
-    security = ClassSecurityInfo()
-
-    security.declareProtected(View,"Title")
-    def Title(self):
-        """compose title"""
-        return "Eligibility Data"
-
-
-InitializeClass(StudentEligibility)
-
-def addStudentEligibility(container, id, REQUEST=None, **kw):
+    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):
     """Add a Students eligibility data."""
-    ob = StudentEligibility(id, **kw)
+    ob = StudentAdmission(id, **kw)
     return CPSBase_adder(container, ob, REQUEST=REQUEST)
 
Index: /WAeUP_SRP/trunk/__init__.py
===================================================================
--- /WAeUP_SRP/trunk/__init__.py	(revision 422)
+++ /WAeUP_SRP/trunk/__init__.py	(revision 423)
@@ -29,6 +29,7 @@
 from Products.WAeUP_SRP.Students import Student, addStudent
 from Products.WAeUP_SRP.Students import StudentStudyCourse, addStudentStudyCourse
+from Products.WAeUP_SRP.Students import StudentAdmission, addStudentAdmission
+from Products.WAeUP_SRP.Students import StudentClearance, addStudentClearance
 from Products.WAeUP_SRP.Students import StudentPersonal, addStudentPersonal
-from Products.WAeUP_SRP.Students import StudentEligibility, addStudentEligibility
 from Products.WAeUP_SRP.Students import StudentDocuments, addStudentDocuments
 from Products.WAeUP_SRP.Students import Jamb, addJamb
@@ -54,6 +55,7 @@
     Student,
     StudentStudyCourse,
+    StudentAdmission,
+    StudentClearance,
     StudentPersonal,
-    StudentEligibility,
     StudentDocuments,
     Jamb,
@@ -77,6 +79,7 @@
     addStudent,
     addStudentStudyCourse,
+    addStudentAdmission,
+    addStudentClearance,
     addStudentPersonal,
-    addStudentEligibility,
     addStudentDocuments,
     addJamb,
@@ -100,6 +103,9 @@
     {}, # Student,
     {}, # StudentStudyCourse,
+    {}, # StudentAdmission,
+    {}, # StudentClearance,
+    {}, # StudentAdmission,
+    {}, # StudentClearance,
     {}, # StudentPersonal,
-    {}, # StudentEligibility,
     {}, # StudentDocuments,
     {}, # Jamb,
Index: /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml	(revision 422)
+++ /WAeUP_SRP/trunk/profiles/default/layouts/student_personal.xml	(revision 423)
@@ -7,5 +7,26 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
-
+ <widget name="campus_address" meta_type="String Widget">
+  <property name="title">Campus Address</property>
+  <property name="fields">
+   <element value="campus_address"/>
+  </property>
+  <property name="label">Campus Address</property>
+  <property name="label_edit">Campus Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="disabled" meta_type="Boolean Widget">
+  <property name="title">Disabled</property>
+  <property name="fields">
+   <element value="disabled"/>
+  </property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">yes</property>
+  <property name="label_true">no</property>
+ </widget>
  <widget name="firstname" meta_type="String Widget">
   <property name="title">First Name</property>
@@ -20,6 +41,95 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
-
+ <widget name="for_lga" meta_type="String Widget">
+  <property name="title">Foreign Student Local Government Area</property>
+  <property name="fields">
+   <element value="for_lga"/>
+  </property>
+  <property name="label">Foreign Student Local Government Area</property>
+  <property name="label_edit">Foreign Student Local Government Area</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="for_state" meta_type="String Widget">
+  <property name="title">Foreign Student State</property>
+  <property name="fields">
+   <element value="for_state"/>
+  </property>
+  <property name="label">Foreign Student State</property>
+  <property name="label_edit">Foreign Student State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="for_state_old" meta_type="Select Widget">
+  <property name="title">Foreign Student State</property>
+  <property name="fields">
+   <element value="for_state"/>
+  </property>
+  <property name="label">Foreign Student State</property>
+  <property name="label_edit">Foreign Student State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">states</property>
+ </widget>
+ <widget name="former_surname" meta_type="String Widget">
+  <property name="title">Former Surname</property>
+  <property name="fields">
+   <element value="former_surname"/>
+  </property>
+  <property name="label">Former Surname</property>
+  <property name="label_edit">Former Surname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="fst_best_lang" meta_type="String Widget">
+  <property name="title">First Best Language</property>
+  <property name="fields">
+   <element value="fst_best_lang"/>
+  </property>
+  <property name="label">First Best Language</property>
+  <property name="label_edit">First Best Language</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="hall" meta_type="String Widget">
+  <property name="title">Residence Hall on Campus</property>
+  <property name="fields">
+   <element value="hall"/>
+  </property>
+  <property name="label">Residence Hall on Campus</property>
+  <property name="label_edit">Residence Hall on Campus</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="lastname" meta_type="String Widget">
+  <property name="title">Lastname</property>
+  <property name="fields">
+   <element value="lastname"/>
+  </property>
+  <property name="label">Lastname</property>
+  <property name="label_edit">Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="marit_stat" meta_type="Boolean Widget">
+  <property name="title">Marital Status</property>
+  <property name="fields">
+   <element value="marit_stat"/>
+  </property>
+  <property name="label">Marital Status</property>
+  <property name="label_edit">Marital Status</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">singe</property>
+  <property name="label_true">married</property>
+ </widget>
  <widget name="middlename" meta_type="String Widget">
   <property name="title">Middle Name</property>
@@ -33,30 +143,181 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
- <widget name="lastname" meta_type="String Widget">
-  <property name="title">Lastname</property>
-  <property name="fields">
-   <element value="lastname"/>
-  </property>
-  <property name="label">Lastname</property>
-  <property name="label_edit">Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-  <widget name="former_surname" meta_type="String Widget">
-  <property name="title">Former Surname</property>
-  <property name="fields">
-   <element value="former_surname"/>
-  </property>
-  <property name="label">Former Surname</property>
-  <property name="label_edit">Former Surname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+ <widget name="mother_tongue" meta_type="String Widget">
+  <property name="title">Mother Tongue</property>
+  <property name="fields">
+   <element value="mother_tongue"/>
+  </property>
+  <property name="label">Mother Tongue</property>
+  <property name="label_edit">Mother Tongue</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_address" meta_type="String Widget">
+  <property name="title">Next of Kin Address</property>
+  <property name="fields">
+   <element value="next_kin_address"/>
+  </property>
+  <property name="label">Next of Kin Address</property>
+  <property name="label_edit">Next of Kin Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_city" meta_type="String Widget">
+  <property name="title">Next of Kin City</property>
+  <property name="fields">
+   <element value="next_kin_city"/>
+  </property>
+  <property name="label">Next of Kin City</property>
+  <property name="label_edit">Next of Kin City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_email" meta_type="String Widget">
+  <property name="title">Next of Kin Email</property>
+  <property name="fields">
+   <element value="next_kin_email"/>
+  </property>
+  <property name="label">Next of Kin Email</property>
+  <property name="label_edit">Next of Kin Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_firstname" meta_type="String Widget">
+  <property name="title">Next of Kin Firstname</property>
+  <property name="fields">
+   <element value="next_kin_firstname"/>
+  </property>
+  <property name="label">Next of Kin Firstname</property>
+  <property name="label_edit">Next of Kin Firstname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_lastname" meta_type="String Widget">
+  <property name="title">Next of Kin Lastname</property>
+  <property name="fields">
+   <element value="next_kin_lastname"/>
+  </property>
+  <property name="label">Next of Kin Lastname</property>
+  <property name="label_edit">Next of Kin Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_middlename" meta_type="String Widget">
+  <property name="title">Next of Kin Middlename</property>
+  <property name="fields">
+   <element value="next_kin_middlename"/>
+  </property>
+  <property name="label">Next of Kin Middlename</property>
+  <property name="label_edit">Next of Kin Middlename</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_phone" meta_type="String Widget">
+  <property name="title">Next of Kin Phone</property>
+  <property name="fields">
+   <element value="next_kin_phone"/>
+  </property>
+  <property name="label">Next of Kin Phone</property>
+  <property name="label_edit">Next of Kin Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_relation" meta_type="String Widget">
+  <property name="title">Next of Kin Relationship</property>
+  <property name="fields">
+   <element value="next_kin_relation"/>
+  </property>
+  <property name="label">Next of Kin Relationship</property>
+  <property name="label_edit">Next of Kin Relationship</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="next_kin_state" meta_type="String Widget">
+  <property name="title">Next of Kin State</property>
+  <property name="fields">
+   <element value="next_kin_state"/>
+  </property>
+  <property name="label">Next of Kin State</property>
+  <property name="label_edit">Next of Kin State</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="notes" meta_type="Text Widget">
+  <property name="title">Notes</property>
+  <property name="fields">
+   <element value="notes"/>
+  </property>
+  <property name="label">Notes</property>
+  <property name="label_edit">Notes</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="perm_address" meta_type="String Widget">
+  <property name="title">Permanent Address</property>
+  <property name="fields">
+   <element value="perm_address"/>
+  </property>
+  <property name="label">Permanent Address</property>
+  <property name="label_edit">Permanent Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="perm_city" meta_type="String Widget">
+  <property name="title">City</property>
+  <property name="fields">
+   <element value="perm_city"/>
+  </property>
+  <property name="label">City</property>
+  <property name="label_edit">City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="phone" meta_type="String Widget">
+  <property name="title">Phone</property>
+  <property name="fields">
+   <element value="phone"/>
+  </property>
+  <property name="label">Phone</property>
+  <property name="label_edit">Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="religion" meta_type="Select Widget">
+  <property name="title">Religion</property>
+  <property name="fields">
+   <element value="religion"/>
+  </property>
+  <property name="label">Religion</property>
+  <property name="label_edit">Religion</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">religion</property>
+ </widget>
+ <widget name="scd_best_lang" meta_type="String Widget">
+  <property name="title">Second Best Language</property>
+  <property name="fields">
+   <element value="scd_best_lang"/>
+  </property>
+  <property name="label">Second Best Language</property>
+  <property name="label_edit">Second Best Language</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sex" meta_type="Boolean Widget">
   <property name="title">Sex</property>
@@ -72,222 +333,37 @@
   <property name="label_true">female</property>
  </widget>
-
-
- <widget name="for_lga" meta_type="String Widget">
-  <property name="title">Foreign Student Local Government Area</property>
-  <property name="fields">
-   <element value="for_lga"/>
-  </property>
-  <property name="label">Foreign Student Local Government Area</property>
-  <property name="label_edit">Foreign Student Local Government Area</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="for_state" meta_type="Select Widget">
-  <property name="title">Foreign Student State</property>
-  <property name="fields">
-   <element value="for_state"/>
-  </property>
-  <property name="label">Foreign Student State</property>
-  <property name="label_edit">Foreign Student State</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">states</property>
- </widget>
-
- <widget name="marit_stat" meta_type="Boolean Widget">
-  <property name="title">Marital Status</property>
-  <property name="fields">
-   <element value="marit_stat"/>
-  </property>
-  <property name="label">Marital Status</property>
-  <property name="label_edit">Marital Status</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="label_false">singe</property>
-  <property name="label_true">married</property>
- </widget>
-
- <widget name="religion" meta_type="Select Widget">
-  <property name="title">Religion</property>
-  <property name="fields">
-   <element value="religion"/>
-  </property>
-  <property name="label">Religion</property>
-  <property name="label_edit">Religion</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="vocabulary">religion</property>
- </widget>
-
- <widget name="perm_address" meta_type="String Widget">
-  <property name="title">Permanent Address</property>
-  <property name="fields">
-   <element value="perm_address"/>
-  </property>
-  <property name="label">Permanent Address</property>
-  <property name="label_edit">Permanent Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="perm_city" meta_type="String Widget">
-  <property name="title">City</property>
-  <property name="fields">
-   <element value="perm_city"/>
-  </property>
-  <property name="label">City</property>
-  <property name="label_edit">City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="campus_address" meta_type="String Widget">
-  <property name="title">Campus Address</property>
-  <property name="fields">
-   <element value="campus_address"/>
-  </property>
-  <property name="label">Campus Address</property>
-  <property name="label_edit">Campus Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="phone" meta_type="String Widget">
-  <property name="title">Phone</property>
-  <property name="fields">
-   <element value="phone"/>
-  </property>
-  <property name="label">Phone</property>
-  <property name="label_edit">Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_firstname" meta_type="String Widget">
-  <property name="title">Next of Kin Firstname</property>
-  <property name="fields">
-   <element value="next_kin_firstname"/>
-  </property>
-  <property name="label">Next of Kin Firstname</property>
-  <property name="label_edit">Next of Kin Firstname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_middlename" meta_type="String Widget">
-  <property name="title">Next of Kin Middlename</property>
-  <property name="fields">
-   <element value="next_kin_middlename"/>
-  </property>
-  <property name="label">Next of Kin Middlename</property>
-  <property name="label_edit">Next of Kin Middlename</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_lastname" meta_type="String Widget">
-  <property name="title">Next of Kin Lastname</property>
-  <property name="fields">
-   <element value="next_kin_lastname"/>
-  </property>
-  <property name="label">Next of Kin Lastname</property>
-  <property name="label_edit">Next of Kin Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_relation" meta_type="String Widget">
-  <property name="title">Next of Kin Relationship</property>
-  <property name="fields">
-   <element value="next_kin_relation"/>
-  </property>
-  <property name="label">Next of Kin Relationship</property>
-  <property name="label_edit">Next of Kin Relationship</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_address" meta_type="String Widget">
-  <property name="title">Next of Kin Address</property>
-  <property name="fields">
-   <element value="next_kin_address"/>
-  </property>
-  <property name="label">Next of Kin Address</property>
-  <property name="label_edit">Next of Kin Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_city" meta_type="String Widget">
-  <property name="title">Next of Kin City</property>
-  <property name="fields">
-   <element value="next_kin_city"/>
-  </property>
-  <property name="label">Next of Kin City</property>
-  <property name="label_edit">Next of Kin City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="next_kin_state" meta_type="String Widget">
-  <property name="title">Next of Kin State</property>
-  <property name="fields">
-   <element value="next_kin_state"/>
-  </property>
-  <property name="label">Next of Kin State</property>
-  <property name="label_edit">Next of Kin State</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="next_kin_email" meta_type="String Widget">
-  <property name="title">Next of Kin Email</property>
-  <property name="fields">
-   <element value="next_kin_email"/>
-  </property>
-  <property name="label">Next of Kin Email</property>
-  <property name="label_edit">Next of Kin Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="next_kin_phone" meta_type="String Widget">
-  <property name="title">Next of Kin Phone</property>
-  <property name="fields">
-   <element value="next_kin_phone"/>
-  </property>
-  <property name="label">Next of Kin Phone</property>
-  <property name="label_edit">Next of Kin Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+ <widget name="sponsor_address" meta_type="String Widget">
+  <property name="title">Sponsor Address</property>
+  <property name="fields">
+   <element value="sponsor_address"/>
+  </property>
+  <property name="label">Sponsor Address</property>
+  <property name="label_edit">Sponsor Address</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="sponsor_city" meta_type="String Widget">
+  <property name="title">Sponsor City</property>
+  <property name="fields">
+   <element value="sponsor_city"/>
+  </property>
+  <property name="label">Sponsor City</property>
+  <property name="label_edit">Sponsor City</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="sponsor_email" meta_type="String Widget">
+  <property name="title">Sponsor Email</property>
+  <property name="fields">
+   <element value="sponsor_email"/>
+  </property>
+  <property name="label">Sponsor Email</property>
+  <property name="label_edit">Sponsor Email</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_firstname" meta_type="String Widget">
   <property name="title">Sponsor Firstname</property>
@@ -301,7 +377,15 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
- <field name="sponsor_middlename" meta_type="CPS String Field"/>
-
+ <widget name="sponsor_lastname" meta_type="String Widget">
+  <property name="title">Sponsor Lastname</property>
+  <property name="fields">
+   <element value="sponsor_lastname"/>
+  </property>
+  <property name="label">Sponsor Lastname</property>
+  <property name="label_edit">Sponsor Lastname</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_middlename" meta_type="String Widget">
   <property name="title">Sponsor Middlename</property>
@@ -315,45 +399,15 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
-
- <widget name="sponsor_lastname" meta_type="String Widget">
-  <property name="title">Sponsor Lastname</property>
-  <property name="fields">
-   <element value="sponsor_lastname"/>
-  </property>
-  <property name="label">Sponsor Lastname</property>
-  <property name="label_edit">Sponsor Lastname</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="sponsor_address" meta_type="String Widget">
-  <property name="title">Sponsor Address</property>
-  <property name="fields">
-   <element value="sponsor_address"/>
-  </property>
-  <property name="label">Sponsor Address</property>
-  <property name="label_edit">Sponsor Address</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="sponsor_city" meta_type="String Widget">
-  <property name="title">Sponsor City</property>
-  <property name="fields">
-   <element value="sponsor_city"/>
-  </property>
-  <property name="label">Sponsor City</property>
-  <property name="label_edit">Sponsor City</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+ <widget name="sponsor_phone" meta_type="String Widget">
+  <property name="title">Sponsor Phone</property>
+  <property name="fields">
+   <element value="sponsor_phone"/>
+  </property>
+  <property name="label">Sponsor Phone</property>
+  <property name="label_edit">Sponsor Phone</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="sponsor_state" meta_type="String Widget">
   <property name="title">Sponsor State</property>
@@ -367,106 +421,4 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
-
- <widget name="sponsor_email" meta_type="String Widget">
-  <property name="title">Sponsor Email</property>
-  <property name="fields">
-   <element value="sponsor_email"/>
-  </property>
-  <property name="label">Sponsor Email</property>
-  <property name="label_edit">Sponsor Email</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="sponsor_phone" meta_type="String Widget">
-  <property name="title">Sponsor Phone</property>
-  <property name="fields">
-   <element value="sponsor_phone"/>
-  </property>
-  <property name="label">Sponsor Phone</property>
-  <property name="label_edit">Sponsor Phone</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="fst_best_lang" meta_type="String Widget">
-  <property name="title">First Best Language</property>
-  <property name="fields">
-   <element value="fst_best_lang"/>
-  </property>
-  <property name="label">First Best Language</property>
-  <property name="label_edit">First Best Language</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="scd_best_lang" meta_type="String Widget">
-  <property name="title">Second Best Language</property>
-  <property name="fields">
-   <element value="scd_best_lang"/>
-  </property>
-  <property name="label">Second Best Language</property>
-  <property name="label_edit">Second Best Language</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="mother_tongue" meta_type="String Widget">
-  <property name="title">Mother Tongue</property>
-  <property name="fields">
-   <element value="mother_tongue"/>
-  </property>
-  <property name="label">Mother Tongue</property>
-  <property name="label_edit">Mother Tongue</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="hall" meta_type="String Widget">
-  <property name="title">Residence Hall on Campus</property>
-  <property name="fields">
-   <element value="hall"/>
-  </property>
-  <property name="label">Residence Hall on Campus</property>
-  <property name="label_edit">Residence Hall on Campus</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="disabled" meta_type="Boolean Widget">
-  <property name="title">Disabled</property>
-  <property name="fields">
-   <element value="disabled"/>
-  </property>
-  <property name="label"></property>
-  <property name="label_edit"></property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="label_false">yes</property>
-  <property name="label_true">no</property>
- </widget>
-
- <widget name="notes" meta_type="Text Widget">
-  <property name="title">Notes</property>
-  <property name="fields">
-   <element value="notes"/>
-  </property>
-  <property name="label">Notes</property>
-  <property name="label_edit">Notes</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
  <table>
   <row>
@@ -578,5 +530,4 @@
    <cell name="notes"/>
   </row>
-
  </table>
 </object>
Index: /WAeUP_SRP/trunk/profiles/default/vocabularies.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/vocabularies.xml	(revision 422)
+++ /WAeUP_SRP/trunk/profiles/default/vocabularies.xml	(revision 423)
@@ -14,3 +14,4 @@
  <object name="range50" meta_type="CPS Vocabulary"/>
  <object name="semester_voc" meta_type="CPS Vocabulary"/>
+ <object name="local_gov_areas" meta_type="CPS Vocabulary"/>
  </object>
Index: /WAeUP_SRP/trunk/profiles/default/vocabularies/local_gov_areas.xml
===================================================================
--- /WAeUP_SRP/trunk/profiles/default/vocabularies/local_gov_areas.xml	(revision 422)
+++ /WAeUP_SRP/trunk/profiles/default/vocabularies/local_gov_areas.xml	(revision 423)
@@ -677,5 +677,5 @@
     <item key="ondo_owo" msgid="">Ondo / Owo</item>
     <item key="osun_atakumosa" msgid="">Osun / Atakumosa</item>
-    <item key="osun_atakumosa_east"_selected>osun_atakumosa_east" msgid=""></item>
+    <item key="osun_atakumosa_east" msgid="">Osun / Atakumosa East</item>
     <item key="osun_ayeda-ade" msgid="">Osun / Ayeda-Ade</item>
     <item key="osun_ayedire" msgid="">Osun / Ayedire</item>
