Changeset 14707 for main/waeup.aaue/trunk/src/waeup/aaue

Timestamp:

28 Jun 2017, 05:28:54 (7 years ago)

Author:

Henrik Bettermann

Message:

Apply filter also to CustomExportPDFScoresSlip.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

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

@@ -826 +826 @@
         except KeyError:
             return []
-        coursetickets_list = [
-            i for i in coursetickets
-            if i.student.current_mode in score_editing_enabled]
+        coursetickets_list = [courseticket for courseticket in coursetickets
+            if courseticket.student.current_mode in score_editing_enabled]
         return coursetickets_list
 
@@ -955 +954 @@
             code=(self.context.code, self.context.code)
             )
+        # Apply filter
+        try:
+            score_editing_enabled = grok.getSite()[
+                'configuration'][str(session)].score_editing_enabled
+            coursetickets_filtered = [courseticket
+                for courseticket in coursetickets
+                if courseticket.student.current_mode in score_editing_enabled]
+        except KeyError:
+            coursetickets_filtered = coursetickets
         # In AAUE only editable tickets can be printed
         editable_tickets = [
-            ticket for ticket in coursetickets if ticket.editable_by_lecturer]
+            ticket for ticket in coursetickets_filtered
+            if ticket.editable_by_lecturer]
         header = [[_(''),
                    _('Matric No.'),

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

@@ -430 +430 @@
         self.browser.open(self.edit_scores_url)
         self.assertTrue('No student found' in self.browser.contents)
+        pdf_url = '%s/coursetickets.pdf' % self.course_url
+        self.browser.open(pdf_url)
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(
+            self.browser.headers['Content-Type'], 'application/pdf')
+        path = os.path.join(samples_dir(), 'coursetickets_filtered.pdf')
+        open(path, 'wb').write(self.browser.contents)
+        print "Sample PDF coursetickets_filtered.pdf written to %s" % path
         self.app['configuration']['2004'].score_editing_enabled = ['ug_ft']
         self.browser.open(self.edit_scores_url)