Index: WAeUP_SRP/base/WAeUPTables.py
===================================================================
--- WAeUP_SRP/base/WAeUPTables.py	(revision 2737)
+++ WAeUP_SRP/base/WAeUPTables.py	(revision 2738)
@@ -125,4 +125,12 @@
     def deleteRecord(self, uid):
         self.uncatalog_object(uid)
+
+    def getRecordByKey(self,key):
+        if not key:
+            return None
+        res = self.evalAdvancedQuery(Eq(self.key,key))
+        if res:
+            return res[0]
+        return None
 
     def searchAndSetRecord(self, **data):
@@ -602,5 +610,4 @@
     #               "course_admitted",
     #               )
-    ###)
 
     def __init__(self,name=None):
@@ -1396,8 +1403,9 @@
 
 class PaymentsCatalog(WAeUPTable): ###(
+    security = ClassSecurityInfo()
 
     meta_type = 'WAeUP Payments Catalog'
     name = "students_catalog"
-    key = "id"
+    key = "key"
     def __init__(self,name=None):
         if name ==  None:
@@ -1405,4 +1413,34 @@
         WAeUPTable.__init__(self, name)
 
+    security.declarePrivate('notify_event_listener') ###(
+    def notify_event_listener(self,event_type,object,infos):
+        "listen for events"
+        if not infos.has_key('rpath'):
+            return
+        pt = getattr(object,'portal_type',None)
+        mt = getattr(object,'meta_type',None)
+        data = {}
+        if pt == 'Payment' and mt == 'CPS Proxy Folder':
+            order_id = object.id
+            if event_type == "sys_add_object":
+                try:
+                    self.addRecord(order_id = order_id)
+                except ValueError:
+                    pass
+                return
+            elif event_type == 'sys_del_object':
+                self.deleteRecord(order_id)
+        if pt != 'Payment' or mt == 'CPS Proxy Folder':
+            return
+        if event_type not in ('sys_modify_object'):
+            return
+        for field in self.schema():
+            data[field] = getattr(object,field)
+        rpl = infos['rpath'].split('/')
+        student_id = rpl[-3]
+        data['student_id'] = student_id
+        self.modifyRecord(**data)
+    ###)
+
 
 InitializeClass(PaymentsCatalog)
Index: WAeUP_SRP/base/Widgets.py
===================================================================
--- WAeUP_SRP/base/Widgets.py	(revision 2737)
+++ WAeUP_SRP/base/Widgets.py	(revision 2738)
@@ -769,5 +769,6 @@
 ##            return 0
         widget_id = self.getWidgetId()
-        value = makeCertificateCode(datastructure[widget_id]).upper()
+        #value = makeCertificateCode(datastructure[widget_id]).upper()
+        value = datastructure[widget_id].upper()
         id_pat_str = r"\S"
         inv_id_pat = re.compile(r"^%s$" % id_pat_str)
@@ -1148,4 +1149,6 @@
         widget_id = self.getWidgetId()
         v = datastructure[widget_id]
+        if not v:
+            v = []
         err = 0
         s = datastructure[widget_id+'_s'].strip()
Index: WAeUP_SRP/base/skins/waeup_layout/layout_apply_admission_create.pt
===================================================================
--- WAeUP_SRP/base/skins/waeup_layout/layout_apply_admission_create.pt	(revision 2737)
+++ WAeUP_SRP/base/skins/waeup_layout/layout_apply_admission_create.pt	(revision 2738)
@@ -3,54 +3,54 @@
 <!-- a layout_lib macro -->
 <!-- $Id: layout_apply_admission_create.pt 2141 2007-08-21 16:50:33Z henrik $ -->
-
 <metal:block define-macro="default_table"
