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

Timestamp:

10 Jun 2016, 08:15:54 (9 years ago)

Author:

Henrik Bettermann

Message:

Add LecturerLandingPage and LecturerCourses ManageLink viewlet.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• tests/test_browser.py (modified) (7 diffs)

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

@@ -3209 +3209 @@
             code=(self.context.code, self.context.code)
             )
-        result = [[_('Matric No.'),
+        header = [[_('Matric No.'),
                    _('Reg. No.'),
                    _('Fullname'),
@@ -3216 +3216 @@
                    _('Level'),
                    _('Score') ],]
+        tickets = []
         for ticket in list(coursetickets):
             row = [ticket.student.matric_number,
@@ -3224 +3225 @@
                   ticket.level,
                   ticket.score]
-            result.append(row)
-        return result
+            tickets.append(row)
+        return header + sorted(tickets, key=lambda value: value[0])
 
     def render(self):

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

@@ -1821 +1821 @@
         prmlocal = IPrincipalRoleManager(course)
         prmlocal.assignRoleToPrincipal('waeup.local.Lecturer', 'mrslecturer')
+        notify(LocalRoleSetEvent(
+            course, 'waeup.local.Lecturer', 'mrslecturer', granted=True))
         # Login as lecturer.
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = 'mrslecturer'
-        self.browser.getControl(name="form.password").value = 'mrslecturersecret'
+        self.browser.getControl(
+            name="form.password").value = 'mrslecturersecret'
         self.browser.getControl("Login").click()
         self.assertMatches('...You logged in...', self.browser.contents)
-        # CO can see her roles.
+        # Lecturer is on landing page
+        self.assertTrue('(<span>COURSE1</span>)' in self.browser.contents)
+        # Lecturer can click the 'My Roles' link.
         self.browser.getLink("My Roles").click()
         self.assertMatches(
             '...<div>Academics Officer (view only)</div>...',
             self.browser.contents)
-        # But not her local role ...
-        self.assertFalse('Lecturer' in self.browser.contents)
-        # ... because we forgot to notify the course that the local role
-        # has changed.
-        notify(LocalRoleSetEvent(
-            course, 'waeup.local.Lecturer', 'mrslecturer', granted=True))
-        self.browser.open('http://localhost/app/users/mrslecturer/my_roles')
-        self.assertTrue('Lecturer' in self.browser.contents)
         self.assertMatches(
-            '...<a href="http://localhost/app/faculties/fac1/dep1/courses/COURSE1">...',
+            '...<a href="http://localhost/app/'
+            'faculties/fac1/dep1/courses/COURSE1">...',
             self.browser.contents)
+        self.assertFalse('(<span>COURSE1</span>)' in self.browser.contents)
+        # Lecturer can click the 'My Courses' link ...
+        self.browser.getLink("My Courses").click()
+        # ... and is is back on landing page
+        self.assertTrue('(<span>COURSE1</span>)' in self.browser.contents)
         # The lecturer can go to her course ...
-        self.browser.getLink(
-            "http://localhost/app/faculties/fac1/dep1/courses/COURSE1").click()
+        self.browser.getLink("COURSE1").click()
         # Lecturers can neither filter students ...
         self.assertRaises(
@@ -1861 +1863 @@
         # Course results can be batch edited via the edit_courses view.
         self.app['faculties']['fac1']['dep1'].score_editing_disabled = True
-        self.browser.open("http://localhost/app/faculties/fac1/dep1/courses/COURSE1")
+        self.browser.open(
+            "http://localhost/app/faculties/fac1/dep1/courses/COURSE1")
         self.browser.getLink("Update scores").click()
         self.assertTrue('Score editing disabled' in self.browser.contents)
         self.app['faculties']['fac1']['dep1'].score_editing_disabled = False
         self.browser.getLink("Update scores").click()
-        self.assertTrue('Current academic session not set' in self.browser.contents)
+        self.assertTrue(
+            'Current academic session not set' in self.browser.contents)
         self.app['configuration'].current_academic_session = 2004
         self.browser.getLink("Update scores").click()
@@ -1875 +1879 @@
         # Student must be in state 'courses validated'.
         self.browser.open(
-            "http://localhost/app/faculties/fac1/dep1/courses/COURSE1/edit_scores")
+            'http://localhost/app/faculties/fac1/'
+            'dep1/courses/COURSE1/edit_scores')
         self.assertTrue(
             'input type="text" name="scores"' in self.browser.contents)
@@ -1888 +1893 @@
         logcontent = open(logfile).read()
         self.assertTrue('mrslecturer - students.browser.EditScoresPage - '
-                        'K1000000 100/COURSE1 score updated (55)' in logcontent)
+            'K1000000 100/COURSE1 score updated (55)' in logcontent)
         # Non-integer scores won't be accepted.
         self.browser.open(
-            "http://localhost/app/faculties/fac1/dep1/courses/COURSE1/edit_scores")
+            'http://localhost/app/faculties/fac1/'
+            'dep1/courses/COURSE1/edit_scores')
         self.assertTrue('value="55" />' in self.browser.contents)
         self.browser.getControl(name="scores", index=0).value = 'abc'
@@ -1899 +1905 @@
         # Scores can be removed.
         self.browser.open(
-            "http://localhost/app/faculties/fac1/dep1/courses/COURSE1/edit_scores")
+            'http://localhost/app/faculties/fac1/'
+            'dep1/courses/COURSE1/edit_scores')
         self.browser.getControl(name="scores", index=0).value = ''
         self.browser.getControl("Update scores").click()
@@ -1906 +1913 @@
         logcontent = open(logfile).read()
         self.assertTrue('mrslecturer - students.browser.EditScoresPage - '
-                        'K1000000 100/COURSE1 score updated (None)' in logcontent)
+            'K1000000 100/COURSE1 score updated (None)' in logcontent)
         # A course ticket slip can be downloaded
         self.browser.open(
-            "http://localhost/app/faculties/fac1/dep1/courses/COURSE1/coursetickets.pdf")
+            'http://localhost/app/faculties/fac1/'
+            'dep1/courses/COURSE1/coursetickets.pdf')
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'],
@@ -1916 +1924 @@
         open(path, 'wb').write(self.browser.contents)
         print "Sample PDF coursetickets.pdf written to %s" % path
-
 
     def test_change_current_mode(self):