Index: WAeUP_SRP/uniben/profiles/default/layouts/application_manage.xml
===================================================================
--- WAeUP_SRP/uniben/profiles/default/layouts/application_manage.xml	(revision 3395)
+++ WAeUP_SRP/uniben/profiles/default/layouts/application_manage.xml	(revision 3426)
@@ -258,5 +258,5 @@
     <property name="label">'English' Score</property>
     <property name="label_edit">'English' Score</property>
-    <property name="description"></property>
+    <property name="description">JAMB Scores</property>
     <property name="help"></property>
     <property name="is_i18n">False</property>
@@ -522,5 +522,5 @@
     <property name="label">Application Date</property>
     <property name="label_edit">Application Date</property>
-    <property name="description"></property>
+    <property name="description">Application Data</property>
     <property name="help"></property>
     <property name="is_i18n">False</property>
@@ -730,21 +730,215 @@
     <property name="vocabulary">high_qual</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>
-    <property name="hidden_layout_modes">
-    <element value="create"/>
-    </property>
-    <property name="hidden_readonly_layout_modes"/>
-    <property name="vocabulary">high_grade</property>
-  </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">Former Matric Number</property>
+      <property name="fields">
+       <element value="hq_matric_no"/>
+      </property>
+      <property name="label">Former Matric Number</property>
+      <property name="label_edit">Former Matric Number</property>
+      <property name="description">Higher Educational Data</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>
+  
 
   <widget name="aos" meta_type="Select Widget">
@@ -835,12 +1029,72 @@
   </row>
   <row>
-   <cell name="hq_type" ncols="2"/>
-  </row>
-  <row>
-   <cell name="hq_grade" ncols="2"/>
-  </row>
+   <cell name="passport" ncols="2"/>
+  </row>  
   <row>
    <cell name="aos" ncols="2"/>
-  </row>
+  </row>  
+  <row>
+   <cell name="course1" ncols="2"/>
+  </row>
+  <row>
+   <cell name="course2" ncols="2"/>
+  </row>
+  <row>
+   <cell name="course3" ncols="2"/>
+  </row>
+      
+  
+    <row>
+      <cell name="hq_matric_no"/>
+    </row>
+    <row>
+      <cell name="hq_type"/>
+    </row>
+    <row>
+      <cell name="hq_grade"/>
+    </row>
+    <row>
+      <cell name="hq_school"/>
+    </row>
+    <row>
+      <cell name="hq_session"/>
+    </row>
+    <row>
+      <cell name="hq_disc"/>
+    </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="eng_score" ncols="2"/>
@@ -861,13 +1115,5 @@
    <cell name="aggregate" ncols="2"/>
   </row>
-  <row>
-   <cell name="course1" ncols="2"/>
-  </row>
-  <row>
-   <cell name="course2" ncols="2"/>
-  </row>
-  <row>
-   <cell name="course3" ncols="2"/>
-  </row>
+
   <row>
    <cell name="application_date" ncols="2"/>
@@ -882,7 +1128,5 @@
    <cell name="screening_type" ncols="2"/>
   </row>
-  <row>
-   <cell name="passport" ncols="2"/>
-  </row>
+
   <row>
    <cell name="screening_score" ncols="2"/>
