Index: /main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/applicants/interfaces.py
===================================================================
--- /main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/applicants/interfaces.py	(revision 7786)
+++ /main/waeup.sirp/branches/ulif-schoolgrades/src/waeup/sirp/applicants/interfaces.py	(revision 7787)
@@ -34,4 +34,5 @@
     SubjectSource, GradeSource, IResultEntry)
 from waeup.sirp.interfaces import MessageFactory as _
+from waeup.sirp.schoolgrades import ResultEntryField
 from waeup.sirp.university.vocabularies import (
     course_levels, AppCatSource)
@@ -435,20 +436,8 @@
     school_grades = schema.List(
         title = _(u'School Grades'),
-        value_type = MultiValObject(
-            schema = IResultEntry),
-        #value_type = schema.Object(
-        #    schema = IResultEntry),
+        value_type = ResultEntryField(),
         required = True,
         default = [],
         )
-    #school_grades = schema.Dict(
-    #    title = _(u'School Grades'),
-    #    key_type = schema.TextLine(
-    #        title = _(u'Subject'),
-    #        ),
-    #    value_type = schema.TextLine(
-    #        title = _(u'Grade'),
-    #        )
-    #    )
 
     #
