Changeset 18317 for main/kofacustom.unidel
- Timestamp:
- 30 Aug 2026, 11:16:40 (3 months ago)
- Location:
- main/kofacustom.unidel/trunk/src/kofacustom/unidel
- Files:
-
- 6 edited
-
students/reports/tests/._test_level_report.py (modified) (previous)
-
students/reports/tests/test_level_report.py (modified) (1 diff)
-
students/reports/tests/test_raw_score_report.py (modified) (2 diffs)
-
students/reports/tests/test_session_results_presentation.py (modified) (2 diffs)
-
students/tests/test_browser.py (modified) (2 diffs)
-
utils/utils.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/test_level_report.py
r18312 r18317 41 41 result = lr._get_students('fac1', 'dep1', 'CERT1', 2010, 100) 42 42 self.assertEqual(result, 43 [(u'1234', u' Bob Tester', 91, 91, '5.00',43 [(u'1234', u'TESTER, Bob', 91, 91, '5.00', 44 44 'Nil', 'Nil', 91, 91, 77,'5.00', '1s_st_s')]) 45 45 return -
main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/reports/tests/test_raw_score_report.py
r18310 r18317 52 52 result = rsr._get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes) 53 53 self.assertEqual(result, 54 [(u'1234', u' Bob Tester', {'Course1': (70, 'A')})])54 [(u'1234', u'TESTER, Bob', {'Course1': (70, 'A')})]) 55 55 self.student['studycourse']['100']['Course1'].ca = None 56 56 result = rsr._get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes) 57 57 self.assertEqual(result, 58 [(u'1234', u' Bob Tester', {'Course1': ('Nil', '')})])58 [(u'1234', u'TESTER, Bob', {'Course1': ('Nil', '')})]) 59 59 return 60 60 … … 152 152 result = rsr._get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes) 153 153 self.assertEqual(result, 154 [(u'1234', u' Bob Tester', {'Course1': (70, 'A')})])154 [(u'1234', u'TESTER, Bob', {'Course1': (70, 'A')})]) 155 155 self.student['studycourse']['100']['Course1'].ca = None 156 156 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 35 35 result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 100) 36 36 self.assertEqual(result, 37 [[(u'D1000000', u'1234', u' Bob Tester')], [], [], [], [], [], []])37 [[(u'D1000000', u'1234', u'TESTER, Bob')], [], [], [], [], [], []]) 38 38 self.student['studycourse']['100']['Course1'].score = 60 39 39 self.student['studycourse']['100']['Course1'].ca = 10 40 40 result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 100) 41 41 self.assertEqual(result, 42 [[], [], [], [], [], [(u'D1000000', u'1234', u' Bob Tester')], []])42 [[], [], [], [], [], [(u'D1000000', u'1234', u'TESTER, Bob')], []]) 43 43 return 44 44 … … 96 96 result = sr._get_students('fac1', 'dep1', 'CERT1', 2010, 100) 97 97 self.assertEqual(result, 98 [[], [], [], [], [], [(u'D1000000', u'1234', u' Bob Tester')], []])98 [[], [], [], [], [], [(u'D1000000', u'1234', u'TESTER, Bob')], []]) 99 99 return 100 100 -
main/kofacustom.unidel/trunk/src/kofacustom/unidel/students/tests/test_browser.py
r18313 r18317 225 225 upload_ctrl.add_file(upload_file, 'text/csv', 'myscores.csv') 226 226 self.browser.getControl("Update editable scores from").click() 227 self.assertTrue(' Anna Testerhave not be updated' in self.browser.contents)227 self.assertTrue('TESTER, Anna have not be updated' in self.browser.contents) 228 228 # values have not been changed 229 229 self.assertEqual( … … 288 288 self.browser.open(self.edit_scores_url) 289 289 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) 291 291 292 292 def test_lecturers_can_download_attendance_sheet(self): -
main/kofacustom.unidel/trunk/src/kofacustom/unidel/utils/utils.py
r18313 r18317 18 18 """Customize general helper utilities for Kofa. 19 19 """ 20 import string 20 21 from copy import deepcopy 21 22 from kofacustom.nigeria.utils.utils import NigeriaKofaUtils … … 151 152 'alero': 'Owa-Alero Campus Hostel', 152 153 } 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.
