Changeset 13963 for main/waeup.aaue/trunk/src/waeup/aaue/students/browser.py

Timestamp:

21 Jun 2016, 06:30:07 (8 years ago)

Author:

Henrik Bettermann

Message:

Resolve ticket #228:

1. The first column should be the Serial number.
2. Under the column for Full name, surname should come first in capital letter with a coma before the other names.
3. The heading for ‘score’ column should be renamed ‘exam score’.
4. CA column should come before exam score column
5. The column for Total should be added after exam score column.
6. Extra column for letter grade should come after the ‘total’ column.

File:

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

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

@@ -649 +649 @@
             code=(self.context.code, self.context.code)
             )
-        header = [[_('Matric No.'),
+        header = [[_(''),
+                   _('Matric No.'),
                    _('Reg. No.'),
                    _('Fullname'),
                    _('Status'),
-                   _('Course of Studies'),
+                   _('Course of\nStudies'),
                    _('Level'),
-                   _('Score'),
-                   _('CA') ],]
+                   _('Exam\nScore'),
+                   _('CA'),
+                   _('Total'),
+                   _('Grade'),
+                   ],]
         tickets = []
+        no = 1
         for ticket in list(coursetickets):
-            row = [ticket.student.matric_number,
+            if None in (ticket.score, ticket.ca):
+                total = 'n/a'
+            else:
+                total = ticket.score + ticket.ca
+            row = [no,
+                  ticket.student.matric_number,
                   ticket.student.reg_number,
                   ticket.student.display_fullname,
@@ -665 +675 @@
                   ticket.student.certcode,
                   ticket.level,
+                  ticket.ca,
                   ticket.score,
-                  ticket.ca]
+                  total,
+                  ticket.grade,
+                  ]
             tickets.append(row)
+            no += 1
         return header + sorted(tickets, key=lambda value: value[0])