-  tal:define="layout options/layout;
-  ds options/datastructure;
-  dm ds/getDataModel;
-  creation creation|nothing;
-  metadata metadata|nothing;
-  cpsmcat nocall:here/translation_service;
-  apply request/apply_button|nothing;">
-  
-  <table  cellpadding="2" cellspacing="2" summary="Form layout" border=0
-       tal:condition="layout/rows">
-  <tr tal:repeat="row layout/rows" valign="top">
-
-  <span tal:repeat="cell row"> 
-        <tal:block define="widget cell/widget;
-                           wid widget/getWidgetId;
-                           err python:ds.getError(wid);
-                           err_mapping python:ds.getErrorMapping(wid);
-                           widget_css_class cell/widget_css_class|nothing;
-                           css_class python:test(err, 'row error','row')">
+             tal:define="layout options/layout;
+             ds options/datastructure;
+             dm ds/getDataModel;
+             creation creation|nothing;
+             metadata metadata|nothing;
+             cpsmcat nocall:here/translation_service;
+             apply request/apply_button|nothing;"
+             >
+    <table  cellpadding="2" cellspacing="2" summary="Form layout" border=0
+            tal:condition="layout/rows">
+      <span tal:repeat="row layout/rows" valign="top" tal:omit-tag="">
+        <span tal:repeat="cell row" tal:omit-tag=""> 
+          <tal:block define="widget cell/widget;
+          wid widget/getWidgetId;
+          err python:ds.getError(wid);
+          err_mapping python:ds.getErrorMapping(wid);
+          widget_css_class cell/widget_css_class|nothing;
+          css_class python:test(err, 'row error','row')">
           <span tal:attributes="class widget_css_class;
-                               id python:widget.getHtmlWidgetId()+'_widget';
-                              ">
-                              
-                    
-            <td valign="middle" tal:condition="python:widget.label_edit and widget.label_edit!='label field'">               
-              <div class="label">
-                <label tal:content="widget/label_edit"
-                  tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
-              </div>
-            </td>
-            
-            <td tal:condition="cell/widget_rendered">
-              <div tal:attributes="class python:test(widget.label_edit == 'label field', 'label','')">          
-              <label tal:replace="structure cell/widget_rendered"/>
-              </div>          
-              <tal:block condition="err">
+          id python:widget.getHtmlWidgetId()+'_widget';"
+          >
+            <tr tal:condition="widget/description|nothing" class="even ajaxtd">
+              <th colspan="5" align="left"><h3 tal:replace="widget/description" /></th>
+            </tr>
+            <tr>
+              <td valign="middle" tal:condition="python:widget.label_edit and widget.label_edit!='label field'">               
+                <div class="label">
+                  <label tal:content="widget/label_edit"
+                         tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
+                </div>
+              </td>
+              <td tal:condition="cell/widget_rendered">
+                <div tal:attributes="class python:test(widget.label_edit == 'label field', 'label','')">          
+                  <label tal:replace="structure cell/widget_rendered"/>
+                </div>          
+                <tal:block condition="err">
                   <tal:block define="msg python:cpsmcat(err, mapping=err_mapping)">
                     <br /><em style="color: red"
-                      tal:content="msg">err</em>
+                              tal:content="msg">err</em>
                   </tal:block>
-              </tal:block>
-            </td>
-  
+                </tal:block>
+              </td>
+            </tr>
           </span>
         </tal:block>
-  </span>      
-  </tr>
+      </span>      
+    </span>      
   </table>
   <br/>
 </metal:block>
+  
Index: WAeUP_SRP/uniben/profiles/default/applicants_catalog.xml
===================================================================
--- WAeUP_SRP/uniben/profiles/default/applicants_catalog.xml	(revision 2737)
+++ WAeUP_SRP/uniben/profiles/default/applicants_catalog.xml	(revision 2738)
@@ -37,6 +37,20 @@
  <column value="screening_score"/>
  <column value="notice"/>
+ <column value="fst_sit_fname"/>
+ <column value="fst_sit_no"/>
+ <column value="fst_sit_date"/>
+ <column value="fst_sit_type"/>
+ <column value="fst_sit_results"/>
+ <column value="scd_sit_fname"/>
+ <column value="scd_sit_no"/>
+ <column value="scd_sit_date"/>
+ <column value="scd_sit_type"/>
+ <column value="scd_sit_results"/>
  <column value="hq_type"/>
  <column value="hq_grade"/>
+ <column value="hq_school"/>
+ <column value="hq_matric_no"/>
+ <column value="hq_session"/>
+ <column value="hq_disc"/>
  <column value="passport"/>
  <column value="status"/>
Index: WAeUP_SRP/uniben/profiles/default/layouts.xml
===================================================================
--- WAeUP_SRP/uniben/profiles/default/layouts.xml	(revision 2737)
+++ WAeUP_SRP/uniben/profiles/default/layouts.xml	(revision 2738)
@@ -10,4 +10,5 @@
   <object name="application_prence" meta_type="CPS Layout"/>
   <object name="application_pce" meta_type="CPS Layout"/>
