Index: /WAeUP_SRP/base/skins/waeup_student/apply_admission.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_student/apply_admission.py	(revision 2515)
+++ /WAeUP_SRP/base/skins/waeup_student/apply_admission.py	(revision 2516)
@@ -99,5 +99,5 @@
 deadline = {}
 deadline['pume'] = '[Date of PUME Deadline]'
-deadline['pde'] = 'Saturday, 3rd November 2007'
+deadline['pde'] = 'Sunday, 4th November 2007'
 deadline['prence'] = '[Date of PRENCE Deadline]'
 deadline['pce'] = '[Date of PCE Deadline]'
Index: /WAeUP_SRP/base/skins/waeup_utilities/moveCourseResults.py
===================================================================
--- /WAeUP_SRP/base/skins/waeup_utilities/moveCourseResults.py	(revision 2515)
+++ /WAeUP_SRP/base/skins/waeup_utilities/moveCourseResults.py	(revision 2516)
@@ -49,5 +49,5 @@
 moved_sids = context.course_results.uniqueValuesFor('student_id')
 for brain in brains:
-    count += 1    
+    count += 1
     if brain.id in moved_sids:
         continue
@@ -67,5 +67,5 @@
         context.course_results.moveResultsHere(study_level,brain.id)
         moved += 1
-        logger.info("moved  results of student %s" % (brain.id))
+        logger.info("moved results of student %s" % (brain.id))
         if moved and not moved % commit_after:
             context.waeup_tool.doCommit()
Index: /WAeUP_SRP/fceokene/profiles/default/layouts.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/layouts.xml	(revision 2515)
+++ /WAeUP_SRP/fceokene/profiles/default/layouts.xml	(revision 2516)
@@ -12,18 +12,19 @@
   <object name="application_manage" meta_type="CPS Layout"/>
   <object name="certificate" meta_type="CPS Layout"/>
+  <object name="certificate_course" meta_type="CPS Layout"/>
+  <object name="course" meta_type="CPS Layout"/>
+  
+  <object name="import_certificate_course" meta_type="CPS Layout"/>
   <object name="import_certificate" meta_type="CPS Layout"/>
-  <object name="certificate_course" meta_type="CPS Layout"/>
-  <object name="import_certificate_course" meta_type="CPS Layout"/>
-  <object name="course" meta_type="CPS Layout"/>
-  <object name="import_applicant" meta_type="CPS Layout"/>
+  <object name="import_student" meta_type="CPS Layout"/>
   <object name="import_course" meta_type="CPS Layout"/>
   <object name="import_course_result" meta_type="CPS Layout"/>
   <object name="import_department" meta_type="CPS Layout"/>
   <object name="import_application" meta_type="CPS Layout"/>
+  <object name="import_faculty" meta_type="CPS Layout"/>
+  
   <object name="department" meta_type="CPS Layout"/>
-  <object name="import_faculty" meta_type="CPS Layout"/>
   <object name="faculty" meta_type="CPS Layout"/>
   <object name="import" meta_type="CPS Layout"/>
-  <object name="import_student" meta_type="CPS Layout"/>
   <object name="add_student" meta_type="CPS Layout"/>
   <object name="members" meta_type="CPS Layout"/>
