Changeset 14457

Timestamp:

25 Jan 2017, 09:55:44 (8 years ago)

Author:

Henrik Bettermann

Message:

Adjust sekeleton package.

Location:

main/kofacustom.skeleton/trunk/src/kofacustom/skeleton

Files:

• interfaces.py (modified) (5 diffs)
• students/tests/test_export.py (modified) (2 diffs)

main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/interfaces.py

@@ -25 +25 @@
 _ = MessageFactory = zope.i18nmessageid.MessageFactory('kofacustom.skeleton')
 
-# It's recommended to replicate all fields from the base package here.
 class ICustomSessionConfiguration(ISessionConfiguration):
     """A session configuration object.
@@ -32 +31 @@
     # Base fees, do not remove.
 
-    school_fee_base = schema.Float(
-        title = _(u'School Fee (ignored)'),
-        default = 0.0,
-        required = False,
-        )
-
     clearance_fee = schema.Float(
-        title = _(u'Clearance Fee (ignored)'),
+        title = _(u'Acceptance Fee'),
         default = 0.0,
         required = False,
@@ -45 +38 @@
 
     booking_fee = schema.Float(
-        title = _(u'Booking Fee'),
+        title = _(u'Bed Booking Fee'),
         default = 0.0,
         required = False,
@@ -51 +44 @@
 
     maint_fee = schema.Float(
-        title = _(u'Maintenance Fee (ignored)'),
+        title = _(u'Rent (fallback)'),
+        default = 0.0,
+        required = False,
+        )
+
+    late_registration_fee = schema.Float(
+        title = _(u'Late Course Reg. Fee'),
         default = 0.0,
         required = False,
@@ -61 +60 @@
         required = False,
         )
+
+    transfer_fee = schema.Float(
+        title = _(u'Transfer Fee'),
+        default = 0.0,
+        required = False,
+        )
+
 
     # Additional fees in custom package add here

main/kofacustom.skeleton/trunk/src/kofacustom/skeleton/students/tests/test_export.py

@@ -4 +4 @@
 from waeup.kofa.interfaces import ICSVExporter
 from waeup.kofa.schoolgrades import ResultEntry
-from waeup.kofa.students.tests.test_batching import StudentImportExportSetup
+from waeup.kofa.students.tests.test_batching import (
+    StudentImportExportSetup, curr_year)
 from kofacustom.skeleton.utils.utils import CustomKofaUtils
 from kofacustom.skeleton.students.export import (
@@ -107 +108 @@
             'r_pay_reference,thirdparty_amt,student_id,state,'
             'current_session\r\n'
-            '666,12.12,2012-04-01 13:12:01#,,schoolfee,1,my-id,p-item,'
-            '100,2012,paid,2012-04-01 14:12:01#,,12.12,'
+            '666,12.12,%s-04-01 13:12:01#,,schoolfee,1,my-id,p-item,'
+            '100,%s,paid,%s-04-01 14:12:01#,,12.12,'
             '789,r-code,interswatch,,,,A111111,created,2012\r\n',
-            result
+            % (curr_year-6, curr_year-6, curr_year-6), result
             )
         return