+  <object name="application_pt" meta_type="CPS Layout"/>
   <object name="application_manage" meta_type="CPS Layout"/>
   <object name="certificate" meta_type="CPS Layout"/>
Index: WAeUP_SRP/uniben/profiles/default/layouts/application_pt.xml
===================================================================
--- WAeUP_SRP/uniben/profiles/default/layouts/application_pt.xml	(revision 2738)
+++ WAeUP_SRP/uniben/profiles/default/layouts/application_pt.xml	(revision 2738)
@@ -0,0 +1,842 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
+<object name="application_pde" 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">Screening Score</property>
+    <property name="fields">
+      <element value="screening_score"/>
+    </property>
+    <property name="label">Screening Score</property>
+    <property name="label_edit">Screening 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="hidden_empty">True</property>
+    <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="hidden_empty">True</property>
+    <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 (dd/mm/yyyy)</property>
+    <property name="description"></property>
+    <property name="is_required">False</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="view_format">%d/%m/%Y</property>
+    <property name="time_setting">False</property>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="css_class_expr">string:row</property>
+    <property name="is_i18n">False</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">First Name</property>
+    <property name="fields">
+      <element value="firstname"/>
+    </property>
+    <property name="label">First Name</property>
+    <property name="label_edit">First Name</property>
+    <property name="description"></property>
+    <property name="is_required">True</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="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="lastname" meta_type="String Widget">
+    <property name="title">Surname</property>
+    <property name="fields">
+      <element value="lastname"/>
+    </property>
+    <property name="label">Surname</property>
+    <property name="label_edit">Surname</property>
+    <property name="description"></property>
+    <property name="is_required">True</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="css_class_expr">string:row</property>
+  </widget>
+ <widget name="lga" meta_type="Select Widget">
+  <property name="title">Local Government Area</property>
+  <property name="fields">
+   <element value="lga"/>
+  </property>
+  <property name="label">Local Government Area</property>
+  <property name="label_edit">Local Government Area</property>
+  <property name="readonly_layout_modes">
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">local_gov_areas</property>
+  <property name="sorted">True</property>
+ </widget>
+  <widget name="middlenames" meta_type="String Widget">
+    <property name="title">Middle Names</property>
+    <property name="fields">
+      <element value="middlenames"/>
+    </property>
+    <property name="label">Middle Names</property>
+    <property name="label_edit">Middle Names</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="passport" meta_type="Application Image Widget">
+    <property name="title">Passport Photograph</property>
+    <property name="fields">
+      <element value="passport"/>
+    </property>
+    <property name="is_required">True</property>
+    <property name="label">Passport Photograph</property>
+    <property name="label_edit">Passport Photograph</property>
+    <property name="readonly_layout_modes"/>
+    <property name="hidden_layout_modes">
+      <element value="create"/>
+    </property>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="size_max">20480</property>
+    <property name="display_external_editor">False</property>
+    <property name="display_width">100</property>
+    <property name="display_height">150</property>
+    <property name="allow_resize">True</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"></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_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="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="readonly_layout_modes">
+    </property>
+    <property name="hidden_layout_modes">
+      <element value="create"/>
+    </property>
+   <property name="hidden_readonly_layout_modes"/>
+   <property name="label_false">male</property>
+   <property name="label_true">female</property>
+   <property name="render_format">select</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">
+    </property>
+    <property name="hidden_layout_modes">
+      <element value="create"/>
+    </property>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="vocabulary">cos</property>
+    <property name="sorted">True</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">
+    </property>
+    <property name="hidden_layout_modes">
+      <element value="create"/>
+    </property>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="vocabulary">cos</property>
+    <property name="sorted">True</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="Select Widget">
+    <property name="title">Admitted Course of Study</property>
+    <property name="fields">
+      <element value="course_admitted"/>
+    </property>
+    <property name="label">Admitted Course of Study</property>
+    <property name="label_edit">Admitted 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_empty">True</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="aos" meta_type="Select Widget">
+    <property name="title">Area of Specialisation</property>
+    <property name="fields">
+      <element value="aos"/>
+    </property>
+    <property name="label">Area of Specialisation</property>
+    <property name="label_edit">Area of Specialisation</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="vocabulary">aos</property>
+    <property name="sorted">True</property>
+    <property name="css_class_expr">string:row</property>
+  </widget>
+ <widget name="hq_grade" meta_type="Select Widget">
+  <property name="title">Higher Qualification Grade</property>
+  <property name="fields">
+   <element value="hq_grade"/>
+  </property>
+  <property name="label">Higher Qualification Grade</property>
+  <property name="label_edit">Higher Qualification Grade</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">high_grade</property>
+ </widget>
+ <widget name="hq_disc" meta_type="String Widget">
+  <property name="title">Discipline</property>
+  <property name="fields">
+   <element value="hq_disc"/>
+  </property>
+  <property name="label">Discipline</property>
+  <property name="label_edit">Discipline</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="hq_matric_no" meta_type="String Widget">
+  <property name="title">Matric Number</property>
+  <property name="fields">
+   <element value="hq_matric_no"/>
+  </property>
+  <property name="label">Matric Number</property>
+  <property name="label_edit">Matric Number</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="hq_school" meta_type="String Widget">
+  <property name="title">School Attended</property>
+  <property name="fields">
+   <element value="hq_school"/>
+  </property>
+  <property name="label">School Attended</property>
+  <property name="label_edit">School Attended</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="hq_session" meta_type="String Widget">
+  <property name="title">Session Obtained</property>
+  <property name="fields">
+   <element value="hq_session"/>
+  </property>
+  <property name="label">Session Obtained</property>
+  <property name="label_edit">Session Obtained</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="fst_sit_fname" meta_type="String Widget">
+  <property name="title">Full Name</property>
+  <property name="fields">
+   <element value="fst_sit_fname"/>
+  </property>
+  <property name="label">Full Name</property>
+  <property name="label_edit">Full Name</property>
+  <property name="description">First Sitting Data</property>
+  <property
+     name="help">Full name as it appears on certificate/result</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="fst_sit_no" meta_type="String Widget">
+  <property name="title">Exam Number</property>
+  <property name="fields">
+   <element value="fst_sit_no"/>
+  </property>
+  <property name="label">Exam Number</property>
+  <property name="label_edit">Exam Number</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="fst_sit_date" meta_type="DateTime Widget">
+  <property name="title">Exam Date</property>
+  <property name="fields">
+   <element value="fst_sit_date"/>
+  </property>
+  <property name="label">Exam Date</property>
+  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="view_format">%d/%m/%Y</property>
+  <property name="time_setting">False</property>
+ </widget>
+ <widget name="fst_sit_results" meta_type="WAeUp Results Widget">
+  <property name="title">Results</property>
+  <property name="fields">
+   <element value="fst_sit_results"/>
+  </property>
+  <property name="label">Results</property>
+  <property name="label_edit">Results</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="fst_sit_type" meta_type="Select Widget">
+  <property name="title">Exam Type</property>
+  <property name="fields">
+   <element value="fst_sit_type"/>
+  </property>
+  <property name="label">Exam Type</property>
+  <property name="label_edit">Exam Type</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">exam_types</property>
+ </widget>
+ <widget name="scd_sit_fname" meta_type="String Widget">
+  <property name="title">Full Name</property>
+  <property name="fields">
+   <element value="scd_sit_fname"/>
+  </property>
+  <property name="label">Full Name</property>
+  <property name="label_edit">Full Name</property>
+  <property name="description">Second Sitting Data</property>
+  <property
+     name="help">Full name as it appears on certificate/result</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="scd_sit_no" meta_type="String Widget">
+  <property name="title">Exam Number</property>
+  <property name="fields">
+   <element value="scd_sit_no"/>
+  </property>
+  <property name="label">Exam Number</property>
+  <property name="label_edit">Exam Number</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="scd_sit_type" meta_type="Select Widget">
+  <property name="title">Exam Type</property>
+  <property name="fields">
+   <element value="scd_sit_type"/>
+  </property>
+  <property name="label">Exam Type</property>
+  <property name="label_edit">Exam Type</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="vocabulary">exam_types</property>
+ </widget>
+ <widget name="scd_sit_date" meta_type="DateTime Widget">
+  <property name="title">Exam Date</property>
+  <property name="fields">
+   <element value="scd_sit_date"/>
+  </property>
+  <property name="label">Exam Date</property>
+  <property name="label_edit">Exam Date (dd/mm/yyyy)</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="view_format">%d/%m/%Y</property>
+  <property name="time_setting">False</property>
+ </widget>
+ <widget name="scd_sit_results" meta_type="WAeUp Results Widget">
+  <property name="title">Results</property>
+  <property name="fields">
+   <element value="scd_sit_results"/>
+  </property>
+  <property name="label">Results</property>
+  <property name="label_edit">Results</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+
+ <table>
+    <row>
+      <cell name="pin" ncols="2"/>
+    </row>
+    <row>
+      <cell name="lastname" ncols="2"/>
+    </row>
+    <row>
+      <cell name="date_of_birth" ncols="2"/>
+    </row>
+    <row>
+      <cell name="lga" ncols="2"/>
+    </row>
+    <row>
+      <cell name="fst_sit_fname"/>
+    </row>
+    <row>
+      <cell name="fst_sit_no"/>
+    </row>
+    <row>
+      <cell name="fst_sit_date"/>
+    </row>
+    <row>
+      <cell name="fst_sit_type"/>
+    </row>
+    <row>
+      <cell name="fst_sit_results"/>
+    </row>
+    <row>
+      <cell name="scd_sit_fname"/>
+    </row>
+    <row>
+      <cell name="scd_sit_no"/>
+    </row>
+    <row>
+      <cell name="scd_sit_date"/>
+    </row>
+    <row>
+      <cell name="scd_sit_type"/>
+    </row>
+    <row>
+      <cell name="scd_sit_results"/>
+    </row>
+    <row>
+      <cell name="hq_type"/>
+    </row>
+    <row>
+      <cell name="hq_grade"/>
+    </row>
+    <row>
+      <cell name="hq_school"/>
+    </row>
+    <row>
+      <cell name="hq_matric_no"/>
+    </row>
+    <row>
+      <cell name="hq_session"/>
+    </row>
+    <row>
+      <cell name="hq_disc"/>
+    </row>
+    <row>
+      <cell name="aos" ncols="2"/>
+    </row>
+    <row>
+      <cell name="email" ncols="2"/>
+    </row>
+    <row>
+      <cell name="phone" ncols="2"/>
+    </row>
+    <row>
+      <cell name="course1" ncols="2"/>
+    </row>
+    <row>
+      <cell name="course2" ncols="2"/>
+    </row>
+    <row>
+      <cell name="application_date" ncols="2"/>
+    </row>
+    <row>
+      <cell name="status" ncols="2"/>
+    </row>
+    <row>
+      <cell name="screening_date" ncols="2"/>
+    </row>
+    <row>
+      <cell name="passport" ncols="2"/>
+    </row>
+    <row>
+      <cell name="screening_score" ncols="2"/>
+    </row>
+    <row>
+      <cell name="course_admitted" ncols="2"/>
+    </row>
+    <row>
+      <cell name="notice" ncols="2"/>
+    </row>
+  </table>
+</object>
Index: WAeUP_SRP/uniben/profiles/default/layouts/student_application.xml
===================================================================
--- WAeUP_SRP/uniben/profiles/default/layouts/student_application.xml	(revision 2737)
+++ WAeUP_SRP/uniben/profiles/default/layouts/student_application.xml	(revision 2738)
@@ -39,5 +39,6 @@
   <property name="prefix">APP</property>
   <property name="reference">jamb_reg_no</property>
- </widget>
+ <property name="reuse_pin">False</property>
+  </widget>
  <widget name="app_email" meta_type="Email Widget">
   <property name="title">Email Address</property>
Index: WAeUP_SRP/uniben/profiles/default/payments_catalog.xml
===================================================================
--- WAeUP_SRP/uniben/profiles/default/payments_catalog.xml	(revision 2737)
+++ WAeUP_SRP/uniben/profiles/default/payments_catalog.xml	(revision 2738)
@@ -2,44 +2,54 @@
 <?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
 <object name="payments_catalog" meta_type="WAeUP Table">
+ <column value="amount"/>
+ <column value="date"/>
  <column value="order_id"/>
+ <column value="resp_approved_amount"/>
+ <column value="resp_card_num"/>
+ <column value="resp_code"/>
+ <column value="resp_date"/>
+ <column value="resp_desc"/>
+ <column value="resp_pay_reference"/>
+ <column value="session_id"/>
+ <column value="status"/>
  <column value="student_id"/>
- <column value="date"/>
- <column value="type_description"/>
- <column value="amount"/>
- <column value="resp_pay_reference"/>
- <column value="resp_desc"/>
- <column value="resp_code"/>
- <column value="resp_card_num"/>
- <column value="resp_approved_amount"/>
- <column value="faculty"/>
- <column value="department"/>
- <column value="certificate"/>
- <column value="review_state"/>
- 
- 
- <index name="order_id" meta_type="FieldIndex">
-  <indexed_attr value="order_id"/>
- </index>
- <index name="student_id" meta_type="FieldIndex">
-  <indexed_attr value="student_id"/>
+ <column value="subject"/>
+ <column value="type"/>
+ <column value="target"/>
+ <index name="key" meta_type="FieldIndex">
+  <indexed_attr value="key"/>
  </index>
  <index name="date" meta_type="DateIndex">
   <indexed_attr value="date"/>
  </index>