Index: eUP_SRP/fceokene/profiles/default/layouts/import_applicant.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/layouts/import_applicant.xml	(revision 2515)
+++ 	(revision )
@@ -1,666 +1,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
-<object name="application_pce" 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_apply_admission_</property>
-  <property name="flexible_widgets"/>
-  <property name="validate_values_expr"></property>
-
-  <widget name="student_id" meta_type="String Widget">
-    <property name="title">Student Id</property>
-    <property name="fields">
-      <element value="student_id"/>
-    </property>
-    <property name="label">Student Id</property>
-    <property name="label_edit">Student Id</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-
-  <widget name="screening_score" meta_type="String Widget">
-    <property name="title">Score</property>
-    <property name="fields">
-      <element value="screening_score"/>
-    </property>
-    <property name="label">Score</property>
-    <property name="label_edit">Score</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  
-  <widget name="notice" meta_type="Text Widget">
-    <property name="title">Notice</property>
-    <property name="fields">
-      <element value="notice"/>
-    </property>
-    <property name="label">Notice</property>
-    <property name="label_edit">Notice</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-
-  <widget name="jamb_age" meta_type="String Widget">
-    <property name="title">Age</property>
-    <property name="fields">
-      <element value="jamb_age"/>
-    </property>
-    <property name="label">Age</property>
-    <property name="label_edit">Age</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="date_of_birth" meta_type="DateTime Widget">
-    <property name="title">Date of Birth</property>
-    <property name="fields">
-      <element value="date_of_birth"/>
-    </property>
-    <property name="label">Date of Birth</property>
-    <property name="label_edit">Date of Birth</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="department" meta_type="String Widget">
-    <property name="title">Department</property>
-    <property name="fields">
-      <element value="department"/>
-    </property>
-    <property name="label">Department</property>
-    <property name="label_edit">Department</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="email" meta_type="Email Widget">
-    <property name="title">Email</property>
-    <property name="fields">
-      <element value="email"/>
-    </property>
-    <property name="label">Email</property>
-    <property name="label_edit">Email</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="entry_mode" meta_type="String Widget">
-    <property name="title">Entry Mode</property>
-    <property name="fields">
-      <element value="entry_mode"/>
-    </property>
-    <property name="label">Entry Mode</property>
-    <property name="label_edit">Entry Mode</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="faculty" meta_type="String Widget">
-    <property name="title">Faculty</property>
-    <property name="fields">
-      <element value="faculty"/>
-    </property>
-    <property name="label">Faculty</property>
-    <property name="label_edit">Faculty</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="firstname" meta_type="String Widget">
-    <property name="title">Firstname</property>
-    <property name="fields">
-      <element value="firstname"/>
-    </property>
-    <property name="label">Firstname</property>
-    <property name="label_edit">Firstname</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="aggregate" meta_type="Int Widget">
-    <property name="title">Total Score</property>
-    <property name="fields">
-      <element value="aggregate"/>
-    </property>
-    <property name="label">Total Score</property>
-    <property name="label_edit">Total Score</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="eng_score" meta_type="Int Widget">
-    <property name="title">English Score</property>
-    <property name="fields">
-      <element value="eng_score"/>
-    </property>
-    <property name="label">'English' Score</property>
-    <property name="label_edit">'English' Score</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="subj1" meta_type="Select Widget">
-    <property name="title">Subject 1</property>
-    <property name="fields">
-      <element value="subj1"/>
-    </property>
-    <property name="label"></property>
-    <property name="label_edit">label field</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-    <property name="vocabulary">jamb_subjects</property>
-  </widget>
-  <widget name="subj1score" meta_type="Int Widget">
-    <property name="title">Subject 1 Score</property>
-    <property name="fields">
-      <element value="subj1score"/>
-    </property>
-    <property name="label"></property>
-    <property name="label_edit"></property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="subj2" meta_type="Select Widget">
-    <property name="title">Subject 2</property>
-    <property name="fields">
-      <element value="subj2"/>
-    </property>
-    <property name="label"></property>
-    <property name="label_edit">label field</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-    <property name="vocabulary">jamb_subjects</property>
-  </widget>
-  <widget name="subj2score" meta_type="Int Widget">
-    <property name="title">Subject 2 Score</property>
-    <property name="fields">
-      <element value="subj2score"/>
-    </property>
-    <property name="label"></property>
-    <property name="label_edit"></property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="subj3" meta_type="Select Widget">
-    <property name="title">Subject 3</property>
-    <property name="fields">
-      <element value="subj3"/>
-    </property>
-    <property name="label"></property>
-    <property name="label_edit">label field</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="vocabulary">jamb_subjects</property>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="subj3score" meta_type="Int Widget">
-    <property name="title">Subject 3 Score</property>
-    <property name="fields">
-      <element value="subj3score"/>
-    </property>
-    <property name="label"></property>
-    <property name="label_edit"></property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="lastname" meta_type="String Widget">
-    <property name="title">Name</property>
-    <property name="fields">
-      <element value="lastname"/>
-    </property>
-    <property name="label">Name</property>
-    <property name="label_edit">Name</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="lga" meta_type="WAeUP LGA Widget">
-    <property name="title">LGA</property>
-    <property name="fields">
-      <element value="lga"/>
-    </property>
-    <property name="label">LGA</property>
-    <property name="label_edit">LGA</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="middlenames" meta_type="String Widget">
-    <property name="title">Middlenames</property>
-    <property name="fields">
-      <element value="middlenames"/>
-    </property>
-    <property name="label">Middlenames</property>
-    <property name="label_edit">Middlenames</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </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="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="pin" meta_type="Pume Pin Widget">
-    <property name="title">Access Code</property>
-    <property name="fields">
-      <element value="pin"/>
-    </property>
-    <property name="label">Access Code</property>
-    <property name="label_edit">Access Code</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-    <property name="prefix">APP</property>
-    <property name="reference">reg_no</property>
-  </widget>
-  <widget name="application_date" meta_type="DateTime Widget">
-    <property name="title">Application Date</property>
-    <property name="fields">
-      <element value="application_date"/>
-    </property>
-    <property name="label">Application Date</property>
-    <property name="label_edit">Application Date</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="view_format">%A, %B %d, %Y</property>
-    <property name="time_setting">False</property>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="screening_date" meta_type="DateTime Widget">
-    <property name="title">Screening Date</property>
-    <property name="fields">
-      <element value="screening_date"/>
-    </property>
-    <property name="label">Screening Date</property>
-    <property name="label_edit">Screening Date</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="view_format">%A, %B %d, %Y</property>
-    <property name="time_setting">False</property>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="screening_type" meta_type="Select Widget">
-    <property name="title">Screening Type</property>
-    <property name="fields">
-      <element value="screening_type"/>
-    </property>
-    <property name="label">Screening Type</property>
-    <property name="label_edit">Screening Type</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-    <property name="vocabulary">screening_types</property>
-  </widget>
-  <widget name="reg_no" meta_type="JambRegNo Widget">
-    <property name="title">JAMB Registration Number</property>
-    <property name="fields">
-      <element value="reg_no"/>
-    </property>
-    <property name="label">JAMB Registration Number</property>
-    <property name="label_edit">JAMB Registration Number</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-    <property name="display_width">13</property>
-    <property name="size_max">13</property>
-    <property name="reference">reg_no</property>
-    <property name="catalog">applicants_catalog</property>
-  </widget>
-  <widget name="sex" meta_type="WAeUP Sex Widget">
-    <property name="title">Sex</property>
-    <property name="fields">
-      <element value="sex"/>
-    </property>
-    <property name="label">Sex</property>
-    <property name="label_edit">Sex</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="state" meta_type="WAeUP LGA Widget">
-    <property name="title">State</property>
-    <property name="fields">
-      <element value="lga"/>
-    </property>
-    <property name="label">State</property>
-    <property name="label_edit">State</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes"/>
-    <property name="hidden_layout_modes"/>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="status" meta_type="String Widget">
-    <property name="title">Application Status</property>
-    <property name="fields">
-      <element value="status"/>
-    </property>
-    <property name="label">Application Status</property>
-    <property name="label_edit">Application Status</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="course1" meta_type="Select Widget">
-    <property name="title">1st Choice Course of Study</property>
-    <property name="fields">
-      <element value="course1"/>
-    </property>
-    <property name="label">1st Choice Course of Study</property>
-    <property name="label_edit">1st Choice Course of Study</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="vocabulary">cos</property>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="course2" meta_type="Select Widget">
-    <property name="title">2nd Choice Course of Study</property>
-    <property name="fields">
-      <element value="course2"/>
-    </property>
-    <property name="label">2nd Choice Course of Study</property>
-    <property name="label_edit">2nd Choice Course of Study</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="vocabulary">cos</property>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="course3" meta_type="Select Widget">
-    <property name="title">3rd Choice Course of Study</property>
-    <property name="fields">
-      <element value="course3"/>
-    </property>
-    <property name="label">3rd Choice Course of Study</property>
-    <property name="label_edit">3rd Choice Course of Study</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="sorted">True</property>
-    <property name="vocabulary">cos</property>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-  <widget name="course_admitted" meta_type="String Widget">
-    <property name="title">Course of Study</property>
-    <property name="fields">
-      <element value="course_admitted"/>
-    </property>
-    <property name="label">Course of Study</property>
-    <property name="label_edit">Course of Study</property>
-    <property name="description"></property>
-    <property name="help"></property>
-    <property name="is_i18n">False</property>
-    <property name="widget_mode_expr"></property>
-    <property name="readonly_layout_modes">
-      <element value="edit"/>
-    </property>
-    <property name="hidden_layout_modes">
-      <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="css_class_expr">string:row</property>
-  </widget>
-</object>
Index: /WAeUP_SRP/fceokene/profiles/default/schemas.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/schemas.xml	(revision 2515)
+++ /WAeUP_SRP/fceokene/profiles/default/schemas.xml	(revision 2516)
@@ -7,14 +7,19 @@
  <object name="acco_hall" meta_type="CPS Schema"/>
  <object name="acco_bed_booking" meta_type="CPS Schema"/>
