Changeset 7021 for main/waeup.sirp/trunk/src

Timestamp:

7 Nov 2011, 17:20:24 (13 years ago)

Author:

Henrik Bettermann

Message:

Adjust customisation and base package.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• interfaces.py (modified) (3 diffs)
• students/utils.py (modified) (3 diffs)

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

@@ -277 +277 @@
         )
 
-    fee_1 = schema.Int(
+    school_fee_base = schema.Int(
         title = u'School Fee',
         default = 0,
@@ -297 +297 @@
         )
 
-    fee_2 = schema.Int(
+    clearance = schema.Int(
         title = u'Clearance Fee',
         default = 0,
@@ -304 +304 @@
     booking_fee = schema.Int(
         title = u'Booking Fee',
-        default = 0,
-        )
-
-    maint_fee = schema.Int(
-        title = u'Maintenance Fee',
         default = 0,
         )

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

@@ -34 +34 @@
     return
 
-# To be specified in customization packages, see also view which
+# To be specified in customization packages, see also the view which
 # calls the function.
-# This function is for demonstration and testing only.
 def getPaymentDetails(category, student):
     d = {}
@@ -53 +52 @@
     d['surcharge_3'] = academic_session.surcharge_3
     if category == 'schoolfee':
-        d['amount'] = academic_session.fee_1
+        d['amount'] = academic_session.school_fee_base
         d['p_item'] = student['studycourse'].certificate.code
     elif category == 'clearance':
         d['p_item'] = student['studycourse'].certificate.code
-        d['amount'] = academic_session.fee_2
+        d['amount'] = academic_session.clearance_fee
     elif category == 'bed_allocation':
         d['p_item'] = getAccommodationDetails(student)['bt']
@@ -63 +62 @@
     return d
 
-# To be specified in customization packages, see also view which
+# To be specified in customization packages, see also the view which
 # calls the function.
-# This function is for demonstration and testing only.
 def getAccommodationDetails(student):
     d = {}