- <index name="faculty" meta_type="FieldIndex">
-  <indexed_attr value="faculty"/>
- </index> 
- <index name="department" meta_type="FieldIndex">
-  <indexed_attr value="department"/>
- </index> 
- <index name="resp_code" meta_type="FieldIndex">
-  <indexed_attr value="resp_code"/>
- </index> 
+ <index name="order_id" meta_type="FieldIndex">
+  <indexed_attr value="order_id"/>
+ </index>
+ <index name="order_id" meta_type="FieldIndex">
+  <indexed_attr value="order_id"/>
+ </index>
+ <index name="resp_date" meta_type="DateIndex">
+  <indexed_attr value="date"/>
+ </index>
  <index name="resp_desc" meta_type="KeywordIndex">
   <indexed_attr value="resp_desc"/>
  </index>  
-  <index name="review_state" meta_type="FieldIndex">
-  <indexed_attr value="review_state"/>
+ <index name="session_id" meta_type="FieldIndex">
+  <indexed_attr value="session_id"/>
+ </index>
+  <index name="status" meta_type="FieldIndex">
+    <indexed_attr value="status"/>
  </index> 
- 
+ <index name="student_id" meta_type="FieldIndex">
+  <indexed_attr value="student_id"/>
+ </index>
+ <index name="subject" meta_type="KeywordIndex">
+  <indexed_attr value="subject"/>
+ </index>
+ <index name="target" meta_type="KeywordIndex">
+  <indexed_attr value="target"/>
+ </index>
+ <index name="type" meta_type="KeywordIndex">
+  <indexed_attr value="type"/>
+ </index>
 </object>
