Changeset 13963

Timestamp:

21 Jun 2016, 06:30:07 (9 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.

Location:

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

Files:

• etranzact/tests.py (modified) (4 diffs)
• locales/en/LC_MESSAGES/waeup.kofa.mo (modified) (previous)
• locales/en/LC_MESSAGES/waeup.kofa.po (modified) (1 diff)
• students/browser.py (modified) (2 diffs)
• students/export.py (modified) (1 diff)
• students/reports/tests/test_student_level_statistics.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_export.py (modified) (1 diff)
• utils/utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

@@ -98 +98 @@
             % self.p_id)
         self.assertEqual(self.browser.contents,
-            'PayeeName=Anna Tester~'
+            'PayeeName=TESTER, Anna~'
             'Faculty=fac1~'
             'Department=dep1~'
@@ -181 +181 @@
             % self.p_id)
         self.assertEqual(self.browser.contents,
-            'PayeeName=Anna Tester~'
+            'PayeeName=TESTER, Anna~'
             'Faculty=fac1~'
             'Department=dep1~'
@@ -213 +213 @@
             % self.p_id)
         self.assertEqual(self.browser.contents,
-            'PayeeName=Anna Tester~'
+            'PayeeName=TESTER, Anna~'
             'Faculty=fac1~'
             'Department=dep1~'
@@ -291 +291 @@
             % self.p_id)
         self.assertEqual(self.browser.contents,
-            'PayeeName=John Anthony Tester~'
+            'PayeeName=TESTER, John Anthony~'
             'Faculty=N/A~'
             'Department=N/A~'

main/waeup.aaue/trunk/src/waeup/aaue/locales/en/LC_MESSAGES/waeup.kofa.po

@@ -107 +107 @@
 msgid "Registration Number or Applicant Id:"
 msgstr "JAMB Reg. No. or Applicant Id:"
+
+msgid "Level Report"
+msgstr "Summary of Results"
+
+msgid "Create level report"
+msgstr "Create summary of results"

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])
 

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

@@ -89 +89 @@
 
     fields = ('matric_number', 'student_id',
-              'level', 'code', 'level_session', 'score', 'ca')
+              'level', 'code', 'level_session', 'ca', 'score')
 

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_student_level_statistics.py

@@ -7 +7 @@
 from waeup.kofa.students.tests.test_catalog import CatalogTestSetup
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
-from waeup.kofa.tests.test_async import FunctionalAsyncTestCase
 from waeup.kofa.browser.tests.test_pdf import samples_dir
 

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

@@ -767 +767 @@
         self.browser.getControl(name="scores:list", index=0).value = 'abc'
         self.browser.getControl("Update scores").click()
-        self.assertTrue('Error: Score(s) and CA(s) of Anna Tester have not be updated.'
+        self.assertTrue('Error: Score(s) and CA(s) of TESTER, Anna have not be updated.'
             in self.browser.contents)
         # Scores can be removed.

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

@@ -167 +167 @@
             'display_fullname,matric_number\r\n'
             '1,,1,CRS1,100,DEP1,FAC1,100,2012,0,100,,2,Course 1,A111111,CERT1,'
-            'Anna M. Tester,234\r\n'
+            '"TESTER, Anna M.",234\r\n'
             )
         return

main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

@@ -18 +18 @@
 """Customize general helper utilities for Kofa.
 """
+
+import string
 from kofacustom.nigeria.utils.utils import NigeriaKofaUtils
 
@@ -161 +163 @@
         'Institute of Education': ('dp_ft'),
         }
+
+    def fullname(self, firstname, lastname, middlename=None):
+        """Construct fullname.
+        """
+        try:
+            lastname = lastname.upper()
+        except AttributeError:
+            pass
+        # We do not necessarily have the middlename attribute
+        if middlename:
+            givennames = '%s %s' % (firstname, middlename)
+        else:
+            givennames = '%s' % firstname
+        givennames = string.capwords(
+            givennames.replace('-', ' - ')).replace(' - ', '-')
+        fullname = '%s, %s' % (lastname, givennames)
+        if '<' in fullname:
+            return 'XXX'
+        return fullname