Changeset 14117 for main

Timestamp:

23 Aug 2016, 09:41:32 (8 years ago)

Author:

Henrik Bettermann

Message:

Implement different course registration deadlines and fees (untested!)

Location:

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

Files:

• interfaces.py (modified) (2 diffs)
• students/studylevel.py (modified) (1 diff)
• students/utils.py (modified) (1 diff)

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

@@ -110 +110 @@
         )
 
+    late_pg_registration_fee = schema.Float(
+        title = _(u'Late PG Course Reg. Fee'),
+        default = 0.0,
+        required = True,
+        )
+
     welfare_fee = schema.Float(
         title = _(u'AAU Student Welfare Assurance Fee'),
@@ -141 +147 @@
 
     coursereg_deadline = schema.Datetime(
-        title = _(u'Course Reg. Deadline'),
+        title = _(u'FT Course Reg. Deadline'),
+        required = False,
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    coursereg_deadline_pg = schema.Datetime(
+        title = _(u'PG Course Reg. Deadline'),
+        required = False,
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    coursereg_deadline_pt = schema.Datetime(
+        title = _(u'PT Course Reg. Deadline'),
+        required = False,
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    coursereg_deadline_dp = schema.Datetime(
+        title = _(u'DP Course Reg. Deadline'),
+        required = False,
+        description = _('Example: ') + u'2011-12-31 23:59:59+01:00',
+        )
+
+    coursereg_deadline_found = schema.Datetime(
+        title = _(u'FOUND Course Reg. Deadline'),
         required = False,
         description = _('Example: ') + u'2011-12-31 23:59:59+01:00',

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

@@ -99 +99 @@
             return True
         try:
-            deadline = grok.getSite()['configuration'][
-                    str(self.level_session)].coursereg_deadline
+            if self.student.is_postgrad:
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline_pg
+            elif self.student.current_mode.startswith('dp'):
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline_dp
+            elif self.student.current_mode.endswith('_pt'):
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline_pt
+            elif self.student.current_mode == 'found':
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline_found
+            else:
+                deadline = grok.getSite()['configuration'][
+                        str(self.level_session)].coursereg_deadline
         except (TypeError, KeyError):
             return True

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

@@ -227 +227 @@
                     gateway_net_amt(academic_session.lapel_fee)
         elif category == 'late_registration':
-            amount = academic_session.late_registration_fee
+            if student.is_postgrad:
+                amount = academic_session.late_pg_registration_fee
+            else:
+                amount = academic_session.late_registration_fee
         elif category.startswith('schoolfee'):
             try: