Changeset 15268 for main

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:

• tests/test_browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py

@@ -974 +974 @@
     def test_student_accommodation(self):
         self.app['hostels'].allocation_expiration = 7
+        self.student['accommodation'].desired_hostel = u'hall-1'
         bed = Bed()
         bed.bed_id = u'hall-1_A_101_C'
@@ -991 +992 @@
         self.browser.getControl("Create ticket").click()
         p_ticket = self.student['payments'].values()[0]
+        self.assertEqual(p_ticket.p_item, 'regular_male_fr (hall-1)')
         p_ticket.approveStudentPayment()
         # The new HOS-0 pin has been created.

main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py

@@ -235 +235 @@
         elif category == 'bed_allocation':
             p_item = self.getAccommodationDetails(student)['bt']
+            desired_hostel = student['accommodation'].desired_hostel
+            if desired_hostel:
+                p_item = u'%s (%s)' % (p_item, desired_hostel)
             amount = academic_session.booking_fee
             if student.is_postgrad: