Ignore:
Timestamp:
13 Jan 2017, 12:33:16 (8 years ago)
Author:
Henrik Bettermann
Message:

Adjust passed_params.

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

Legend:

Unmodified
Added
Removed

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

    r14389 r14393  
    3030        result = get_students('fac1', 'dep1', 2010, 100)
    3131        self.assertEqual(result,
    32             [(u'1234', u'TESTER, Bob', 30, 30, '5.00', 'nil', 0, 30, 30, '5.000', 'Proceed')])
     32            [(u'1234', u'TESTER, Bob', 30, 30, '5.000', 'nil', '', 30, 30, '5.000', 'Proceed')])
    3333        return
    3434

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

    r14389 r14393  
    3131        result = get_students('fac1', 'dep1', 2010, 100)
    3232        self.assertEqual(result,
    33             [[], [], [], [], [], [], [(u'E1000000', u'1234', u'TESTER, Bob')]])
     33            [[(u'E1000000', u'1234', u'TESTER, Bob')], [], [], [], [], [], []])
    3434        self.student['studycourse']['100']['Course1'].score = 60
    3535        self.student['studycourse']['100']['Course1'].ca = 10

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

    r14388 r14393  
    9292        credits_failed = 0
    9393        credits_passed = 0
    94         no_courses_not_taken = 0
     94        courses_not_taken = ''
    9595        for ticket in self.values():
    9696            if None not in (ticket.score, ticket.ca):
    … …  
    106106                    credits_passed += ticket.credits
    107107            else:
    108                 no_courses_not_taken += 1
     108                courses_not_taken += '%s ' % ticket.code
    109109        if not len(courses_failed):
    110110            courses_failed = 'nil'
    111111        return (passed, failed, credits_passed,
    112112                credits_failed, courses_failed,
    113                 no_courses_not_taken)
     113                courses_not_taken)
    114114
    115115    @property
Note: See TracChangeset for help on using the changeset viewer.