Changeset 13416

Timestamp:

9 Nov 2015, 10:56:53 (9 years ago)

Author:

Henrik Bettermann

Message:

Customize getAccommodationDetails.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -25 +25 @@
 from mechanize import LinkNotFoundError
 from hurry.workflow.interfaces import IWorkflowState
+from zope.event import notify
 from zope.component.hooks import setSite, clearSite
 from zope.component import getUtility, createObject, queryUtility
@@ -549 +550 @@
     def test_student_accommodation(self):
         del self.student['accommodation']['2004']
+        # All beds can be assigned
+        bed1 = self.app['hostels']['hall-1']['hall-1_A_101_A']
+        bed1.bed_type = u'regular_male_all'
+        bed2 = self.app['hostels']['hall-1']['hall-1_A_101_B']
+        bed2.bed_type = u'regular_female_all'
+        notify(grok.ObjectModifiedEvent(bed1))
+        notify(grok.ObjectModifiedEvent(bed2))
         # Login
         self.browser.open(self.login_path)
@@ -563 +571 @@
         # one bed for this student, we know that
         self.assertEqual(self.student['accommodation']['2004'].bed_coordinates,
-            'Hall 1, Block A, Room 101, Bed A (regular_male_fr)')
+            'Hall 1, Block A, Room 101, Bed A (regular_male_all)')
         # Only the hall name is displayed
         self.assertEqual(self.student['accommodation']['2004'].display_coordinates,

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

@@ -251 +251 @@
         d['expired'] = hostels.expired
         # Determine bed type
-        studycourse = student['studycourse']
-        certificate = getattr(studycourse,'certificate',None)
-        entry_session = studycourse.entry_session
-        current_level = studycourse.current_level
-        if None in (entry_session, current_level, certificate):
-            return d
-        end_level = certificate.end_level
-        if current_level == 10:
-            bt = 'pr'
-        elif entry_session == grok.getSite()['hostels'].accommodation_session:
-            bt = 'fr'
-        elif current_level >= end_level:
-            bt = 'fi'
-        else:
-            bt = 're'
+        bt = 'all'
         if student.sex == 'f':
             sex = 'female'