Changeset 14506 for main


Ignore:
Timestamp:
5 Feb 2017, 08:01:42 (8 years ago)
Author:
Henrik Bettermann
Message:

Replace 'NIL' by 'Nil'.

Location:
main/waeup.aaue/trunk/src/waeup/aaue/students
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_level_report.py

    r14428 r14506  
    3131        self.assertEqual(result,
    3232            [(u'1234', u'TESTER, Bob', 30, 30, '5.000',
    33                'NIL', 'NIL', 30, 30, '5.000', 'Proceed')])
     33               'Nil', 'Nil', 30, 30, '5.000', 'Proceed')])
    3434        return
    3535

  • main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py

    r14496 r14506  
    5050        result = get_students('fac1', 'dep1', 'CERT1', 2010, 100, course_codes)
    5151        self.assertEqual(result,
    52             [(u'1234', u'TESTER, Bob', {'Course1': ('NIL', '')})])
     52            [(u'1234', u'TESTER, Bob', {'Course1': ('Nil', '')})])
    5353        return
    5454

  • main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

    r14501 r14506  
    108108                courses_not_taken += '%s ' % ticket.code
    109109        if not len(courses_failed):
    110             courses_failed = 'NIL'
     110            courses_failed = 'Nil'
    111111        if not len(courses_not_taken):
    112             courses_not_taken = 'NIL'
     112            courses_not_taken = 'Nil'
    113113        return (passed, failed, credits_passed,
    114114                credits_failed, courses_failed,
    … …  
    197197                return 'FRNS'
    198198            if len(self.passed_params[5]) \
    199                 and not self.passed_params[5] == 'NIL':
     199                and not self.passed_params[5] == 'Nil':
    200200                return 'FRNS'
    201201            if self.cumulative_params[0] < failed_limit:

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

    r14487 r14506  
    8585                return 0
    8686            if len(not_taken_courses) \
    87                 and not not_taken_courses == 'NIL':
     87                and not not_taken_courses == 'Nil':
    8888                return 0
    8989        elif level_obj.gpa_params[1] < 30:
Note: See TracChangeset for help on using the changeset viewer.