Changeset 9169 for main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/students/interfaces.py

Timestamp:

10 Sep 2012, 11:05:07 (12 years ago)

Author:

uli

Message:

Merge changes from trunk, r8786-HEAD

Location:

main/waeup.kofa/branches/uli-async-update

Files:

• . (modified) (1 prop)
• src/waeup/kofa/students/interfaces.py (modified) (15 diffs)

main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/students/interfaces.py

@@ -43 +43 @@
     def getValues(self, context):
         verdicts_dict = getUtility(IStudentsUtils).VERDICTS_DICT
-        return verdicts_dict.keys()
+        return sorted(verdicts_dict.keys())
 
     def getToken(self, context, value):
@@ -50 +50 @@
     def getTitle(self, context, value):
         verdicts_dict = getUtility(IStudentsUtils).VERDICTS_DICT
+        if value != '0':
+            return verdicts_dict[value] + ' (%s)' % value
         return verdicts_dict[value]
 
@@ -65 +67 @@
         """
 
-    def setPaymentDetails(category, student):
+    def setPaymentDetails(category, student, previous_session=None,
+            previous_level=None,):
         """Create Payment object and set the payment data of a student for
         the payment category specified.
@@ -151 +154 @@
     faccode = Attribute('The faculty code of any chosen study course')
     current_session = Attribute('The current session of the student')
+    current_level = Attribute('The current level of the student')
     current_mode = Attribute('The current mode of the student')
     fullname = Attribute('All name parts separated by hyphens')
     display_fullname = Attribute('The fullname of an applicant')
+    is_postgrad = Attribute('True if postgraduate student')
+
+    suspended = schema.Bool(
+        title = _(u'Account suspended'),
+        default = False,
+        required = False,
+        )
 
     student_id = schema.TextLine(
@@ -198 +209 @@
         title = _(u'PWD Activation Code'),
         required = False,
-        readonly = True,
+        readonly = False,
         )
 
@@ -212 +223 @@
         )
 
+    def transfer(certificate, current_session,
+        current_level, current_verdict):
+        """ Creates a new studycourse and backups the old one.
+
+        """
+
 class IUGStudentClearance(IKofaObject):
     """Representation of undergraduate student clearance data.
@@ -225 +242 @@
         title = _(u'Clearance form locked'),
         default = False,
+        required = False,
         )
 
@@ -230 +248 @@
         title = _(u'CLR Activation Code'),
         required = False,
-        readonly = True,
+        readonly = False,
         )
 
@@ -288 +306 @@
     login for the the first time.
     """
-    reg_number = schema.TextLine(
-        title = u'Registration Number',
+    number = schema.TextLine(
+        title = _(u'Registr. or Matric. Number'),
         required = True,
         )
@@ -346 +364 @@
         title = _(u'Current Verdict'),
         source = VerdictSource(),
-        default = 'NY',
+        default = '0',
         required = False,
         )
@@ -353 +371 @@
         title = _(u'Previous Verdict'),
         source = VerdictSource(),
-        default = 'NY',
-        required = False,
-        )
+        default = '0',
+        required = False,
+        )
+
+class IStudentStudyCourseTransfer(IStudentStudyCourse):
+    """An student transfers.
+
+    """
+
+    certificate = schema.Choice(
+        title = _(u'Certificate'),
+        source = CertificateSource(),
+        required = True,
+        )
+
+    current_level = schema.Choice(
+        title = _(u'Current Level'),
+        source = StudyLevelSource(),
+        required = True,
+        readonly = False,
+        )
+
+
+IStudentStudyCourseTransfer['certificate'].order = IStudentStudyCourse[
+    'certificate'].order
+IStudentStudyCourseTransfer['current_level'].order = IStudentStudyCourse[
+    'current_level'].order
 
 class IStudentVerdictUpdate(IKofaObject):
@@ -385 +427 @@
     """
     level = Attribute('The level code')
-    validation_date = Attribute('The date of validation')
-    validated_by = Attribute('User Id of course adviser')
 
     level_session = schema.Choice(
         title = _(u'Session'),
         source = academic_sessions_vocab,
-        required = True,
+        required = False,
         )
 
@@ -397 +437 @@
         title = _(u'Verdict'),
         source = VerdictSource(),
-        default = 'NY',
-        required = False,
-        )
-
-    def addCourseTicket(courseticket):
+        default = '0',
+        required = False,
+        )
+
+    validated_by = schema.TextLine(
+        title = _(u'Validated by'),
+        default = None,
+        required = False,
+        )
+
+    validation_date = schema.Datetime(
+        title = _(u'Validation Date'),
+        required = False,
+        readonly = False,
+        )
+
+    def addCourseTicket(ticket, course):
         """Add a course ticket object.
         """
@@ -520 +572 @@
     """
 
+    p_current = schema.Bool(
+        title = _(u'Current Session Payment'),
+        default = True,
+        required = False,
+        )
+
     p_level = schema.Int(
         title = _(u'Payment Level'),
@@ -543 +601 @@
 IStudentOnlinePayment['p_level'].order = IStudentOnlinePayment[
     'p_session'].order
+
+class IStudentPreviousPayment(IOnlinePayment):
+    """An interface for adding previous session payments.
+
+    """
+
+    p_session = schema.Choice(
+        title = _(u'Payment Session'),
+        source = academic_sessions_vocab,
+        required = True,
+        )
+
+    p_level = schema.Choice(
+        title = _(u'Payment Level'),
+        source = StudyLevelSource(),
+        required = True,
+        )
 
 class ICSVStudentExporter(ICSVExporter):