Changeset 14501

Timestamp:

3 Feb 2017, 17:34:51 (8 years ago)

Author:

Henrik Bettermann

Message:

Remove Departmental/Faculty? Due restrictions.

Location:

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

Files:

• students/studylevel.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -117 +117 @@
     @property
     def course_registration_forbidden(self):
-        fac_dep_paid = True
-        if self.student.entry_session >= 2016:
-            fac_dep_paid = False
-            for ticket in self.student['payments'].values():
-                if ticket.p_category == 'fac_dep' and \
-                    ticket.p_session == self.level_session and \
-                    ticket.p_state == 'paid':
-                        fac_dep_paid = True
-                        continue
-        if not fac_dep_paid:
-            return _("Please pay faculty and departmental dues first.")
+        #fac_dep_paid = True
+        #if self.student.entry_session >= 2016:
+        #    fac_dep_paid = False
+        #    for ticket in self.student['payments'].values():
+        #        if ticket.p_category == 'fac_dep' and \
+        #            ticket.p_session == self.level_session and \
+        #            ticket.p_state == 'paid':
+        #                fac_dep_paid = True
+        #                continue
+        #if not fac_dep_paid:
+        #    return _("Please pay faculty and departmental dues first.")
         restitution_paid = True
         if self.student.entry_session < 2016 \

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

@@ -947 +947 @@
         self.browser.getLink("Edit course list").click()
         self.browser.getControl("Register course list").click()
-        self.assertTrue('Please pay faculty and departmental dues first'
-            in self.browser.contents)
-        configuration_1 = createObject('waeup.SessionConfiguration')
-        configuration_1.academic_session = 2016
-        configuration_1.fac_dep_fee = 9999.0
-        self.app['configuration'].addSessionConfiguration(configuration_1)
-        self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['fac_dep']
-        self.browser.getControl("Create ticket").click()
-        self.student['payments'].values()[0].approveStudentPayment()
-        self.browser.open(self.studycourse_path + '/100/edit')
-        self.browser.getControl("Register course list").click()
+        #self.assertTrue('Please pay faculty and departmental dues first'
+        #    in self.browser.contents)
+        #configuration_1 = createObject('waeup.SessionConfiguration')
+        #configuration_1.academic_session = 2016
+        #configuration_1.fac_dep_fee = 9999.0
+        #self.app['configuration'].addSessionConfiguration(configuration_1)
+        #self.browser.open(self.payments_path + '/addop')
+        #self.browser.getControl(name="form.p_category").value = ['fac_dep']
+        #self.browser.getControl("Create ticket").click()
+        #self.student['payments'].values()[0].approveStudentPayment()
+        #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)

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

@@ -89 +89 @@
         'gst_registration_2': 'Registration Fee GST222',
         'ent_registration_3': 'Registration Fee ENT201',
-        'fac_dep': 'Faculty and Departmental Dues',
+        #'fac_dep': 'Faculty and Departmental Dues',
         'restitution': 'Restitution Fee',
         }