Changeset 13036 for main/waeup.aaue/trunk/src

Timestamp:

5 Jun 2015, 14:35:19 (9 years ago)

Author:

Henrik Bettermann

Message:

Activate and customize late course registration payment. Fresh students can register without restriction.

Location:

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

Files:

• studylevel.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -21 +21 @@
 """
 import grok
+import pytz
+from datetime import datetime
 from zope.component.interfaces import IFactory
 from zope.component import createObject
 from zope.interface import implementedBy
 from waeup.kofa.utils.helpers import attrs_to_fields
+from waeup.kofa.interfaces import CREATED
 from waeup.kofa.students.studylevel import (
     StudentStudyLevel, CourseTicket,
@@ -58 +61 @@
     def gpa_params_rectified(self):
         return self.gpa_params
+
+    @property
+    def course_registration_allowed(self):
+        if self.student.is_fresh:
+            return True
+        try:
+            deadline = grok.getSite()['configuration'][
+                    str(self.level_session)].coursereg_deadline
+        except TypeError, KeyError:
+            return True
+        payment_made = False
+        if len(self.student['payments']):
+            for ticket in self.student['payments'].values():
+                if ticket.p_category == 'late_registration' and \
+                    ticket.p_session == self.level_session and \
+                    ticket.p_state == 'paid':
+                        payment_made = True
+        if deadline and deadline < datetime.now(pytz.utc) and not payment_made:
+            return False
+        return True
 
 CustomStudentStudyLevel = attrs_to_fields(

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -264 +264 @@
             '2004'].coursereg_deadline = datetime.now(pytz.utc) - delta
         IWorkflowState(self.student).setState('school fee paid')
+        # Current session is 2004. Here we test course registration for
+        # returning students.
+        self.student['studycourse'].entry_session = 2003
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = self.student_id
@@ -290 +293 @@
         self.assertTrue('Course list has been registered' in self.browser.contents)
         self.assertEqual(self.student.state, 'courses registered')
+        # Reset student and check if fresh students are always allowed to
+        # register courses.
+        self.student['studycourse'].entry_session = 2004
+        del self.student['payments'][value]
+        IWorkflowState(self.student).setState('school fee paid')
+        self.browser.open(self.studycourse_path + '/100/edit')
+        self.browser.getControl("Register course list").click()
+        self.assertTrue('Course list has been registered' in self.browser.contents)
+        return
+
 
     def deactivated_test_student_course_registration(self):
-
         # Add more courses
         self.course2 = createObject('waeup.Course')