Changeset 14355

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

Files:

• interfaces.py (modified) (3 diffs)
• students/studylevel.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

@@ -158 +158 @@
         )
 
+    gst_text_book_0_fee = schema.Float(
+        title = _(u'Text Book Fee GST101 GST102 GST111 GST112'),
+        default = 0.0,
+        required = True,
+        )
+
     gst_text_book_1_fee = schema.Float(
         title = _(u'Text Book Fee GST101 and GST102'),
@@ -176 +182 @@
         )
 
-    ent_text_book_4_fee = schema.Float(
+    ent_text_book_1_fee = schema.Float(
         title = _(u'Text Book Fee ENT201'),
-        default = 0.0,
-        required = True,
-        )
-
-    gst_text_book_5_fee = schema.Float(
-        title = _(u'Text Book Fee GST101'),
-        default = 0.0,
-        required = True,
-        )
-
-    gst_text_book_6_fee = schema.Float(
-        title = _(u'Text Book Fee GST102'),
-        default = 0.0,
-        required = True,
-        )
-
-    gst_text_book_7_fee = schema.Float(
-        title = _(u'Text Book Fee GST111'),
-        default = 0.0,
-        required = True,
-        )
-
-    gst_text_book_8_fee = schema.Float(
-        title = _(u'Text Book Fee GST112'),
         default = 0.0,
         required = True,
@@ -218 +200 @@
         )
 
-    ent_registration_3_fee = schema.Float(
+    ent_registration_1_fee = schema.Float(
         title = _(u'Registration Fee ENT201'),
         default = 0.0,

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()

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

@@ -49 +49 @@
         'concessional': 'Concessional Fee',
         'id_card': 'Student ID Card',
-        'gst_text_book_1': 'Text Book Fee GST101 and GST102',
-        'gst_text_book_2': 'Text Book Fee GST111 and GST112',
+        'gst_text_book_0': 'Text Book Fee GST101 GST102 GST111 GST112',
+        'gst_text_book_1': 'Text Book Fee GST101 GST102',
+        'gst_text_book_2': 'Text Book Fee GST111 GST112',
         'gst_text_book_3': 'Text Book Fee GST222',
         'ent_text_book_4': 'Text Book Fee ENT201',
-        'gst_text_book_5': 'Text Book Fee GST101',
-        'gst_text_book_6': 'Text Book Fee GST102',
-        'gst_text_book_7': 'Text Book Fee GST111',
-        'gst_text_book_8': 'Text Book Fee GST112',
         'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
         'gst_registration_2': 'Registration Fee GST222',
@@ -83 +80 @@
         'concessional': 'Concessional Fee',
         #'id_card': 'Student ID Card',
-        'gst_text_book_1': 'Text Book Fee GST101 and GST102',
-        'gst_text_book_2': 'Text Book Fee GST111 and GST112',
+        'gst_text_book_0': 'Text Book Fee GST101 GST102 GST111 GST112',
+        'gst_text_book_1': 'Text Book Fee GST101 GST102',
+        'gst_text_book_2': 'Text Book Fee GST111 GST112',
         'gst_text_book_3': 'Text Book Fee GST222',
         'ent_text_book_4': 'Text Book Fee ENT201',
-        'gst_text_book_5': 'Text Book Fee GST101',
-        'gst_text_book_6': 'Text Book Fee GST102',
-        'gst_text_book_7': 'Text Book Fee GST111',
-        'gst_text_book_8': 'Text Book Fee GST112',
         'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
         'gst_registration_2': 'Registration Fee GST222',