Changeset 14247

Timestamp:

2 Nov 2016, 07:14:58 (8 years ago)

Author:

Henrik Bettermann

Message:

Replace course_registration_allowed by course_registration_forbidden method.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (2 diffs)
• src/waeup/kofa/students/interfaces.py (modified) (1 diff)
• src/waeup/kofa/students/studylevel.py (modified) (3 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.4.2.dev0 (unreleased)
 =======================
+
+* Replace `course_registration_allowed` by `course_registration_forbidden`
+  method.
 
 * Add export purge button.

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -1592 +1592 @@
             emit_lock_message(self)
             return
-        elif not self.context.course_registration_allowed:
+        try:
+            deadline = grok.getSite()['configuration'][
+                str(self.context.level_session)].coursereg_deadline
+        except (TypeError, KeyError):
+            deadline = None
+        if deadline and deadline < datetime.now(pytz.utc):
             self.flash(_(
                 "Course registration has ended. "
@@ -2724 +2729 @@
                 mapping = {'a':max_credits}), type="warning")
             return
-        if not self.context.course_registration_allowed:
-            self.flash(_(
-                "Course registration has ended. "
-                "Please pay the late registration fee."), type="warning")
-            #self.redirect(self.url(self.context))
+        msg = self.context.course_registration_forbidden
+        if msg:
+            self.flash(msg, type="warning")
             return
         IWorkflowInfo(self.context.student).fireTransition(

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -555 +555 @@
     gpa_params_rectified = Attribute('Corrected sessional GPA parameters')
     gpa_params = Attribute('GPA parameters for this level.')
-    cumulative_params = Attribute('Cumulative GPA and other cumulative parameters for this level')
-    course_registration_allowed = Attribute('True if registerin courses is allowed')
+    cumulative_params = Attribute(
+        'Cumulative GPA and other cumulative parameters for this level')
+    course_registration_forbidden = Attribute(
+        'Return error message if course registration is forbidden')
 
     level = schema.Choice(

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

@@ -32 +32 @@
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.kofa.students.vocabularies import StudyLevelSource
+from waeup.kofa.interfaces import MessageFactory as _
 
 def find_carry_over(ticket):
@@ -223 +224 @@
 
     @property
-    def course_registration_allowed(self):
+    def course_registration_forbidden(self):
         try:
             deadline = grok.getSite()['configuration'][
                 str(self.level_session)].coursereg_deadline
         except (TypeError, KeyError):
-            return True
+            return 
         if not deadline or deadline > datetime.now(pytz.utc):
-            return True
-        payment_made = False
+            return 
         if len(self.student['payments']):
             for ticket in self.student['payments'].values():
@@ -237 +237 @@
                     ticket.p_session == self.level_session and \
                     ticket.p_state == 'paid':
-                        payment_made = True
-        if payment_made:
-            return True
-        return False
+                        return
+        return _("Course registration has ended. "
+                 "Please pay the late registration fee.")
 
     def addCourseTicket(self, ticket, course):