Changeset 6783 for main/waeup.sirp/trunk

Timestamp:

17 Sep 2011, 16:12:37 (13 years ago)

Author:

Henrik Bettermann

Message:

Copy all data from the course and its course referrer into course tickets.

A course ticket contains a copy of the original course and
course referrer data. If the courses and/or their referrers are removed, the
corresponding tickets remain unchanged. So we do not need any event
triggered actions on course ticket.

Location:

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

Files:

• browser.py (modified) (1 diff)
• browser_templates/studylevelpage.pt (added)
• interfaces.py (modified) (1 diff)
• studycourse.py (modified) (1 diff)
• studylevel.py (modified) (1 diff)
• tests/test_student.py (modified) (1 diff)

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

@@ -560 +560 @@
     grok.require('waeup.viewStudent')
     form_fields = grok.AutoFields(IStudentStudyLevel)
-    #grok.template('studylevelpage')
+    grok.template('studylevelpage')
     title = 'Study Level'
     pnav = 4

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

@@ -213 +213 @@
 
     """
-    code = Attribute('Course code')
-    title = Attribute('Course title')
-    course_level = Attribute('level of the original course referrer')
+    code = Attribute('code of the original course')
+    title = Attribute('title of the original course')
+    credits = Attribute('credits of the original course')
+    passmark = Attribute('passmark of the original course')
+    semester = Attribute('semester of the original course')
+    faculty = Attribute('faculty of the original course')
+    department = Attribute('department of the original course')
     core_or_elective = Attribute('core_or_elective of the original course referrer')
-
-    credits = schema.Int(
-        title = u'Credits',
-        default = 0,
-        required = False,
-        readonly = False,
-        )
+    level = Attribute('level of the original course referrer')
 
     score = schema.Int(

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

@@ -52 +52 @@
                 val.getCourseCode(),
                 val.course.title,
+                val.course.credits,
+                val.course.passmark,
+                val.course.semester,
+                val.course.__parent__.__parent__.__parent__.title,
+                val.course.__parent__.__parent__.title,
                 val.level,
                 val.core_or_elective)

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

@@ -60 +60 @@
     student to attend the course. Lecturers will enter scores and more at
     the end of the term.
+
+    A course ticket contains a copy of the original course and
+    course referrer data. If the courses and/or their referrers are removed, the
+    corresponding tickets remain unchanged. So we do not need any event
+    triggered actions on course tickets.
     """
     grok.implements(ICourseTicket, IStudentNavigation)
     grok.provides(ICourseTicket)
 
-    def __init__(self, code, title, course_level, core_or_elective):
+    def __init__(self, code, title, credits,
+        passmark, semester, faculty, department, level, core_or_elective):
+
         super(CourseTicket, self).__init__()
         self.title = title
         self.code = code
-        self.course_level = course_level
+        self.faculty = faculty
+        self.department = department
+        self.level = level
+        self.credits = credits
+        self.passmark = passmark
+        self.semester = semester
         self.core_or_elective = core_or_elective
         return

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

@@ -37 +37 @@
         self.studycourse = StudentStudyCourse()
         self.studylevel = StudentStudyLevel()
-        self.courseticket = CourseTicket('CERT', 'Title', 100, True)
+        self.courseticket = CourseTicket('CERT', 'Title', 100, 10, 40, 1,
+            'Faculty', 'Department', True)
         self.payments = StudentPayments()
         self.accommodation = StudentAccommodation()