Changeset 9501

Timestamp:

2 Nov 2012, 05:39:40 (12 years ago)

Author:

Henrik Bettermann

Message:

Add addCertCourseTickets method to StudentStudyLevel?.

Location:

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

Files:

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

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

@@ -494 +494 @@
         """
 
+    def addCertCourseTickets(cert):
+        """Collect all certificate courses and create course
+        tickets automatically.
+        """
+
 class ICourseTicket(IKofaObject):
     """An interface for course tickets.

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

@@ -78 +78 @@
                 'StudentStudyCourses contain only IStudentStudyLevel instances')
         self[str(studylevel.level)] = studylevel
-
-        #Create course tickets automatically
-        if cert is not None:
-            for key, val in cert.items():
-                if val.level != studylevel.level:
-                    continue
-                ticket = createObject(u'waeup.CourseTicket')
-                ticket.code = val.getCourseCode()
-                ticket.automatic = True
-                ticket.mandatory = val.mandatory
-                ticket.title = val.course.title
-                ticket.fcode = val.course.__parent__.__parent__.__parent__.code
-                ticket.dcode = val.course.__parent__.__parent__.code
-                ticket.credits = val.course.credits
-                ticket.passmark = val.course.passmark
-                ticket.semester = val.course.semester
-                ticket.carry_over = False
-                self[str(studylevel.level)][ticket.code] = ticket
+        studylevel.addCertCourseTickets(cert)
         # Collect carry-over courses in base levels (not in repeating levels)
         try:

main/waeup.kofa/trunk/src/waeup/kofa/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.students.interfaces import (
@@ -86 +87 @@
         ticket.semester = course.semester
         self[ticket.code] = ticket
+        return
+
+    def addCertCourseTickets(self, cert):
+        """Collect all certificate courses and create course
+        tickets automatically.
+        """
+        if cert is not None:
+            for key, val in cert.items():
+                if val.level != self.level:
+                    continue
+                ticket = createObject(u'waeup.CourseTicket')
+                ticket.automatic = True
+                ticket.mandatory = val.mandatory
+                ticket.carry_over = False
+                self.addCourseTicket(ticket, val.course)
         return