Changeset 9420 for main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

Timestamp:

25 Oct 2012, 21:52:10 (12 years ago)

Author:

Henrik Bettermann

Message:

Reorganize ICourseTicket. Add ICourseTicketImport which validates a new field called level_session.

Customize checkConversion of CourseTicketProcessor?:
If level_session is provided in row the importer checks if
the parent studylevel exists and if its level_session
attribute corresponds with the expected value in row. The error message
then tells us why course result import fails.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py (modified) (7 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -28 +28 @@
 from waeup.kofa.students.vocabularies import (
     StudyLevelSource, contextual_reg_num_source, contextual_mat_num_source,
-    GenderSource, nats_vocab,
+    GenderSource, nats_vocab
     )
 from waeup.kofa.payments.interfaces import (
     IPaymentsContainer, IOnlinePayment)
 from waeup.kofa.university.vocabularies import (
-    CourseSource, StudyModeSource, CertificateSource)
+    CourseSource, StudyModeSource, CertificateSource, SemesterSource)
 
 # VerdictSource can't be placed into the vocabularies module because it
@@ -488 +488 @@
 
 class ICourseTicket(IKofaObject):
-    """A course ticket.
+    """An interface for course tickets.
 
     """
     code = Attribute('code of the original course')
-    title = Attribute('title of the original course')
-    credits = Attribute('credits of the original course')
-    passmark = Attribute('passmark of the original course')
-    semester = Attribute('semester of the original course')
-    fcode = Attribute('faculty code of the original course')
-    dcode = Attribute('department code of the original course')
     certcode = Attribute('certificate code of the study course')
+
+    title = schema.TextLine(
+        title = _(u'Title'),
+        required = False,
+        )
+
+    fcode = schema.TextLine(
+        title = _(u'Faculty Code'),
+        required = False,
+        )
+
+    dcode = schema.TextLine(
+        title = _(u'Department Code'),
+        required = False,
+        )
+
+    semester = schema.Choice(
+        title = _(u'Semester/Term'),
+        source = SemesterSource(),
+        required = False,
+        )
+
+    passmark = schema.Int(
+        title = _(u'Passmark'),
+        required = False,
+        )
+
+    credits = schema.Int(
+        title = _(u'Credits'),
+        required = False,
+        )
 
     mandatory = schema.Bool(
@@ -504 +529 @@
         default = False,
         required = False,
-        readonly = False,
         )
 
@@ -511 +535 @@
         default = 0,
         required = False,
-        readonly = False,
+        )
+
+    carry_over = schema.Bool(
+        title = _(u'Carry-over Course'),
+        default = False,
+        required = False,
         )
 
@@ -518 +547 @@
         default = False,
         required = False,
-        readonly = True,
-        )
-
-    carry_over = schema.Bool(
-        title = _(u'Carry-over Course'),
-        default = False,
-        required = False,
-        readonly = False,
-        )
-
-    credits = schema.Int(
-        title = _(u'Credits'),
-        required = False,
-        )
-
-    passmark = schema.Int(
-        title = _(u'Passmark'),
-        required = False,
-        )
+        )
+
 
     def getLevel():
@@ -546 +558 @@
         """
 
-class ICourseTicketAdd(ICourseTicket):
+class ICourseTicketAdd(IKofaObject):
     """An interface for adding course tickets.
 
@@ -556 +568 @@
         )
 
+class ICourseTicketImport(ICourseTicket):
+    """An interface for importing course results and nothing more.
+
+    """
+    score = schema.Int(
+        title = _(u'Score'),
+        required = False,
+        readonly = False,
+        )
+
+    level_session = schema.Choice(
+        title = _(u'Level Session'),
+        source = academic_sessions_vocab,
+        required = False,
+        readonly = False,
+        )
+
 class IStudentAccommodation(IKofaObject):
     """A container for student accommodation objects.