Changeset 13753 for main/waeup.aaue/trunk/src/waeup

Timestamp:

29 Feb 2016, 17:01:43 (9 years ago)

Author:

Henrik Bettermann

Message:

Customize checkAccommodationRequirements:
Only ug fulltime students are eligible to book accommodation.

Location:

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

Files:

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

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

@@ -597 +597 @@
     def test_student_accommodation(self):
         del self.student['accommodation']['2004']
+        self.student['studycourse'].certificate.study_mode = 'dp_ft'
         # All beds can be assigned
         bed1 = self.app['hostels']['hall-1']['hall-1_A_101_A']
@@ -612 +613 @@
         self.browser.open(self.acco_path)
         IWorkflowInfo(self.student).fireTransition('admit')
+        self.browser.getControl("Book accommodation").click()
+        self.assertTrue(
+            'You are not eligible to book accommodation.'
+            in self.browser.contents)
+        self.student['studycourse'].certificate.study_mode = 'ug_ft'
         self.browser.getControl("Book accommodation").click()
         self.assertFalse('Activation Code:' in self.browser.contents)

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

@@ -330 +330 @@
         return d
 
+    def checkAccommodationRequirements(self, student, acc_details):
+        super(CustomStudentsUtils, self).checkAccommodationRequirements(
+            student, acc_details)
+        if student.current_mode not in ('ug_ft', 'de_ft', 'mug_ft', 'mde_ft'):
+            return _('You are not eligible to book accommodation.')
+        return
+
     # AAUE prefix
     STUDENT_ID_PREFIX = u'E'