Changeset 8685 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

12 Jun 2012, 07:17:01 (13 years ago)

Author:

Henrik Bettermann

Message:

Add hostel allocation start end end date attributes to hostels.

Move hostel allocation parameters from configuration to hostels. AccommodationOfficer? must be able to edit these parameters.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

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

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1055 +1055 @@
         if p_category == 'bed_allocation' and student[
             'studycourse'].current_session != grok.getSite()[
-            'configuration'].accommodation_session:
+            'hostels'].accommodation_session:
                 self.flash(
                     _('Your current session does not match ' + \

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

@@ -172 +172 @@
 
         # Configure university
-        self.app['configuration'].accommodation_states = ['admitted']
-        self.app['configuration'].accommodation_session = 2004
+        self.app['hostels'].accommodation_states = ['admitted']
+        self.app['hostels'].accommodation_session = 2004
         self.app['configuration'].carry_over = True
         configuration = createObject('waeup.SessionConfiguration')
@@ -1601 +1601 @@
         self.browser.getControl(name="form.p_category").value = ['bed_allocation']
         # If student is not in accommodation session, payment cannot be processed
-        self.app['configuration'].accommodation_session = 2011
+        self.app['hostels'].accommodation_session = 2011
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...Your current session does not match...',
                            self.browser.contents)
-        self.app['configuration'].accommodation_session = 2004
+        self.app['hostels'].accommodation_session = 2004
         self.browser.getControl("Add online payment ticket").click()
         self.browser.getControl(name="form.p_category").value = ['bed_allocation']

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

@@ -320 +320 @@
         d = {}
         d['error'] = u''
-        site_configuration = grok.getSite()['configuration']
-        d['booking_session'] = site_configuration.accommodation_session
-        d['allowed_states'] = site_configuration.accommodation_states
+        hostels = grok.getSite()['hostels']
+        d['booking_session'] = hostels.accommodation_session
+        d['allowed_states'] = hostels.accommodation_states
         # Determine bed type
         studycourse = student['studycourse']
@@ -331 +331 @@
             return
         end_level = certificate.end_level
-        if entry_session == grok.getSite()[
-            'configuration'].accommodation_session:
+        if entry_session == grok.getSite()['hostels'].accommodation_session:
             bt = 'fr'
         elif current_level >= end_level: