Changeset 9614

Timestamp:

11 Nov 2012, 16:21:21 (12 years ago)

Author:

Henrik Bettermann

Message:

Set bed type correctly.

Location:

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

Files:

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

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

@@ -14 +14 @@
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_fr')
+
         self.student['studycourse'].current_level = 200
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 210
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
         self.student['studycourse'].current_level = 300
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_fi')
+
         self.student['studycourse'].current_level = 400
         acc_details  = students_utils.getAccommodationDetails(self.student)
-        self.assertEqual(acc_details['bt'], 'regular_male_fi')
+        self.assertEqual(acc_details['bt'], 'regular_male_fr')
+
         self.student['studycourse'].current_level = 500
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 510
+        acc_details  = students_utils.getAccommodationDetails(self.student)
+        self.assertEqual(acc_details['bt'], 'regular_male_re')
+
+        self.student['studycourse'].current_level = 600
         acc_details  = students_utils.getAccommodationDetails(self.student)
         self.assertEqual(acc_details['bt'], 'regular_male_fi')

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

@@ -204 +204 @@
         if current_level == 10:
             bt = 'pr'
-        elif current_level == 100:
+        elif current_level in (100, 400):
             bt = 'fr'
-        elif current_level >= 300:
+        elif current_level in (300, 600):
             bt = 'fi'
         else: