Changeset 14355 for main/waeup.aaue/trunk/src/waeup/aaue/students

Timestamp:

19 Dec 2016, 11:00:36 (8 years ago)

Author:

Henrik Bettermann

Message:

Revert r14348.

Add gst_text_book_fee_0.

Location:

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

Files:

• studylevel.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -183 +183 @@
                 return False
             if course.code in ('ENT201',) and \
-                not 'gst_registration_3' in paid_cats:
-                return False
-            if course.code == 'GST101'and \
+                not 'ent_registration_1' in paid_cats:
+                return False
+            if course.code in ('GST101', 'GST102') and \
                 not 'gst_text_book_1' in paid_cats and \
-                not 'gst_text_book_5' in paid_cats:
-                return False
-            if course.code == 'GST102'and \
-                not 'gst_text_book_1' in paid_cats and \
-                not 'gst_text_book_6' in paid_cats:
-                return False
-            if course.code == 'GST111'and \
+                not 'gst_text_book_0' in paid_cats:
+                return False
+            if course.code in ('GST111', 'GST112') and \
                 not 'gst_text_book_2' in paid_cats and \
-                not 'gst_text_book_7' in paid_cats:
-                return False
-            if course.code == 'GST112'and \
-                not 'gst_text_book_2' in paid_cats and \
-                not 'gst_text_book_8' in paid_cats:
+                not 'gst_text_book_0' in paid_cats:
                 return False
             if course.code in ('GST222',) and \
@@ -205 +197 @@
                 return False
             if course.code in ('ENT201',) and \
-                not 'gst_text_book_4' in paid_cats:
+                not 'ent_text_book_1' in paid_cats:
                 return False
             return True

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

@@ -865 +865 @@
         configuration_1.gst_registration_1_fee = 3333.0
         configuration_1.gst_text_book_1_fee = 4444.0
-        configuration_1.gst_text_book_5_fee = 2222.0
+        configuration_1.gst_text_book_0_fee = 2222.0
         self.app['configuration'].addSessionConfiguration(configuration_1)
         course = createObject('waeup.Course')
@@ -908 +908 @@
             in self.browser.contents)
         self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['gst_text_book_5']
+        self.browser.getControl(name="form.p_category").value = ['gst_text_book_0']
         self.browser.getControl("Create ticket").click()
         self.student['payments'].values()[1].approve()