Changeset 15398

Timestamp:

29 Apr 2019, 16:33:50 (5 years ago)

Author:

Henrik Bettermann

Message:

Show different warming message if late course registration fee is not set.

Location:

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

Files:

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

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

@@ -154 +154 @@
             return
         try:
+            academic_session = grok.getSite()['configuration'][
+                str(self.level_session)]
             if self.student.is_postgrad:
-                deadline = grok.getSite()['configuration'][
-                        str(self.level_session)].coursereg_deadline_pg
+                deadline = academic_session.coursereg_deadline_pg
             elif self.student.current_mode.startswith('dp'):
-                deadline = grok.getSite()['configuration'][
-                        str(self.level_session)].coursereg_deadline_dp
+                deadline = academic_session.coursereg_deadline_dp
             elif self.student.current_mode.endswith('_pt'):
-                deadline = grok.getSite()['configuration'][
-                        str(self.level_session)].coursereg_deadline_pt
+                deadline = academic_session.coursereg_deadline_pt
             elif self.student.current_mode == 'found':
-                deadline = grok.getSite()['configuration'][
-                        str(self.level_session)].coursereg_deadline_found
+                deadline = academic_session.coursereg_deadline_found
             else:
-                deadline = grok.getSite()['configuration'][
-                        str(self.level_session)].coursereg_deadline
+                deadline = academic_session.coursereg_deadline
         except (TypeError, KeyError):
             return
         if not deadline or deadline > datetime.now(pytz.utc):
             return
+        if self.student.is_postgrad:
+            lcrfee = academic_session.late_pg_registration_fee
+        else:
+            lcrfee = academic_session.late_registration_fee
+        if not lcrfee:
+            return _("Course registration has been disabled.")
         if len(self.student['payments']):
             for ticket in self.student['payments'].values():

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

@@ -655 +655 @@
         self.browser.getControl("Create ticket").click()
         self.student['payments'].values()[0].approveStudentPayment()
-        # Make late registration fee fee payment
+        # Make late registration fee payment
         self.student['studycourse'].current_session = 2004
         self.browser.open(self.payments_path + '/addop')
@@ -673 +673 @@
         self.browser.getLink("Edit course list").click()
         self.assertFalse('<td>67</td>' in self.browser.contents)
+        self.app['configuration']['2004'].late_registration_fee = 0.0
         self.browser.getControl("Register course list").click()
-
-        ######################################################
-        # Temporarily disabled ug_ft course registration
-        #self.assertTrue('Course registration has been disabled'
-        #    in self.browser.contents)
-        #return
-        ######################################################
-
+        self.assertTrue('Course registration has been disabled.' in self.browser.contents)
+        self.app['configuration']['2004'].late_registration_fee = 345.0
+        self.browser.getControl("Register course list").click()
         self.assertTrue('Course registration has ended. Please pay' in self.browser.contents)
         self.student['payments'].values()[1].approve()