- <object name="application" meta_type="CPS Schema"/>
  <object name="certificate" meta_type="CPS Schema"/>
+ <object name="certificate_course" meta_type="CPS Schema"/>
+
+ <object name="import_application" meta_type="CPS Schema"/>
  <object name="import_certificate" meta_type="CPS Schema"/>
- <object name="certificate_course" meta_type="CPS Schema"/>
  <object name="import_certificate_course" meta_type="CPS Schema"/>
- <object name="import_applicant" meta_type="CPS Schema"/>
  <object name="import_course" meta_type="CPS Schema"/>
  <object name="import_course_result" meta_type="CPS Schema"/>
+ <object name="import_department" meta_type="CPS Schema"/>
+ <object name="import" meta_type="CPS Schema"/>
+ <object name="import_student" meta_type="CPS Schema"/>
+ <object name="import_student_level_data" meta_type="CPS Schema"/>
+ <object name="import_student_course_results" meta_type="CPS Schema"/>
+ 
  <object name="course" meta_type="CPS Schema"/>
- <object name="import_department" meta_type="CPS Schema"/>
  <object name="department" meta_type="CPS Schema"/>
  <object name="faculty" meta_type="CPS Schema"/>
@@ -25,9 +30,5 @@
  <object name="student" meta_type="CPS Schema"/>
  <object name="scratch_card_batch" meta_type="CPS Schema"/>
