Changeset 6782 for main/waeup.sirp/trunk/src/waeup

Timestamp:

16 Sep 2011, 15:18:55 (13 years ago)

Author:

Henrik Bettermann

Message:

Collect all course referrers and create respective course tickets when adding a study level.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (1 diff)
• studycourse.py (modified) (3 diffs)
• studylevel.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -522 +522 @@
         studylevel.level = int(level_code)
         try:
-            self.context.addStudentStudyLevel(studylevel)
+            self.context.addStudentStudyLevel(
+                self.context.certificate,studylevel)
         except KeyError:
             self.flash('This level exists.')

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

@@ -23 +23 @@
 from waeup.sirp.students.interfaces import (
     IStudentStudyCourse, IStudentNavigation, IStudentStudyLevel)
+from waeup.sirp.students.studylevel import CourseTicket
 from waeup.sirp.utils.helpers import attrs_to_fields
 
@@ -38 +39 @@
         return self.__parent__
 
-    def addStudentStudyLevel(self, studylevel):
+    def addStudentStudyLevel(self, cert, studylevel):
         """Add a study level object.
         """
@@ -45 +46 @@
                 'StudentStudyCourses contain only IStudentStudyLevel instances')
         self[str(studylevel.level)] = studylevel
+
+        #Create course tickets automatically
+        for key, val in cert.items():
+            ticket = CourseTicket(
+                val.getCourseCode(),
+                val.course.title,
+                val.level,
+                val.core_or_elective)
+            self[str(studylevel.level)][val.getCourseCode()] = ticket
         return
 

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

@@ -51 +51 @@
             raise TypeError(
                 'StudentStudyLeves contain only ICourseTicket instances')
-        self[str(courseticket.code)] = courseticket
+        self[courseticket.code] = courseticket
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -283 +283 @@
         self.browser.getControl("Save").click()
 
+        # Managers can add a any sudy level (course list)
+        self.browser.getControl(name="addlevel").value = ['100']
+        self.browser.getControl("Add study level").click()
+        self.assertMatches('...<span>100</span>...',
+                           self.browser.contents)
+
+        # Managers can browse all subobjects
         self.browser.open(self.student_path)
         self.browser.getLink("Payments").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.payments_student_path)
-
         self.browser.open(self.student_path)
         self.browser.getLink("Accommodation").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.accommodation_student_path)
-
         self.browser.open(self.student_path)
         self.browser.getLink("History").click()