Changeset 13614

Timestamp:

14 Jan 2016, 10:43:10 (9 years ago)

Author:

Henrik Bettermann

Message:

Add special_handling code 'ugft' and allocate bed space accordingly.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

• students/tests/test_browser.py (modified) (1 diff)
• students/tests/test_utils.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -348 +348 @@
     def test_student_accommodation(self):
         del self.student['accommodation']['2004']
+        self.certificate.study_mode = 'ug_pt'
         # Login
         self.browser.open(self.login_path)

main/waeup.fceokene/trunk/src/waeup/fceokene/students/tests/test_utils.py

@@ -14 +14 @@
         students_utils = getUtility(IStudentsUtils)
         acc_details  = students_utils.getAccommodationDetails(self.student)
-        self.assertEqual(acc_details['bt'], 'regular_male_fr')
+        self.assertEqual(acc_details['bt'], 'ugft_male_fr')
         self.student['studycourse'].current_level = 200
+        self.certificate.study_mode = 'ug_pt'
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_re')

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

@@ -315 +315 @@
             sex = 'male'
         special_handling = 'regular'
+        if certificate.study_mode == 'ug_ft':
+            special_handling = 'ugft'
         d['bt'] = u'%s_%s_%s' % (special_handling,sex,bt)
         return d

main/waeup.fceokene/trunk/src/waeup/fceokene/utils/utils.py

@@ -37 +37 @@
         }
 
+    SPECIAL_HANDLING_DICT = {
+        'regular': 'Regular Hostel',
+        'blocked': 'Blocked Hostel',
+        'ugft': 'Undergraduate Fulltime Hostel'
+        }
 
     PAYMENT_CATEGORIES = {