Changeset 13871 for main

Timestamp:

31 May 2016, 17:57:03 (9 years ago)

Author:

Henrik Bettermann

Message:

Make some adjustments to payment exporters and importers: Do not allow to import display_item, use IPayer adapter, fix docstring and more.

Location:

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

Files:

• batching.py (modified) (4 diffs)
• export.py (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)

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

@@ -45 +45 @@
     IStudentStudyLevel, ICourseTicketImport,
     IStudentOnlinePayment, IStudentVerdictUpdate)
+from waeup.kofa.payments.interfaces import IPayer
 from waeup.kofa.students.workflow import  (
     IMPORTABLE_STATES, IMPORTABLE_TRANSITIONS,
@@ -735 +736 @@
 
 class StudentOnlinePaymentProcessor(StudentProcessorBase):
-    """The Course Ticket Processor imports student payment tickets. The
-    tickets are located in the ``payments`` subfolder of the student
+    """The Student Online Payment Processor imports student payment tickets.
+    The tickets are located in the ``payments`` subfolder of the student
     container. The only additional locator is `p_id`, the object id.
 
@@ -759 +760 @@
 
     additional_fields = ['p_id']
+
+    @property
+    def available_fields(self):
+        af = super(
+            StudentOnlinePaymentProcessor, self).available_fields
+        af.remove('display_item')
+        return af
 
     def checkHeaders(self, headerfields, mode='ignore'):
@@ -875 +883 @@
             results = list(cat.searchResults(p_id=(p_id, p_id)))
             if len(results) > 0:
-                sids = [payment.student.student_id for payment in results]
+                sids = [IPayer(payment).id for payment in results]
                 sids_string = ''
                 for id in sids:

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

@@ -382 +382 @@
         sorted(iface_names(
             IStudentOnlinePayment, exclude_attribs=False,
-            omit=['display_item', 'certificate']))) + (
+            omit=['display_item', 'certificate', 'student']))) + (
             'student_id','state','current_session')
     title = _(u'Student Payments')
@@ -430 +430 @@
         sorted(iface_names(
             IStudentOnlinePayment, exclude_attribs=False,
-            omit=['display_item', 'certificate']))) + (
+            omit=['display_item', 'certificate', 'student']))) + (
             'student_id','matric_number','reg_number',
             'firstname', 'middlename', 'lastname',

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

@@ -773 +773 @@
 
     certificate = Attribute('Certificate to determine the correct p_level value')
+    student = Attribute('Student')
 
     p_current = schema.Bool(
@@ -785 +786 @@
         required = False,
         )
+
+    def redeemTicket():
+        """Either create an appropriate access code or trigger an action
+        directly.
+        """
 
     def doAfterStudentPayment():