Index: WAeUP_SRP/uniben/profiles/default/schemas/import_application.xml
===================================================================
--- WAeUP_SRP/uniben/profiles/default/schemas/import_application.xml	(revision 2737)
+++ WAeUP_SRP/uniben/profiles/default/schemas/import_application.xml	(revision 2738)
@@ -35,6 +35,4 @@
  <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"/>
@@ -42,3 +40,19 @@
  <field name="notice" meta_type="CPS String Field"/>
  <field name="student_id" meta_type="CPS String Field"/>
+ <field name="fst_sit_fname" meta_type="CPS String Field"/>
+ <field name="fst_sit_no" meta_type="CPS String Field"/>
+ <field name="fst_sit_date" meta_type="CPS DateTime Field"/>
+ <field name="fst_sit_type" meta_type="CPS String Field"/>
+ <field name="fst_sit_results" meta_type="CPS String List Field"/>
+ <field name="scd_sit_fname" meta_type="CPS String Field"/>
+ <field name="scd_sit_no" meta_type="CPS String Field"/>
+ <field name="scd_sit_date" meta_type="CPS DateTime Field"/>
+ <field name="scd_sit_type" meta_type="CPS String Field"/>
+ <field name="scd_sit_results" meta_type="CPS String List Field"/>
+ <field name="hq_type" meta_type="CPS String Field"/>
+ <field name="hq_grade" meta_type="CPS String Field"/>
+ <field name="hq_school" meta_type="CPS String Field"/>
+ <field name="hq_matric_no" meta_type="CPS String Field"/>
+ <field name="hq_session" meta_type="CPS String Field"/>
+ <field name="hq_disc" meta_type="CPS String Field"/>
 </object>
