Index: WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml	(revision 478)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml	(revision 479)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<object name="student_application" meta_type="CPS Layout">
+<object name="student_application_fe" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
  <property name="layout_edit_method"></property>
@@ -7,5 +7,31 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
-
+ <widget name="app_ac_batch_no" meta_type="String Widget">
+  <property name="title">Batch No</property>
+  <property name="fields">
+   <element value="app_ac_batch_no"/>
+  </property>
+  <property name="label">Batch</property>
+  <property name="label_edit">Batch</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="display_width">2</property>
+  <property name="size_max">2</property>
+ </widget>
+ <widget name="app_ac_batch_no_old" meta_type="Int Widget">
+  <property name="title">Batch No</property>
+  <property name="fields">
+   <element value="app_ac_batch_no"/>
+  </property>
+  <property name="label">Batch</property>
+  <property name="label_edit">Batch</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="is_limited">True</property>
+  <property name="min_value">1</property>
+  <property name="max_value">99</property>
+ </widget>
  <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
   <property name="title">Application PIN</property>
@@ -13,18 +39,99 @@
    <element value="app_ac_pin"/>
   </property>
-  <property name="is_required"></property>
-  <property name="label">Application PIN</property>
-  <property name="label_edit">Application PIN</property>
-  <property
-     name="help"></property>
-  <property name="readonly_layout_modes">
-     <element value="edit"/>
-  </property>     
-  <property name="hidden_layout_modes">
-   <element value="create"/>
-  </property>
+  <property name="is_required">True</property>
+  <property name="label">Pin</property>
+  <property name="label_edit">Pin</property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="display_width">10</property>
   <property name="size_max">12</property>
  </widget>
-
+ <widget name="app_ac_prefix" meta_type="String Widget">
+  <property name="title">Pin Prefix</property>
+  <property name="fields">
+   <element value="app_ac_prefix"/>
+  </property>
+  <property name="label">Prefix</property>
+  <property name="label_edit">Prefix</property>
+  <property name="readonly_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="display_width">3</property>
+ </widget>
+ <widget name="entry_mode" meta_type="String Widget">
+  <property name="title">Mode of Entry</property>
+  <property name="fields">
+   <element value="entry_mode"/>
+  </property>
+  <property name="label">Mode of Entry</property>
+  <property name="label_edit">Mode of Entry</property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="jamb_first_cos" meta_type="String Widget">
+  <property name="title">JAMB First Choice Course of Study</property>
+  <property name="fields">
+   <element value="jamb_first_cos"/>
+  </property>
+  <property name="label">JAMB First Choice Course of Study</property>
+  <property name="label_edit">JAMB First Choice Course of Study</property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="jamb_firstname" meta_type="String Widget">
+  <property name="title">JAMB First Name</property>
+  <property name="fields">
+   <element value="jamb_firstname"/>
+  </property>
+  <property name="label">Name</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"/>
+ </widget>
+ <widget name="jamb_lastname" meta_type="String Widget">
+  <property name="title">JAMB Lastname</property>
+  <property name="fields">
+   <element value="jamb_lastname"/>
+  </property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="jamb_middlename" meta_type="String Widget">
+  <property name="title">JAMB Middle Name</property>
+  <property name="fields">
+   <element value="jamb_middlename"/>
+  </property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="jamb_reg_no" meta_type="StudentId Widget">
   <property name="title">JAMB Registration Number</property>
@@ -32,9 +139,8 @@
    <element value="jamb_reg_no"/>
   </property>
-  <property name="is_required">False</property>
   <property name="label">JAMB Registration Number</property>
   <property name="label_edit">JAMB Registration Number</property>
   <property name="readonly_layout_modes">
-     <element value="edit"/>
+   <element value="edit"/>
   </property>
   <property name="hidden_layout_modes"/>
@@ -43,62 +149,19 @@
   <property name="size_max">10</property>
  </widget>
-
- <widget name="jamb_firstname" meta_type="String Widget">
-  <property name="title">JAMB First Name</property>
-  <property name="fields">
-   <element value="jamb_firstname"/>
-  </property>
-  <property name="is_required">False</property>
-  <property name="label">Name</property>
-  <property name="label_edit"></property>
-  <property name="readonly_layout_modes">
-     <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_lastname" meta_type="String Widget">
-  <property name="title">JAMB Lastname</property>
-  <property name="fields">
-   <element value="jamb_lastname"/>
-  </property>
-  <property name="label"></property>
-  <property name="label_edit"></property>
-  <property name="readonly_layout_modes">
-     <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_middlename" meta_type="String Widget">
-  <property name="title">JAMB Middle Name</property>
-  <property name="fields">
-   <element value="jamb_middlename"/>
-  </property>
-  <property name="label"></property>
-  <property name="label_edit"></property>
-  <property name="readonly_layout_modes">
-     <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="entry_mode" meta_type="String Widget">
-  <property name="title">Mode of Entry</property>
-  <property name="fields">
-   <element value="entry_mode"/>
-  </property>
-  <property name="label">Mode of Entry</property>
-  <property name="label_edit">Mode of Entry</property>
-  <property name="readonly_layout_modes">
-     <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
+ <widget name="jamb_second_cos" meta_type="String Widget">
+  <property name="title">JAMB Second Choice Course of Study</property>
+  <property name="fields">
+   <element value="jamb_second_cos"/>
+  </property>
+  <property name="label">JAMB Second Choice Course of Study</property>
+  <property name="label_edit">JAMB Second Choice Course of Study</property>
+  <property name="readonly_layout_modes">
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="jamb_sex" meta_type="String Widget">
   <property name="title">JAMB Sex</property>
