Changeset 15268


Ignore:
Timestamp:
17 Dec 2018, 16:43:51 (6 years ago)
Author:
Henrik Bettermann
Message:

Append desired_hostel to p_item.

Location:
main/waeup.uniben/trunk/src/waeup/uniben/students
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py

    r15251 r15268  
    974974    def test_student_accommodation(self):
    975975        self.app['hostels'].allocation_expiration = 7
     976        self.student['accommodation'].desired_hostel = u'hall-1'
    976977        bed = Bed()
    977978        bed.bed_id = u'hall-1_A_101_C'
     
    991992        self.browser.getControl("Create ticket").click()
    992993        p_ticket = self.student['payments'].values()[0]
     994        self.assertEqual(p_ticket.p_item, 'regular_male_fr (hall-1)')
    993995        p_ticket.approveStudentPayment()
    994996        # The new HOS-0 pin has been created.
  • main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

    r15108 r15268  
    235235        elif category == 'bed_allocation':
    236236            p_item = self.getAccommodationDetails(student)['bt']
     237            desired_hostel = student['accommodation'].desired_hostel
     238            if desired_hostel:
     239                p_item = u'%s (%s)' % (p_item, desired_hostel)
    237240            amount = academic_session.booking_fee
    238241            if student.is_postgrad:
Note: See TracChangeset for help on using the changeset viewer.