Ignore:
Timestamp:
30 Aug 2026, 11:16:40 (3 months ago)
Author:
Henrik Bettermann
Message:

Cange fullname convention.

Location:
main/kofacustom.unidel/trunk/src/kofacustom/unidel
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/test_level_report.py

    r18312 r18317  
    4141        result = lr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
    4242        self.assertEqual(result,
    43             [(u'1234', u'Bob Tester', 91, 91, '5.00',
     43            [(u'1234', u'TESTER, Bob', 91, 91, '5.00',
    4444               'Nil', 'Nil', 91, 91, 77,'5.00', '1s_st_s')])
    4545        return
  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/test_raw_score_report.py

    r18310 r18317  
    5252        result = rsr._get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
    5353        self.assertEqual(result,
    54             [(u'1234', u'Bob Tester', {'Course1': (70, 'A')})])
     54            [(u'1234', u'TESTER, Bob', {'Course1': (70, 'A')})])
    5555        self.student['studycourse']['100']['Course1'].ca = None
    5656        result = rsr._get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
    5757        self.assertEqual(result,
    58             [(u'1234', u'Bob Tester', {'Course1': ('Nil', '')})])
     58            [(u'1234', u'TESTER, Bob', {'Course1': ('Nil', '')})])
    5959        return
    6060
    … …  
    152152        result = rsr._get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
    153153        self.assertEqual(result,
    154             [(u'1234', u'Bob Tester', {'Course1': (70, 'A')})])
     154            [(u'1234', u'TESTER, Bob', {'Course1': (70, 'A')})])
    155155        self.student['studycourse']['100']['Course1'].ca = None
    156156        result = rsr._get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/test_session_results_presentation.py

    r18311 r18317  
    3535        result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
    3636        self.assertEqual(result,
    37             [[(u'D1000000', u'1234', u'Bob Tester')], [], [], [], [], [], []])
     37            [[(u'D1000000', u'1234', u'TESTER, Bob')], [], [], [], [], [], []])
    3838        self.student['studycourse']['100']['Course1'].score = 60
    3939        self.student['studycourse']['100']['Course1'].ca = 10
    4040        result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
    4141        self.assertEqual(result,
    42             [[], [], [], [], [], [(u'D1000000', u'1234', u'Bob Tester')], []])
     42            [[], [], [], [], [], [(u'D1000000', u'1234', u'TESTER, Bob')], []])
    4343        return
    4444
    … …  
    9696        result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 100)
    9797        self.assertEqual(result,
    98             [[], [], [], [], [], [(u'D1000000', u'1234', u'Bob Tester')], []])
     98            [[], [], [], [], [], [(u'D1000000', u'1234', u'TESTER, Bob')], []])
    9999        return
    100100
  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/tests/test_browser.py

    r18313 r18317  
    225225        upload_ctrl.add_file(upload_file, 'text/csv', 'myscores.csv')
    226226        self.browser.getControl("Update editable scores from").click()
    227         self.assertTrue('Anna Tester have not be updated' in self.browser.contents)
     227        self.assertTrue('TESTER, Anna have not be updated' in self.browser.contents)
    228228        # values have not been changed
    229229        self.assertEqual(
    … …  
    288288        self.browser.open(self.edit_scores_url)
    289289        self.assertFalse('No student found' in self.browser.contents)
    290         self.assertTrue('Anna Tester' in self.browser.contents)
     290        self.assertTrue('TESTER, Anna' in self.browser.contents)
    291291
    292292    def test_lecturers_can_download_attendance_sheet(self):
  • main/kofacustom.unidel/trunk/src/kofacustom/unidel/utils/utils.py

    r18313 r18317  
    1818"""Customize general helper utilities for Kofa.
    1919"""
     20import string
    2021from copy import deepcopy
    2122from kofacustom.nigeria.utils.utils import NigeriaKofaUtils
    … …  
    151152        'alero': 'Owa-Alero Campus Hostel',
    152153        }
     154
     155    def fullname(self, firstname, lastname, middlename=None):
     156        """Construct fullname.
     157        """
     158        try:
     159            lastname = lastname.upper()
     160        except AttributeError:
     161            pass
     162        # We remove single initial
     163        if firstname and len(firstname) == 1:
     164            firstname = ''
     165        if middlename and len(middlename) == 1:
     166            middlename = ''
     167        if lastname and len(lastname) == 1:
     168            lastname = ''
     169        # We construct givennames
     170        givennames = ''
     171        if middlename and firstname:
     172            givennames = '%s %s' % (firstname, middlename)
     173        elif firstname:
     174            givennames = firstname
     175        elif middlename:
     176            givennames = middlename
     177        givennames = string.capwords(
     178            givennames.replace('-', ' - ')).replace(' - ', '-')
     179        # We construct fullname
     180        fullname = ''
     181        if lastname and givennames:
     182            fullname = '%s, %s' % (lastname, givennames)
     183        elif lastname:
     184            fullname = lastname
     185        elif givennames:
     186            fullname = givennames
     187        if '<' in fullname:
     188            return 'XXX'
     189        return fullname
Note: See TracChangeset for help on using the changeset viewer.