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

Timestamp:

13 May 2018, 04:58:37 (7 years ago)

Author:

Henrik Bettermann

Message:

Modify CustomExportPDFScoresSlip.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py (modified) (5 diffs)

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

@@ -1013 +1013 @@
             coursetickets_filtered = [courseticket
                 for courseticket in coursetickets
-                if courseticket.student.current_mode in score_editing_enabled]
+                if courseticket.student.current_mode in score_editing_enabled
+                and courseticket.total_score is not None]
         except KeyError:
             coursetickets_filtered = coursetickets
@@ -1021 +1022 @@
             if ticket.editable_by_lecturer]
         header = [[_(''),
+                   _('Student Id'),
                    _('Matric No.'),
                    #_('Reg. No.'),
@@ -1028 +1030 @@
                    _('Department'),
                    _('Level'),
-                   _(' CA  '),
-                   _('Exam\nScore'),
+                   #_(' CA  '),
+                   #_('Exam\nScore'),
                    _('Total '),
                    _('Grade'),
@@ -1043 +1045 @@
         # In AAUE only editable tickets can be printed
         for ticket in sorted_tickets:
-            if ticket.total_score is None:
-                total = 'n/a'
-                grade = 'n/a'
+            total = ticket.total_score
+            grade = ticket._getGradeWeightFromScore[0]
+            if grade in ('F', '-'):
+                failed += 1
             else:
-                total = ticket.total_score
-                grade = ticket._getGradeWeightFromScore[0]
-                if grade in ('F', '-'):
-                    failed += 1
-                else:
-                    passed += 1
+                passed += 1
             fullname = textwrap.fill(ticket.student.display_fullname, 30)
             #deptitle = site['faculties'][ticket.student.faccode][
             #    ticket.student.depcode].longtitle
             row = [no,
+                  ticket.student.student_id,
                   ticket.student.matric_number,
                   #ticket.student.reg_number,
@@ -1064 +1063 @@
                   ticket.student.faccode + ' / ' + ticket.student.depcode,
                   ticket.level,
-                  ticket.ca,
-                  ticket.score,
+                  #ticket.ca,
+                  #ticket.score,
                   total,
                   grade,