Index: WAeUP_SRP/trunk/profiles/default/layouts.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 1856)
+++ WAeUP_SRP/trunk/profiles/default/layouts.xml	(revision 1861)
@@ -29,4 +29,5 @@
   <object name="student_clearance_fe" meta_type="CPS Layout"/>
   <object name="student_course_result" meta_type="CPS Layout"/>
+  <object name="student_course_result_fe" meta_type="CPS Layout"/>  
   <object name="student_create" meta_type="CPS Layout"/>
   <object name="student_firsttime_login" meta_type="CPS Layout"/>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_course_result.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_course_result.xml	(revision 1856)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_course_result.xml	(revision 1861)
@@ -1,4 +1,3 @@
 <?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="layout.xsl"?>
 <object name="student_course_result" meta_type="CPS Layout">
  <property name="layout_create_method"></property>
@@ -8,26 +7,5 @@
  <property name="flexible_widgets"/>
  <property name="validate_values_expr"></property>
- <widget name="ansbook" meta_type="String Widget">
-  <property name="title">Ansbook</property>
-  <property name="fields">
-   <element value="ansbook"/>
-  </property>
-  <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="carry_level" meta_type="String Widget">
-  <property name="title">Carry Level</property>
-  <property name="fields">
-   <element value="carry_level"/>
-  </property>
-  <property name="label">Carry Level</property>
-  <property name="label_edit">Carry Level</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
+
  <widget name="code" meta_type="CertificateCourseId Widget">
   <property name="title">Course Code</property>
@@ -46,11 +24,11 @@
  </widget>
  <widget name="core_or_elective " meta_type="Boolean Widget">
-  <property name="title">Core or Elective</property>
+  <property name="title">Core or Elective (editable value)</property>
   <property name="fields">
    <element value="core_or_elective"/>
   </property>
   <property name="is_required">True</property>
-  <property name="label">Core or Elective</property>
-  <property name="label_edit">Core or Elective</property>
+  <property name="label">Core or Elective (editable value)</property>
+  <property name="label_edit">Core or Elective (editable value)</property>
   <property name="readonly_layout_modes"/>
   <property name="hidden_layout_modes"/>
@@ -60,37 +38,10 @@
  </widget>
  <widget name="credits" meta_type="Int Widget">
-  <property name="title">Credits</property>
+  <property name="title">Credits (original value)</property>
   <property name="fields">
    <element value="credits"/>
   </property>
-  <property name="label">Credits</property>
-  <property name="label_edit">Credits</property>
-  <property name="readonly_layout_modes">
-   <element value="edit"/>
-   <element value="create"/>
-  </property>
-  <property name="hidden_layout_modes">
-   <element value="create"/>
-  </property>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="grade" meta_type="String Widget">
-  <property name="title">Grade</property>
-  <property name="fields">
-   <element value="grade"/>
-  </property>
-  <property name="label">Grade</property>
-  <property name="label_edit">Grade</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="import_id" meta_type="String Widget">
-  <property name="title">ID imported</property>
-  <property name="fields">
-   <element value="import_id"/>
-  </property>
-  <property name="label">ID imported</property>
-  <property name="label_edit">ID imported</property>
+  <property name="label">Credits (original value)</property>
+  <property name="label_edit">Credits (original value)</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -103,10 +54,10 @@
  </widget>
  <widget name="passmark" meta_type="Int Widget">
-  <property name="title">Passmark</property>
+  <property name="title">Passmark (original value)</property>
   <property name="fields">
    <element value="passmark"/>
   </property>
-  <property name="label">Passmark</property>
-  <property name="label_edit">Passmark</property>
+  <property name="label">Passmark (original value)</property>
+  <property name="label_edit">Passmark (original value)</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -125,26 +76,16 @@
   <property name="label">Score</property>
   <property name="label_edit">Score</property>
-  <property name="readonly_layout_modes"/>
+  <property name="readonly_layout_modes">
+  </property>
   <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="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"/>
-  <property name="hidden_readonly_layout_modes"/>
- </widget>
- <widget name="status" meta_type="String Widget">
-  <property name="title">Status</property>
-  <property name="fields">
-   <element value="status"/>
-  </property>
-  <property name="label">Status</property>
-  <property name="label_edit">Status</property>
+  <property name="label">Semester (original value)</property>
+  <property name="label_edit">Semester (original value)</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -155,10 +96,10 @@
  </widget>
  <widget name="title" meta_type="String Widget">
-  <property name="title">Course Title</property>
+  <property name="title">Original Course Title</property>
   <property name="fields">
    <element value="title"/>
   </property>
-  <property name="label">Course Title</property>
-  <property name="label_edit">Course Title</property>
+  <property name="label">Original Course Title</property>
+  <property name="label_edit">Original Course Title</property>
   <property name="readonly_layout_modes">
    <element value="edit"/>
@@ -170,15 +111,4 @@
   <property name="hidden_readonly_layout_modes"/>
   <property name="display_width">60</property>
- </widget>
- <widget name="weight" meta_type="String Widget">
-  <property name="title">Weight</property>
-  <property name="fields">
-   <element value="weight"/>
-  </property>
-  <property name="label">Weight</property>
-  <property name="label_edit">Weight</property>
-  <property name="readonly_layout_modes"/>
-  <property name="hidden_layout_modes"/>
-  <property name="hidden_readonly_layout_modes"/>
  </widget>
  <table>
@@ -199,17 +129,5 @@
   </row>
   <row>
-   <cell name="grade"/>
-  </row>
-  <row>
-   <cell name="ansbook"/>
-  </row>
-  <row>
-   <cell name="status"/>
-  </row>
-  <row>
    <cell name="score"/>
-  </row>
-  <row>
-   <cell name="weight"/>
   </row>
   <row>
Index: WAeUP_SRP/trunk/profiles/default/layouts/student_course_result_fe.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/layouts/student_course_result_fe.xml	(revision 1861)
+++ WAeUP_SRP/trunk/profiles/default/layouts/student_course_result_fe.xml	(revision 1861)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<object name="student_course_result" 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_personal_</property>
+ <property name="flexible_widgets"/>
+ <property name="validate_values_expr"></property>
+
+
+ <widget name="core_or_elective " meta_type="Boolean Widget">
+  <property name="title">Core or Elective</property>
+  <property name="fields">
+   <element value="core_or_elective"/>
+  </property>
+  <property name="is_required">True</property>
+  <property name="label">Core or Elective</property>
+  <property name="label_edit">Core or Elective</property>
+  <property name="readonly_layout_modes"/>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+  <property name="label_false">elective</property>
+  <property name="label_true">core</property>
+ </widget>
+
+ <table>
+
+  <row>
+   <cell name="core_or_elective "/>
+  </row>
+
+ </table>
+</object>
+
Index: WAeUP_SRP/trunk/profiles/default/schemas/student_course_result.xml
===================================================================
--- WAeUP_SRP/trunk/profiles/default/schemas/student_course_result.xml	(revision 1856)
+++ WAeUP_SRP/trunk/profiles/default/schemas/student_course_result.xml	(revision 1861)
@@ -12,5 +12,5 @@
  <field name="semester" meta_type="CPS Int Field">
   <property name="default_expr">python:1</property>
- </field> 
- <field name="weight" meta_type="CPS String Field"/>
+ </field>
+ <field name="passmark" meta_type="CPS Int Field"/>
 </object>
