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

Timestamp:

1 Feb 2017, 15:48:46 (8 years ago)

Author:

Henrik Bettermann

Message:

remove Departmental/Faculty? Due restrictions

Location:

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

Files:

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

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

@@ -128 +128 @@
         if not fac_dep_paid:
             return _("Please pay faculty and departmental dues first.")
-        restitution_paid = True
-        if self.student.entry_session < 2016 \
-            and self.student.current_mode == 'ug_ft':
-            restitution_paid = False
-            for ticket in self.student['payments'].values():
-                if ticket.p_category == 'restitution' and \
-                    ticket.p_session == self.level_session and \
-                    ticket.p_state == 'paid':
-                        restitution_paid = True
-                        continue
-        if not restitution_paid:
-            return _("Please pay restitution fee first.")
+        #restitution_paid = True
+        #if self.student.entry_session < 2016 \
+        #    and self.student.current_mode == 'ug_ft':
+        #    restitution_paid = False
+        #    for ticket in self.student['payments'].values():
+        #        if ticket.p_category == 'restitution' and \
+        #            ticket.p_session == self.level_session and \
+        #            ticket.p_state == 'paid':
+        #                restitution_paid = True
+        #                continue
+        #if not restitution_paid:
+        #    return _("Please pay restitution fee first.")
         if self.student.is_fresh:
             return

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

@@ -976 +976 @@
         self.browser.getLink("Edit course list").click()
         self.browser.getControl("Register course list").click()
-        self.assertTrue('Please pay restitution fee first'
-            in self.browser.contents)
-        self.app['configuration']['2004'].restitution_fee = 9999.0
-        self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['restitution']
-        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 restitution fee first'
+        #    in self.browser.contents)
+        #self.app['configuration']['2004'].restitution_fee = 9999.0
+        #self.browser.open(self.payments_path + '/addop')
+        #self.browser.getControl(name="form.p_category").value = ['restitution']
+        #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)