Index: WAeUP_SRP/trunk/profiles/default/layouts/scratch_card_batch.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/scratch_card_batch.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/layouts/scratch_card_batch.xml	(revision 770)
@@ -4,5 +4,5 @@
  <property name="layout_edit_method"></property>
  <property name="layout_view_method"></property>
- <property name="style_prefix">layout_default_</property>
+ <property name="style_prefix">layout_waeup_</property>
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml	(revision 770)
@@ -49,9 +49,9 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="appl_email" meta_type="Email Widget">
+ <widget name="app_email" meta_type="Email Widget">
   <property name="is_required">False</property>
   <property name="title">Email Address</property>
   <property name="fields">
-   <element value="appl_email"/>
+   <element value="app_email"/>
   </property>
   <property name="label">Email Address</property>
@@ -63,8 +63,8 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="appl_mobile" meta_type="String Widget">
+ <widget name="app_mobile" meta_type="String Widget">
   <property name="title">Mobile Phone No</property>
   <property name="fields">
-   <element value="appl_mobile"/>
+   <element value="app_mobile"/>
   </property>
   <property name="label">Mobile Phone No</property>
@@ -259,8 +259,8 @@
   </row>
   <row>
-   <cell name="appl_email" ncols="3"/>
-  </row>
-  <row>
-   <cell name="appl_mobile" ncols="3"/>
+   <cell name="app_email" ncols="3"/>
+  </row>
+  <row>
+   <cell name="app_mobile" ncols="3"/>
   </row>
   <row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml	(revision 770)
@@ -24,5 +24,5 @@
  </widget>
  <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
-  <property name="title">Application PIN</property>
+  <property name="title">Access Code</property>
   <property name="fields">
    <element value="app_ac_pin"/>
@@ -30,5 +30,5 @@
   <property name="is_required">True</property>
   <property name="label">Access Code</property>
-  <property name="label_edit">Application PIN</property>
+  <property name="label_edit">Access Code</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -54,8 +54,8 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="appl_email" meta_type="Email Widget">
+ <widget name="app_email" meta_type="Email Widget">
   <property name="title">Email Address</property>
   <property name="fields">
-   <element value="appl_email"/>
+   <element value="app_email"/>
   </property>
   <property name="label">Email Address</property>
@@ -67,8 +67,8 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="appl_mobile" meta_type="String Widget">
+ <widget name="app_mobile" meta_type="String Widget">
   <property name="title">Mobile Phone No</property>
   <property name="fields">
-   <element value="appl_mobile"/>
+   <element value="app_mobile"/>
   </property>
   <property name="label">Mobile Phone No</property>
@@ -234,8 +234,8 @@
   </row>
   <row>
-   <cell name="appl_email" ncols="3"/>
-  </row>
-  <row>
-   <cell name="appl_mobile" ncols="3"/>
+   <cell name="app_email" ncols="3"/>
+  </row>
+  <row>
+   <cell name="app_mobile" ncols="3"/>
   </row>
   <row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_clearance.xml	(revision 770)
@@ -497,19 +497,4 @@
   <property name="vocabulary">states</property>
  </widget>
- <widget name="passport" meta_type="Image Widget">
-  <property name="title">Passport</property>
-  <property name="fields">
-   <element value="passport"/>
-  </property>
-  <property name="label">Passport</property>
-  <property name="label_edit">Passport</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
  <widget name="ref_let" meta_type="Image Widget">
   <property name="title">Referee Letter</property>
@@ -759,7 +744,4 @@
   </row>
   <row>
-   <cell name="passport"/>
-  </row>
-  <row>
    <cell name="jamb_let"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_clearance_fe.xml	(revision 770)
@@ -498,19 +498,4 @@
   <property name="vocabulary">states</property>
  </widget>
- <widget name="passport" meta_type="Image Widget">
-  <property name="title">Passport</property>
-  <property name="fields">
-   <element value="passport"/>
-  </property>
-  <property name="label">Passport</property>
-  <property name="label_edit">Passport</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
-  <property name="size_max">204800</property>
-  <property name="display_width">300</property>
-  <property name="display_height">600</property>
-  <property name="allow_resize">True</property>
- </widget>
  <widget name="ref_let" meta_type="Image Widget">
   <property name="title">Referee Letter</property>
@@ -667,7 +652,4 @@
   </row>
   <row>
-   <cell name="passport"/>
-  </row>
-  <row>
    <cell name="lga"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_pume.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_pume.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_pume.xml	(revision 770)
@@ -8,5 +8,5 @@
  <property name="validate_values_expr"></property>
 
- <widget name="pume_eng_score" meta_type="String Widget">
+ <widget name="pume_eng_score" meta_type="Float Widget">
   <property name="title">PUME English Score</property>
   <property name="fields">
@@ -20,5 +20,5 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="pume_gen_score" meta_type="String Widget">
+ <widget name="pume_gen_score" meta_type="Float Widget">
   <property name="title">PUME General Score</property>
   <property name="fields">
@@ -32,5 +32,5 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="pume_math_score" meta_type="String Widget">
+ <widget name="pume_math_score" meta_type="Float Widget">
   <property name="title">PUME Mathematics Score</property>
   <property name="fields">
@@ -44,5 +44,5 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
- <widget name="pume_tot_score" meta_type="String Widget">
+ <widget name="pume_tot_score" meta_type="Float Widget">
   <property name="title">PUME Total Score</property>
   <property name="fields">
Index: WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml	(revision 770)
@@ -3,6 +3,6 @@
  <field name="app_ac_date" meta_type="CPS DateTime Field"/>
  <field name="app_ac_pin" meta_type="CPS String Field"/>
- <field name="appl_email" meta_type="CPS String Field"/>
- <field name="appl_mobile" meta_type="CPS String Field"/>
+ <field name="app_email" meta_type="CPS String Field"/>
+ <field name="app_mobile" meta_type="CPS String Field"/>
  <field name="entry_mode" meta_type="CPS String Field"/>
  <field name="jamb_age" meta_type="CPS Int Field"/>
Index: WAeUP_SRP/trunk/profiles/default/schemas/student_clearance.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/student_clearance.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/schemas/student_clearance.xml	(revision 770)
@@ -51,5 +51,4 @@
  <field name="cert" meta_type="CPS Image Field"/>
  <field name="evid" meta_type="CPS Image Field"/>
- <field name="passport" meta_type="CPS Image Field"/>
  <field name="jamb_let" meta_type="CPS Image Field"/>
  <field name="res_stat" meta_type="CPS Image Field"/>
Index: WAeUP_SRP/trunk/profiles/default/schemas/student_pume.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/student_pume.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/schemas/student_pume.xml	(revision 770)
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <object name="student_pume" meta_type="CPS Schema">
- <field name="pume_eng_score" meta_type="CPS String Field"/>
- <field name="pume_gen_score" meta_type="CPS String Field"/>
- <field name="pume_math_score" meta_type="CPS String Field"/>
- <field name="pume_tot_score" meta_type="CPS String Field"/>
+ <field name="pume_eng_score" meta_type="CPS Float Field"/>
+ <field name="pume_gen_score" meta_type="CPS Float Field"/>
+ <field name="pume_math_score" meta_type="CPS Float Field"/>
+ <field name="pume_tot_score" meta_type="CPS Float Field"/>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/types/ScratchCardBatch.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/ScratchCardBatch.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/types/ScratchCardBatch.xml	(revision 770)
@@ -8,5 +8,5 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addScratchCardBatch</property>
- <property name="immediate_view">folder_view</property>
+ <property name="immediate_view">batch_view</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml	(revision 766)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml	(revision 770)
@@ -9,4 +9,5 @@
  <state state_id="closed" title="">
   <exit-transition transition_id="open"/>
+  <exit-transition transition_id="publish"/>
  </state>
  <state state_id="content_addable" title="">
@@ -51,4 +52,15 @@
                   acquired="True">
    <permission-role>Owner</permission-role>
+  </permission-map>
+ </state>
+ <state state_id="public" title="">
+  <exit-transition transition_id="close"/>
+  <permission-map name="Add portal content" acquired="True">
+  </permission-map>
+  <permission-map name="Modify portal content"
+                  acquired="True">
+  </permission-map>
+  <permission-map name="View" acquired="True">
+   <permission-role>Anonymous</permission-role>
   </permission-map>
  </state>
@@ -97,3 +109,12 @@
   </guard>
  </transition>
+ <transition transition_id="publish" title=""
+             new_state="public" trigger="USER"
+             before_script="" after_script="">
+  
+  <guard>
+   <guard-role>Manager</guard-role>
+   <guard-role>SectionManager</guard-role>
+  </guard>
+ </transition>
 </cps-workflow>
