Changeset 15970 for main/waeup.kofa/trunk

Timestamp:

31 Jan 2020, 12:12:17 (5 years ago)

Author:

Henrik Bettermann

Message:

Don't allow students to add former courses in course lists.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/permissions.py (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (2 diffs)
• src/waeup/kofa/students/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Don't allow students to add former courses in course lists.
 
 * Use kofa-filterbox for filtering users when assigniing

main/waeup.kofa/trunk/src/waeup/kofa/permissions.py

@@ -294 +294 @@
     The LocalReportsOfficer requires the assignment of the global
     ReportsOfficer role to access the reports section. If set, it reduces
-    the number of available report generators and selectable certificates
-    Local Reports Officer can create only reports for their department.
+    the number of available report generators and selectable certificates.
+    Local Reports Officers can create only reports for their department.
     """
     grok.name('waeup.local.ReportsOfficer')

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

@@ -2960 +2960 @@
                 return
             course = list(result)[0]
+            if course.former_course:
+                self.flash(_('Former courses can\'t be added.'), type="warning")
+                return
             addCourseTicket(self, course)
         return
@@ -3083 +3086 @@
             return
         course = data['course']
+        if course.former_course:
+            self.flash(_('Former courses can\'t be added.'), type="warning")
+            return
         success = addCourseTicket(self, course)
         if success:

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

@@ -3567 +3567 @@
         self.assertEqual(self.student.state, 'courses registered')
 
+    def test_former_course(self):
+        IWorkflowState(self.student).setState('school fee paid')
+        self.student['studycourse'].current_level = 100
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        # Now students can add the current study level
+        self.browser.getLink("Study Course").click()
+        self.browser.getLink("Add course list").click()
+        self.assertMatches('...Add current level 100 (Year 1)...',
+                           self.browser.contents)
+        self.browser.getControl("Create course list now").click()
+        # A level with one course ticket was created
+        self.assertEqual(
+            self.student['studycourse']['100'].number_of_tickets, 1)
+        self.browser.getLink("100").click()
+        self.assertTrue('<td>Unnamed Course</td>' in self.browser.contents)
+        self.browser.getLink("Edit course list").click()
+        del self.student['studycourse']['100']['COURSE1']
+        # Course can be added again via CourseTicketAddFormPage2
+        self.browser.getLink("here").click()
+        self.browser.getControl(name="form.course").value = ['COURSE1']
+        self.browser.getControl("Add course ticket").click()
+        self.assertTrue('Successfully added COURSE1' in self.browser.contents)
+        self.assertEqual(len(self.student['studycourse']['100'].keys()),1)
+        del self.student['studycourse']['100']['COURSE1']
+        self.course.former_course = True
+        self.browser.getLink("here").click()
+        self.browser.getControl(name="form.course").value = ['COURSE1']
+        self.browser.getControl("Add course ticket").click()
+        self.assertTrue('Former courses can\'t be added.' in self.browser.contents)
+        self.assertEqual(len(self.student['studycourse']['100'].keys()),0)
+        # Course can be added again via StudyLevelEditFormPage
+        self.browser.getLink("100").click()
+        self.browser.getLink("Edit course list").click()
+        self.browser.getControl(name="course").value = 'COURSE1'
+        self.browser.getControl("Add course ticket").click()
+        self.assertTrue('Former courses can\'t be added.' in
+            self.browser.contents)
+        self.assertEqual(len(self.student['studycourse']['100'].keys()),0)
+        # but added if current course
+        self.course.former_course = False
+        self.browser.getControl(name="course").value = 'COURSE1'
+        self.browser.getControl("Add course ticket").click()
+        self.assertTrue('Successfully added COURSE1' in self.browser.contents)
+        self.assertEqual(len(self.student['studycourse']['100'].keys()),1)
+        return
 
 class StudentRequestPWTests(StudentsFullSetup):