@@ -109,40 +172,11 @@
   <property name="label_edit">JAMB Sex</property>
   <property name="readonly_layout_modes">
-     <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
- <widget name="jamb_first_cos" meta_type="String Widget">
-  <property name="title">JAMB First Choice Course of Study</property>
-  <property name="fields">
-   <element value="jamb_first_cos"/>
-  </property>
-  <property name="label">JAMB First Choice Course of Study</property>
-  <property name="label_edit">JAMB First Choice Course of Study</property>
-  <property name="readonly_layout_modes">
-     <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
- <widget name="jamb_second_cos" meta_type="String Widget">
-  <property name="title">JAMB Second Choice Course of Study</property>
-  <property name="fields">
-   <element value="jamb_second_cos"/>
-  </property>
-  <property name="label">JAMB Second Choice Course of Study</property>
-  <property name="label_edit">JAMB Second Choice Course of Study</property>
-  <property name="readonly_layout_modes">
-     <element value="edit"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
-
-
+   <element value="edit"/>
+  </property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="passport" meta_type="Image Widget">
   <property name="title">Passport Picture</property>
@@ -150,47 +184,50 @@
    <element value="passport"/>
   </property>
+  <property name="is_required">True</property>
   <property name="label">Passport Picture</property>
   <property name="label_edit">Passport Picture</property>
+  <property
+     name="help">Upload passport photograph with red background</property>
   <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="help">Upload passport photograph with red background</property>
+  <property name="hidden_layout_modes">
+   <element value="create"/>
+  </property>
+  <property name="hidden_readonly_layout_modes"/>
   <property name="size_max">204800</property>
+  <property name="display_external_editor">False</property>
   <property name="display_width">300</property>
   <property name="display_height">600</property>
   <property name="allow_resize">True</property>
  </widget>
-
  <table>
   <row>
-   <cell name="app_ac_pin"/>
-  </row>
-  <row>
-   <cell name="jamb_reg_no"/>
-  </row>
-  <row>
-   <cell name="jamb_firstname"/>
-  </row>
-  <row>
-   <cell name="jamb_middlename"/>
-  </row>
-  <row>
-   <cell name="jamb_lastname"/>
-  </row>
-  <row>
-   <cell name="jamb_sex"/>
-  </row>
-  <row>
-   <cell name="jamb_first_cos"/>
-  </row>
-  <row>
-   <cell name="jamb_second_cos"/>
-  </row>
-  <row>
-   <cell name="passport"/>
+   <cell name="jamb_reg_no" ncols="3"/>
+  </row>
+  <row>
+   <cell name="app_ac_prefix" ncols="1"/>
+   <cell name="app_ac_batch_no" ncols="1"/>
+   <cell name="app_ac_pin" ncols="1"/>
+  </row>
+  <row>
+   <cell name="jamb_firstname" ncols="3"/>
+  </row>
+  <row>
+   <cell name="jamb_middlename" ncols="3"/>
+  </row>
+  <row>
+   <cell name="jamb_lastname" ncols="3"/>
+  </row>
+  <row>
+   <cell name="jamb_sex" ncols="3"/>
+  </row>
+  <row>
+   <cell name="jamb_first_cos" ncols="3"/>
+  </row>
+  <row>
+   <cell name="jamb_second_cos" ncols="3"/>
+  </row>
+  <row>
+   <cell name="passport" ncols="3"/>
   </row>
  </table>
-
-
 </object>
-
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_check_pin.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_check_pin.xml	(revision 478)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0"?>
-<object name="student_check_pin" meta_type="CPS Layout">
- <property name="layout_create_method"></property>
- <property name="layout_edit_method"></property>
- <property name="layout_view_method"></property>
- <property name="style_prefix">layout_waeup_</property>
- <property name="flexible_widgets"/>
- <property name="validate_values_expr"></property>
- <widget name="batch_no" meta_type="String Widget">
-  <property name="title">Batch Nr</property>
-  <property name="fields">
-   <element value="batch_no"/>
-  </property>
-  <property name="readonly_layout_modes">
-   <element value="create"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="display_width">2</property>
-  <property name="size_max">2</property>
- </widget>
- <widget name="jamb_reg_no" meta_type="JambRegNo Widget">
-  <property name="title">Student Jamb RegNo</property>
-  <property name="fields">
-   <element value="reg_no"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label_edit">Enter Jamb Registration Number</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Scratchcard Pin</property>
-  <property name="fields">
-   <element value="pin"/>
-  </property>
-  <property name="is_required">True</property>
-  <property name="label_edit">Enter Scratch Card Pin</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="prefix" meta_type="String Widget">
-  <property name="title">Prefix</property>
-  <property name="fields">
-   <element value="prefix"/>
-  </property>
-  <property name="label">Prefix</property>
-  <property name="readonly_layout_modes">
-   <element value="create"/>
-  </property>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="display_width">3</property>
-  <property name="size_max">3</property>
- </widget>
- <table>
-  <row>
-   <cell name="jamb_reg_no" ncols="3"/>
-  </row>
-  <row>
-   <cell name="prefix"/>
-   <cell name="batch_no"/>
-   <cell name="pin"/>
-  </row>
- </table>
-</object>
