Changeset 15229

Timestamp:

11 Nov 2018, 21:22:33 (6 years ago)

Author:

Henrik Bettermann

Message:

Remove CA column if not needed.

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

@@ -1084 +1084 @@
         passed = 0
         failed = 0
+        with_ca = False
         # In AAUE only editable tickets can be printed
         for ticket in sorted_tickets:
+            if ticket.ca > 0:
+                with_ca = True
             total = ticket.total_score
             grade = ticket._getGradeWeightFromScore[0]
@@ -1119 +1122 @@
         dep = self.context.__parent__.__parent__.longtitle
         fac = self.context.__parent__.__parent__.__parent__.longtitle
+        # remove CA column if not necessary
+        if not with_ca:
+            header = [[_(''),
+                       _('Student Id'),
+                       _('Matric No.'),
+                       #_('Reg. No.'),
+                       #_('Fullname'),
+                       #_('Status'),
+                       #_('Course of\nStudies'),
+                       _('Department'),
+                       _('Level'),
+                       #_(' CA  '),
+                       _('Exam\nScore'),
+                       _('Total '),
+                       _('Grade'),
+                       ],]
+            for ticket in tickets:
+                del(ticket[5])
         return header + tickets, [
             dep, fac, total, passed, passed_perc, failed, failed_perc]

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

@@ -424 +424 @@
         open(path, 'wb').write(self.browser.contents)
         print "Sample PDF coursetickets.pdf written to %s" % path
+        # The CA column is not shown if CA is not used
+        self.student['studycourse']['100']['COURSE1'].ca = 0
+        self.browser.open(pdf_url)
+        path = os.path.join(samples_dir(), 'coursetickets_wo_ca.pdf')
+        open(path, 'wb').write(self.browser.contents)
+        print "Sample PDF coursetickets_wo_ca.pdf written to %s" % path
 
     def test_lecturers_do_only_see_selected_students(self):