Changeset 9502

Timestamp:

2 Nov 2012, 06:13:11 (12 years ago)

Author:

Henrik Bettermann

Message:

Customize addCertCourseTickets. Add ticket only if student has paid for the course.semester. Tests will follow.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• interfaces.py (modified) (1 diff)
• student.py (modified) (1 diff)
• studylevel.py (modified) (2 diffs)

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

@@ -37 +37 @@
     def getValues(self, context):
         catalog = getUtility(ICatalog, name='courses_catalog')
-        payments_folder =  context.student['payments']
-        payments = [(p.p_session, p.p_category, p.p_state)
-            for p in payments_folder.values()]
         courses = sorted(list(catalog.searchResults(
             code=(None, None))),key=lambda value: value.code)
+        payments = context.student.getPaymentTuples()
         if (context.student.current_session, 'schoolfee_2', 'paid') in payments:
             pass

main/waeup.aaue/trunk/src/waeup/aaue/students/student.py

@@ -35 +35 @@
     grok.provides(ICustomStudent)
 
+    def getPaymentTuples(self):
+        """Special AAUE method needed for selecting courses in semesters
+        the student has paid for.
+        """
+        payments = [(p.p_session, p.p_category, p.p_state)
+            for p in self['payments'].values()]
+        return payments
 
 # Set all attributes of Student required in IStudent as field

main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

@@ -22 +22 @@
 import grok
 from zope.component.interfaces import IFactory
+from zope.component import createObject
 from zope.interface import implementedBy
 from waeup.kofa.utils.helpers import attrs_to_fields
@@ -37 +38 @@
     grok.implements(ICustomStudentStudyLevel, IStudentNavigation)
     grok.provides(ICustomStudentStudyLevel)
+
+    def addCertCourseTickets(self, cert):
+        """Collect all certificate courses and create course
+        tickets automatically.
+
+        Add ticket only if student has paid for the course.semester.
+        """
+        payments = self.student.getPaymentTuples()
+        if cert is not None:
+            for key, val in cert.items():
+                if val.level != self.level:
+                    continue
+                if val.course.semester == 2 and \
+                    not (self.student.current_session,
+                    'schoolfee_2', 'paid') in payments:
+                    continue
+                ticket = createObject(u'waeup.CourseTicket')
+                ticket.automatic = True
+                ticket.mandatory = val.mandatory
+                ticket.carry_over = False
+                self.addCourseTicket(ticket, val.course)
+        return
 
 CustomStudentStudyLevel = attrs_to_fields(CustomStudentStudyLevel)