Ignore:
Timestamp:
16 Dec 2016, 09:36:53 (8 years ago)
Author:
Henrik Bettermann
Message:

Add gst_text_book_5, gst_text_book_6, gst_text_book_7, gst_text_book_8

Location:
main/waeup.aaue/trunk/src/waeup/aaue
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

    r14296 r14348  
    159159
    160160    gst_text_book_1_fee = schema.Float(
    161         title = _(u'Text Book Fee GST101 GST102'),
     161        title = _(u'Text Book Fee GST101 and GST102'),
    162162        default = 0.0,
    163163        required = True,
     
    165165
    166166    gst_text_book_2_fee = schema.Float(
    167         title = _(u'Text Book Fee GST111 GST112'),
     167        title = _(u'Text Book Fee GST111 and GST112'),
    168168        default = 0.0,
    169169        required = True,
     
    178178    ent_text_book_4_fee = schema.Float(
    179179        title = _(u'Text Book Fee ENT201'),
     180        default = 0.0,
     181        required = True,
     182        )
     183
     184    gst_text_book_5_fee = schema.Float(
     185        title = _(u'Text Book Fee GST101'),
     186        default = 0.0,
     187        required = True,
     188        )
     189
     190    gst_text_book_6_fee = schema.Float(
     191        title = _(u'Text Book Fee GST102'),
     192        default = 0.0,
     193        required = True,
     194        )
     195
     196    gst_text_book_7_fee = schema.Float(
     197        title = _(u'Text Book Fee GST111'),
     198        default = 0.0,
     199        required = True,
     200        )
     201
     202    gst_text_book_8_fee = schema.Float(
     203        title = _(u'Text Book Fee GST112'),
    180204        default = 0.0,
    181205        required = True,
  • main/waeup.aaue/trunk/src/waeup/aaue/students/studylevel.py

    r14327 r14348  
    201201                not 'gst_registration_3' in paid_cats:
    202202                return False
    203             if course.code in ('GST101', 'GST102') and \
    204                 not 'gst_text_book_1' in paid_cats:
    205                 return False
    206             if course.code in ('GST111', 'GST112') and \
    207                 not 'gst_text_book_2' in paid_cats:
     203            if course.code == 'GST101'and \
     204                not 'gst_text_book_1' in paid_cats and \
     205                not 'gst_text_book_5' in paid_cats:
     206                return False
     207            if course.code == 'GST102'and \
     208                not 'gst_text_book_1' in paid_cats and \
     209                not 'gst_text_book_6' in paid_cats:
     210                return False
     211            if course.code == 'GST111'and \
     212                not 'gst_text_book_2' in paid_cats and \
     213                not 'gst_text_book_7' in paid_cats:
     214                return False
     215            if course.code == 'GST112'and \
     216                not 'gst_text_book_2' in paid_cats and \
     217                not 'gst_text_book_8' in paid_cats:
    208218                return False
    209219            if course.code in ('GST222',) and \
  • main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

    r14315 r14348  
    865865        configuration_1.gst_registration_1_fee = 3333.0
    866866        configuration_1.gst_text_book_1_fee = 4444.0
     867        configuration_1.gst_text_book_5_fee = 2222.0
    867868        self.app['configuration'].addSessionConfiguration(configuration_1)
    868869        course = createObject('waeup.Course')
     
    907908            in self.browser.contents)
    908909        self.browser.open(self.payments_path + '/addop')
    909         self.browser.getControl(name="form.p_category").value = ['gst_text_book_1']
     910        self.browser.getControl(name="form.p_category").value = ['gst_text_book_5']
    910911        self.browser.getControl("Create ticket").click()
    911912        self.student['payments'].values()[1].approve()
  • main/waeup.aaue/trunk/src/waeup/aaue/utils/utils.py

    r14339 r14348  
    4949        'concessional': 'Concessional Fee',
    5050        'id_card': 'Student ID Card',
    51         'gst_text_book_1': 'Text Book Fee GST101 GST102',
    52         'gst_text_book_2': 'Text Book Fee GST111 GST112',
     51        'gst_text_book_1': 'Text Book Fee GST101 and GST102',
     52        'gst_text_book_2': 'Text Book Fee GST111 and GST112',
    5353        'gst_text_book_3': 'Text Book Fee GST222',
    5454        'ent_text_book_4': 'Text Book Fee ENT201',
     55        'gst_text_book_5': 'Text Book Fee GST101',
     56        'gst_text_book_6': 'Text Book Fee GST102',
     57        'gst_text_book_7': 'Text Book Fee GST111',
     58        'gst_text_book_8': 'Text Book Fee GST112',
    5559        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    5660        'gst_registration_2': 'Registration Fee GST222',
     
    7983        'concessional': 'Concessional Fee',
    8084        #'id_card': 'Student ID Card',
    81         'gst_text_book_1': 'Text Book Fee GST101 GST102',
    82         'gst_text_book_2': 'Text Book Fee GST111 GST112',
     85        'gst_text_book_1': 'Text Book Fee GST101 and GST102',
     86        'gst_text_book_2': 'Text Book Fee GST111 and GST112',
    8387        'gst_text_book_3': 'Text Book Fee GST222',
    8488        'ent_text_book_4': 'Text Book Fee ENT201',
     89        'gst_text_book_5': 'Text Book Fee GST101',
     90        'gst_text_book_6': 'Text Book Fee GST102',
     91        'gst_text_book_7': 'Text Book Fee GST111',
     92        'gst_text_book_8': 'Text Book Fee GST112',
    8593        'gst_registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
    8694        'gst_registration_2': 'Registration Fee GST222',
Note: See TracChangeset for help on using the changeset viewer.