Changeset 8920 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

5 Jul 2012, 14:48:51 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename course referrers to certificate courses (according to the discussion long time ago).

Edit some button labels and titles.

Move code from view to content components.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• browser_templates/studylevelpage.pt (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• studylevel.py (modified) (2 diffs)
• tests/test_batching.py (modified) (3 diffs)
• tests/test_browser.py (modified) (6 diffs)
• tests/test_student.py (modified) (1 diff)
• viewlets.py (modified) (2 diffs)

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

@@ -932 +932 @@
         ticket.automatic = False
         ticket.carry_over = False
-        ticket.code = course.code
-        ticket.title = course.title
-        ticket.fcode = course.__parent__.__parent__.__parent__.code
-        ticket.dcode = course.__parent__.__parent__.code
-        ticket.credits = course.credits
-        ticket.passmark = course.passmark
-        ticket.semester = course.semester
         try:
-            self.context.addCourseTicket(ticket)
+            self.context.addCourseTicket(ticket, course)
         except KeyError:
             self.flash(_('The ticket exists.'))
@@ -1784 +1777 @@
         level_title = translate(self.context.level_title, 'waeup.kofa',
             target_language=lang)
-        return _('Add and remove course tickets of study level ${a}',
+        return _('Edit course list of ${a}',
             mapping = {'a':level_title})
 
@@ -1855 +1848 @@
         ticket = createObject(u'waeup.CourseTicket')
         course = data['course']
-        for name in ['code', 'title', 'credits', 'passmark', 'semester']:
-            setattr(ticket, name, getattr(course, name))
         ticket.automatic = False
+        ticket.carry_over = False
         try:
-            self.context.addCourseTicket(ticket)
+            self.context.addCourseTicket(ticket, course)
         except KeyError:
             self.flash(_('The ticket exists.'))

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/studylevelpage.pt

@@ -34 +34 @@
       <th i18n:translate="">Code</th>
       <th i18n:translate="">Title</th>
-      <th i18n:translate="">Dept.</th>
-      <th i18n:translate="">Fact.</th>
+      <th i18n:translate="">Dep.</th>
+      <th i18n:translate="">Fac.</th>
       <th i18n:translate="">Cred.</th>
       <th i18n:translate="">Mand.</th>

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

@@ -402 +402 @@
         )
 
-    def addCourseTicket(courseticket):
+    def addCourseTicket(ticket, course):
         """Add a course ticket object.
         """

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

@@ -56 +56 @@
         return studylevelsource.factory.getTitle(self.__parent__, self.level)
 
-    def addCourseTicket(self, courseticket):
+    def addCourseTicket(self, ticket, course):
         """Add a course ticket object.
         """
-        if not ICourseTicket.providedBy(courseticket):
+        if not ICourseTicket.providedBy(ticket):
             raise TypeError(
                 'StudentStudyLeves contain only ICourseTicket instances')
-        self[courseticket.code] = courseticket
+        ticket.code = course.code
+        ticket.title = course.title
+        ticket.fcode = course.__parent__.__parent__.__parent__.code
+        ticket.dcode = course.__parent__.__parent__.code
+        ticket.credits = course.credits
+        ticket.passmark = course.passmark
+        ticket.semester = course.semester
+        self[ticket.code] = ticket
         return
 
@@ -87 +94 @@
 
     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
+    certificate course data. If the courses and/or the referrin certificate
+    courses are removed, the corresponding tickets remain unchanged.
+    So we do not need any event
     triggered actions on course tickets.
     """

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_batching.py

@@ -218 +218 @@
         ticket.passmark = 100
         ticket.semester = 2
-        study_level.addCourseTicket(ticket)
+        study_level[ticket.code] = ticket
         self.add_payment(student)
         return student
@@ -688 +688 @@
         shutil.rmtree(os.path.dirname(fin_file))
 
-        # Add course and course referrer
+        # Add course and certificate course
         self.course = createObject('waeup.Course')
         self.course.code = 'COURSE1'
@@ -696 +696 @@
         self.app['faculties']['fac1']['dep1'].courses.addCourse(
             self.course)
-        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
+        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
             self.course, level=100)
 

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

@@ -171 +171 @@
         self.app['faculties']['fac1']['dep1'].courses.addCourse(
             self.course)
-        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCourseRef(
+        self.app['faculties']['fac1']['dep1'].certificates['CERT1'].addCertCourse(
             self.course, level=100)
 
@@ -1240 +1240 @@
         self.browser.getControl("Create course list now").click()
         self.browser.getLink("100").click()
-        self.browser.getLink("Add and remove courses").click()
+        self.browser.getLink("Edit course list").click()
         self.browser.getControl("Add course ticket").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -1253 +1253 @@
         self.browser.getControl("Create course list now").click()
         self.browser.getLink("200").click()
-        self.browser.getLink("Add and remove courses").click()
+        self.browser.getLink("Edit course list").click()
         self.browser.getControl("Add course ticket").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -1521 +1521 @@
         # The new SFE-0 pin can be used for starting new session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         pin = self.app['accesscodes']['SFE-0'].keys()[0]
         parts = pin.split('-')[1:]
@@ -1570 +1570 @@
         # The new SFE-0 pin can be used for starting session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         pin = self.app['accesscodes']['SFE-0'].keys()[0]
         parts = pin.split('-')[1:]
@@ -1610 +1610 @@
         # The new SFE-1 pin can be used for starting new session
         self.browser.open(self.studycourse_path)
-        self.browser.getLink('Start session').click()
+        self.browser.getLink('Start new session').click()
         self.browser.getControl(name="ac_series").value = sfeseries
         self.browser.getControl(name="ac_number").value = sfenumber

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

@@ -129 +129 @@
         studylevel = StudentStudyLevel()
         self.assertRaises(
-            TypeError, studylevel.addCourseTicket, department)
+            TypeError, studylevel.addCourseTicket, department, department)
 
     def test_booking_date(self):

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

@@ -445 +445 @@
     grok.require('waeup.handleStudent')
     icon = 'actionicon_start.gif'
-    text = _('Start session')
+    text = _('Start new session')
     target = 'start_session'
 
@@ -477 +477 @@
     grok.view(StudyLevelDisplayFormPage)
     grok.require('waeup.handleStudent')
-    text = _('Add and remove courses')
+    text = _('Edit course list')
     target = 'edit'