Changeset 10679 for main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students

Timestamp:

1 Nov 2013, 06:46:11 (11 years ago)

Author:

Henrik Bettermann

Message:

Only hnd_ft and nd_ft students are being forced to book accommodation.

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students

Files:

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

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

@@ -76 +76 @@
     def setUp(self):
         super(StudentUITests, self).setUp()
-
+        self.certificate.study_mode = 'hnd_ft'
         bedticket = BedTicket()
         bedticket.booking_session = 2004
@@ -104 +104 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
-
         self.assertMatches('...Book and pay for accommodation first...',
                            self.browser.contents)

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

@@ -196 +196 @@
                 academic_session = self._getSessionConfiguration(p_session)
                 if academic_session == None:
-                    return _(u'Session configuration object is not available.'), None
-            if student.state == CLEARED:
+                    return _(u'Session configuration object '
+                              'is not available.'), None
+            if student.state == CLEARED and student.current_mode in (
+                                                            'hnd_ft', 'nd_ft'):
                 # Fresh students must have booked and paid for accommodation.
                 if self._bedAvailable(student):