Index: WAeUP_SRP/trunk/profiles/default/layouts/student_course_results.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_course_results.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_course_results.xml	(revision 723)
@@ -14,4 +14,15 @@
   <property name="label">Ansbook</property>
   <property name="label_edit">Ansbook</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="semester" meta_type="Int Widget">
+  <property name="title">Semester</property>
+  <property name="fields">
+   <element value="semester"/>
+  </property>
+  <property name="label">Semester</property>
+  <property name="label_edit">Semester</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -108,4 +119,7 @@
  <table>
   <row>
+   <cell name="semester"/>
+  </row>
+  <row>
    <cell name="grade"/>
   </row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_study_course.xml	(revision 723)
@@ -19,8 +19,38 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
+ <widget name="department" meta_type="String Widget">
+  <property name="title">Department Code</property>
+  <property name="fields">
+   <element value="department"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Department Code</property>
+  <property name="label_edit">Department Code</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
+ <widget name="faculty" meta_type="String Widget">
+  <property name="title">Faculty Code</property>
+  <property name="fields">
+   <element value="faculty"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Faculty Code</property>
+  <property name="label_edit">Faculty Code</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <table>
   <row>
    <cell name="study_course"/>
   </row>
+  <row>
+   <cell name="faculty"/>
+  </row>
+  <row>
+   <cell name="department"/>
+  </row>
  </table>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/schemas/student_course_results.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/student_course_results.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/schemas/student_course_results.xml	(revision 723)
@@ -8,5 +8,7 @@
  <field name="score" meta_type="CPS Int Field"/>
  <field name="status" meta_type="CPS String Field"/>
- <field name="verdict" meta_type="CPS String Field"/>
+<field name="semester" meta_type="CPS Int Field">
+ <property name="default_expr">python:1</property>
+</field> <field name="verdict" meta_type="CPS String Field"/>
  <field name="weight" meta_type="CPS String Field"/>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/schemas/student_study_course.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/student_study_course.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/schemas/student_study_course.xml	(revision 723)
@@ -1,4 +1,12 @@
 <?xml version="1.0"?>
 <object name="student_study_course" meta_type="CPS Schema">
- <field name="study_course" meta_type="CPS String Field"/>
+<field name="study_course" meta_type="CPS String Field">
+<property name="is_searchabletext">True</property>
+</field>
+ <field name="faculty" meta_type="CPS String Field">
+    <property name="is_searchabletext">True</property>
+</field>
+ <field name="department" meta_type="CPS String Field">
+    <property name="is_searchabletext">True</property>
+</field>
 </object>
Index: WAeUP_SRP/trunk/profiles/default/types/StudentCourseResult.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/StudentCourseResult.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/types/StudentCourseResult.xml	(revision 723)
@@ -17,8 +17,8 @@
  <property name="cps_display_as_document_in_listing">True</property>
  <property name="schemas">
-  <element value="course_results"/>
+  <element value="student_course_results"/>
  </property>
  <property name="layouts">
-  <element value="course_results"/>
+  <element value="student_course_results"/>
  </property>
  <property name="layout_clusters"/>
Index: WAeUP_SRP/trunk/profiles/default/types/StudentStudyCourse.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/StudentStudyCourse.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/types/StudentStudyCourse.xml	(revision 723)
@@ -30,8 +30,8 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="(Default)" to="student_index"/>
+ <alias from="view" to="student_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/student_index" visible="True">
   <permission value="View"/>
  </action>
Index: WAeUP_SRP/trunk/profiles/default/types/StudentStudyLevel.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/types/StudentStudyLevel.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/types/StudentStudyLevel.xml	(revision 723)
@@ -8,5 +8,5 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addStudentStudyLevel</property>
- <property name="immediate_view">academics_contents</property>
+ <property name="immediate_view">student_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -28,10 +28,10 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="academics_contents"/>
+ <alias from="(Default)" to="student_index"/>
  <alias from="create_do" to="waeup_document_create_do"/>
  <alias from="created" to="level_created"/>
- <alias from="view" to="academics_contents"/>
+ <alias from="view" to="student_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/academics_contents" visible="True">
+    url_expr="string:${object_url}/student_index" visible="True">
   <permission value="View"/>
  </action>
Index: WAeUP_SRP/trunk/profiles/default/workflows.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/workflows.xml	(revision 723)
@@ -58,7 +58,4 @@
    <bound-workflow workflow_id="section_folder_wf"/>
   </type>
-  <type type_id="Semester">
-   <bound-workflow workflow_id="section_folder_wf"/>
-  </type>
   <type type_id="Student">
    <bound-workflow workflow_id="waeup_student_wf"/>
@@ -77,8 +74,8 @@
   </type>
   <type type_id="StudentStudyCourse">
-   <bound-workflow workflow_id="section_folder_wf"/>
+   <bound-workflow workflow_id="waeup_student_subobject_wf"/>
   </type>
   <type type_id="StudentCourseResult">
-   <bound-workflow workflow_id="waeup_base_wf"/>
+   <bound-workflow workflow_id="waeup_student_subobject_wf"/>
   </type>
   <type type_id="StudentsFolder">
@@ -89,8 +86,5 @@
   </type>
   <type type_id="StudentStudyLevel">
-   <bound-workflow workflow_id="section_folder_wf"/>
-  </type>
-  <type type_id="StudentSemester">
-   <bound-workflow workflow_id="section_folder_wf"/>
+   <bound-workflow workflow_id="waeup_course_registration_wf"/>
   </type>
   <type type_id="University">
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_course_registration_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_course_registration_wf/definition.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_course_registration_wf/definition.xml	(revision 723)
@@ -23,5 +23,12 @@
  </state>
  <state state_id="created" title="">
+  <exit-transition transition_id="create_content"/>
   <exit-transition transition_id="enter_school_fee_pin"/>
+  <exit-transition transition_id="pass_A"/>
+  <exit-transition transition_id="pass_B"/>
+  <exit-transition transition_id="probate_C"/>
+  <exit-transition transition_id="reject_D"/>
+  <exit-transition transition_id="reject_E"/>
+  <exit-transition transition_id="reject_F"/>
  </state>
  <state state_id="school_fee_pin_entered" title="">
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 722)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_subobject_wf/definition.xml	(revision 723)
@@ -12,4 +12,5 @@
  <state state_id="created" title="">
   <exit-transition transition_id="close"/>
+  <exit-transition transition_id="create_content"/>
   <exit-transition transition_id="open"/>
   <permission-map name="Modify portal content"
@@ -24,4 +25,5 @@
  <state state_id="opened" title="">
   <exit-transition transition_id="close"/>
+  <exit-transition transition_id="create_content"/>
   <permission-map name="Modify portal content"
                   acquired="True">
@@ -55,4 +57,12 @@
   <transition-behavior behavior_id="initial-create"/>
  </transition>
+ <transition transition_id="create_content" title=""
+             new_state="" trigger="USER" before_script=""
+             after_script="">
+  
+  <guard>
+  </guard>
+  <transition-behavior behavior_id="allow-sub-create"/>
+ </transition>
  <transition transition_id="open" title=""
              new_state="opened" trigger="USER"
Index: WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 722)
+++ WAeUP_SRP/trunk/profiles/default/workflows/waeup_student_wf/definition.xml	(revision 723)
@@ -37,4 +37,5 @@
  <state state_id="created" title="">
   <exit-transition transition_id="create_content"/>
+  <exit-transition transition_id="clear_and_validate"/>
   <exit-transition transition_id="enter_application_pin"/>
   <exit-transition transition_id="open"/>