- <object name="import" meta_type="CPS Schema"/>
- <object name="import_student" meta_type="CPS Schema"/>
- <object name="add_student" meta_type="CPS Schema"/> 
- <object name="import_student_level_data" meta_type="CPS Schema"/>
- <object name="import_student_course_results" meta_type="CPS Schema"/>
+ <object name="add_student" meta_type="CPS Schema"/>
  <object name="student_accommodation" meta_type="CPS Schema"/>
  <object name="student_application" meta_type="CPS Schema"/>
Index: eUP_SRP/fceokene/profiles/default/schemas/application.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/schemas/application.xml	(revision 2515)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="schema.xsl"?>
-<object name="application" meta_type="CPS Schema">
- <field name="course1" meta_type="CPS String Field"/>
- <field name="course2" meta_type="CPS String Field"/>
- <field name="course3" meta_type="CPS String Field"/>
- <field name="course_admitted" meta_type="CPS String Field"/>
- <field name="entry_mode" meta_type="CPS String Field"/>
- <field name="department" meta_type="CPS String Field"/>
- <field name="faculty" meta_type="CPS String Field"/>
- <field name="firstname" meta_type="CPS String Field"/>
- <field name="eng_score" meta_type="CPS Int Field"/>
- <field name="subj1" meta_type="CPS Int Field"/>
- <field name="subj1score" meta_type="CPS Int Field"/>
- <field name="subj2" meta_type="CPS Int Field"/>
- <field name="subj2score" meta_type="CPS Int Field"/>
- <field name="subj3" meta_type="CPS Int Field"/>
- <field name="subj3score" meta_type="CPS Int Field"/>
- <field name="aggregate" meta_type="CPS Int Field"/>
- <field name="lastname" meta_type="CPS String Field"/>
- <field name="middlenames" meta_type="CPS String Field"/>
- <field name="email" meta_type="CPS String Field"/>
- <field name="phone" meta_type="CPS String Field"/>
- <field name="pin" meta_type="CPS String Field"/>
- <field name="reg_no" meta_type="CPS String Field"/>
- <field name="date_of_birth" meta_type="CPS DateTime Field"/>
- <field name="jamb_age" meta_type="CPS String Field"/>
- <field name="jamb_state" meta_type="CPS String Field"/>
- <field name="jamb_lga" meta_type="CPS String Field"/>
- <field name="application_date" meta_type="CPS DateTime Field"/>
- <field name="sex" meta_type="CPS Boolean Field"/>
- <field name="lga" meta_type="CPS String Field"/>
- <field name="screening_date" meta_type="CPS DateTime Field"/>
- <field name="screening_type" meta_type="CPS String Field"/>
- <field name="passport" meta_type="CPS String Field"/>
- <field name="status" meta_type="CPS String Field"/>
-  <field name="hq_type" meta_type="CPS String Field"/>
- <field name="hq_grade" meta_type="CPS String Field"/>
- <field name="screening_venue" meta_type="CPS String Field"/>
- <field name="aos" meta_type="CPS String Field"/>
- <field name="screening_score" meta_type="CPS String Field"/>
- <field name="notice" meta_type="CPS String Field"/>
- <field name="student_id" meta_type="CPS String Field"/>
-</object>
Index: eUP_SRP/fceokene/profiles/default/schemas/import_applicant.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/schemas/import_applicant.xml	(revision 2515)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="schema.xsl"?>
-<object name="application" meta_type="CPS Schema">
- <field name="course1" meta_type="CPS String Field"/>
- <field name="course2" meta_type="CPS String Field"/>
- <field name="course3" meta_type="CPS String Field"/>
- <field name="course_admitted" meta_type="CPS String Field"/>
- <field name="entry_mode" meta_type="CPS String Field"/>
- <field name="department" meta_type="CPS String Field"/>
- <field name="faculty" meta_type="CPS String Field"/>
- <field name="firstname" meta_type="CPS String Field"/>
- <field name="eng_score" meta_type="CPS Int Field"/>
- <field name="subj1" meta_type="CPS Int Field"/>
- <field name="subj1score" meta_type="CPS Int Field"/>
- <field name="subj2" meta_type="CPS Int Field"/>
- <field name="subj2score" meta_type="CPS Int Field"/>
- <field name="subj3" meta_type="CPS Int Field"/>
- <field name="subj3score" meta_type="CPS Int Field"/>
- <field name="aggregate" meta_type="CPS Int Field"/>
- <field name="lastname" meta_type="CPS String Field"/>
- <field name="middlenames" meta_type="CPS String Field"/>
- <field name="email" meta_type="CPS String Field"/>
- <field name="phone" meta_type="CPS String Field"/>
- <field name="pin" meta_type="CPS String Field"/>
- <field name="reg_no" meta_type="CPS String Field"/>
- <field name="date_of_birth" meta_type="CPS DateTime Field"/>
- <field name="jamb_age" meta_type="CPS String Field"/>
- <field name="jamb_state" meta_type="CPS String Field"/>
- <field name="jamb_lga" meta_type="CPS String Field"/>
- <field name="application_date" meta_type="CPS DateTime Field"/>
- <field name="sex" meta_type="CPS Boolean Field"/>
- <field name="state" meta_type="CPS String Field"/>
- <field name="lga" meta_type="CPS String Field"/>
- <field name="screening_date" meta_type="CPS DateTime Field"/>
- <field name="screening_type" meta_type="CPS String Field"/>
- <field name="passport" meta_type="CPS String Field"/>
- <field name="status" meta_type="CPS String Field"/>
-  <field name="hq_type" meta_type="CPS String Field"/>
- <field name="hq_grade" meta_type="CPS String Field"/>
- <field name="screening_venue" meta_type="CPS String Field"/>
- <field name="aos" meta_type="CPS String Field"/>
- <field name="screening_score" meta_type="CPS String Field"/>
- <field name="notice" meta_type="CPS String Field"/>
- <field name="student_id" meta_type="CPS String Field"/>
-</object>
Index: /WAeUP_SRP/fceokene/profiles/default/schemas/import_application.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/schemas/import_application.xml	(revision 2516)
+++ /WAeUP_SRP/fceokene/profiles/default/schemas/import_application.xml	(revision 2516)
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="schema.xsl"?>
+<object name="import_application" meta_type="CPS Schema">
+ <field name="course1" meta_type="CPS String Field"/>
+ <field name="course2" meta_type="CPS String Field"/>
+ <field name="course3" meta_type="CPS String Field"/>
+ <field name="course_admitted" meta_type="CPS String Field"/>
+ <field name="entry_mode" meta_type="CPS String Field"/>
+ <field name="department" meta_type="CPS String Field"/>
+ <field name="faculty" meta_type="CPS String Field"/>
+ <field name="firstname" meta_type="CPS String Field"/>
+ <field name="eng_score" meta_type="CPS Int Field"/>
+ <field name="subj1" meta_type="CPS Int Field"/>
+ <field name="subj1score" meta_type="CPS Int Field"/>
+ <field name="subj2" meta_type="CPS Int Field"/>
+ <field name="subj2score" meta_type="CPS Int Field"/>
+ <field name="subj3" meta_type="CPS Int Field"/>
+ <field name="subj3score" meta_type="CPS Int Field"/>
+ <field name="aggregate" meta_type="CPS Int Field"/>
+ <field name="lastname" meta_type="CPS String Field"/>
+ <field name="middlenames" meta_type="CPS String Field"/>
+ <field name="email" meta_type="CPS String Field"/>
+ <field name="phone" meta_type="CPS String Field"/>
+ <field name="pin" meta_type="CPS String Field"/>
+ <field name="reg_no" meta_type="CPS String Field"/>
+ <field name="date_of_birth" meta_type="CPS DateTime Field"/>
+ <field name="jamb_age" meta_type="CPS String Field"/>
+ <field name="jamb_state" meta_type="CPS String Field"/>
+ <field name="jamb_lga" meta_type="CPS String Field"/>
+ <field name="application_date" meta_type="CPS DateTime Field"/>
+ <field name="sex" meta_type="CPS Boolean Field"/>
+ <field name="lga" meta_type="CPS String Field"/>
+ <field name="screening_date" meta_type="CPS DateTime Field"/>
+ <field name="screening_type" meta_type="CPS String Field"/>
+ <field name="passport" meta_type="CPS String Field"/>
+ <field name="status" meta_type="CPS String Field"/>
+  <field name="hq_type" meta_type="CPS String Field"/>
+ <field name="hq_grade" meta_type="CPS String Field"/>
+ <field name="screening_venue" meta_type="CPS String Field"/>
+ <field name="aos" meta_type="CPS String Field"/>
+ <field name="screening_score" meta_type="CPS String Field"/>
+ <field name="notice" meta_type="CPS String Field"/>
+ <field name="student_id" meta_type="CPS String Field"/>
+</object>
Index: /WAeUP_SRP/fceokene/profiles/default/vocabularies/import_names.xml
===================================================================
--- /WAeUP_SRP/fceokene/profiles/default/vocabularies/import_names.xml	(revision 2515)
+++ /WAeUP_SRP/fceokene/profiles/default/vocabularies/import_names.xml	(revision 2516)
@@ -13,4 +13,4 @@
  <item key="certificate" msgid="">Certificate Data</item>
  <item key="certificate_course" msgid="">Certificate Course Data</item>
- <item key="applicant" msgid="">Application Data</item>
+ <item key="application" msgid="">Application Data</item>
 </object>
