Changeset 14248 for main

Timestamp:

2 Nov 2016, 11:34:48 (8 years ago)

Author:

Henrik Bettermann

Message:

Replace course_registration_allowed by course_registration_forbidden.

Add further requirement for registering courses.

Shorten setPaymentDetails.

Add further payment categories.

Location:

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

Files:

• interfaces.py (modified) (1 diff)
• interswitch/browser.py (modified) (1 diff)
• students/studylevel.py (modified) (4 diffs)
• students/tests/test_browser.py (modified) (1 diff)
• students/utils.py (modified) (2 diffs)
• utils/utils.py (modified) (3 diffs)

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

@@ -152 +152 @@
         )
 
+    text_book_1_fee = schema.Float(
+        title = _(u'Text Book Fee GST101 GST102'),
+        default = 0.0,
+        required = True,
+        )
+
+    text_book_2_fee = schema.Float(
+        title = _(u'Text Book Fee GST111 GST112'),
+        default = 0.0,
+        required = True,
+        )
+
+    text_book_3_fee = schema.Float(
+        title = _(u'Text Book Fee GST222'),
+        default = 0.0,
+        required = True,
+        )
+
+    text_book_4_fee = schema.Float(
+        title = _(u'Text Book Fee ENT201'),
+        default = 0.0,
+        required = True,
+        )
+
+    registration_1_fee = schema.Float(
+        title = _(u'Registration Fee GST101 GST102 GST111 GST112'),
+        default = 0.0,
+        required = True,
+        )
+
+    registration_2_fee = schema.Float(
+        title = _(u'Registration Fee GST222'),
+        default = 0.0,
+        required = True,
+        )
+
+    registration_3_fee = schema.Float(
+        title = _(u'Registration Fee ENT201'),
+        default = 0.0,
+        required = True,
+        )
+
+    fac_dep_fee = schema.Float(
+        title = _(u'Faculty Dues'),
+        default = 0.0,
+        required = True,
+        )
+
     coursereg_deadline = schema.Datetime(
         title = _(u'FT Course Reg. Deadline'),

main/waeup.aaue/trunk/src/waeup/aaue/interswitch/browser.py

@@ -167 +167 @@
     site_name = SITE_NAME
     currency = CURRENCY
-    #pay_item_id = '101'
+    pay_item_id = '000'
 
     def update(self):

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

@@ -35 +35 @@
 from waeup.aaue.students.interfaces import (
     ICustomStudentStudyLevel, ICustomCourseTicket)
+from waeup.aaue.interfaces import MessageFactory as _
 
 
@@ -99 +100 @@
 
     @property
-    def course_registration_allowed(self):
+    def course_registration_forbidden(self):
+        fac_dep_paid = False
+        if self.student.entry_session >= 2016:
+            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.")
         if self.student.is_fresh:
-            return True
+            return
         try:
             if self.student.is_postgrad:
@@ -119 +130 @@
                         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():
@@ -128 +138 @@
                     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.")
 
     # only AAUE

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

@@ -831 +831 @@
         return
 
+    def test_course_registration_forbidden(self):
+        IWorkflowState(self.student).setState('school fee paid')
+        self.student['studycourse'].entry_session = 2016
+        self.student['studycourse'].current_session = 2016
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.browser.getLink("Study Course").click()
+        self.browser.getLink("Add course list").click()
+        self.browser.getControl("Create course list now").click()
+        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('Course list has been registered'
+            in self.browser.contents)
+        return
+
     def test_student_clearance(self):
         # Student cant login if their password is not set

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

@@ -200 +200 @@
             else:
                 return _(u'No bed allocated.'), None
-        elif category == 'welfare' and not student.is_postgrad:
-            amount = academic_session.welfare_fee
-        elif category == 'id_card' and not student.is_postgrad:
-            amount = academic_session.id_card_fee
-        elif category == 'union' and not student.is_postgrad:
-            amount = academic_session.union_fee
-        elif category == 'lapel' and not student.is_postgrad:
-            amount = academic_session.lapel_fee
-        elif category == 'matric_gown' and not student.is_postgrad:
-            amount = academic_session.matric_gown_fee
-        elif category == 'concessional' and not student.is_postgrad:
-            amount = academic_session.concessional_fee
         elif student.current_mode == 'found' and category not in (
             'schoolfee', 'clearance', 'late_registration'):
@@ -327 +315 @@
             else:
                 amount += academic_session.penalty_ug
+        elif not student.is_postgrad:
+            fee_name = category + '_fee'
+            amount = getattr(academic_session, fee_name, 0.0)
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None

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

@@ -48 +48 @@
         'concessional': 'Concessional Fee',
         'id_card': 'Student ID Card',
+        'text_book_1': 'Text Book Fee GST101 GST102',
+        'text_book_2': 'Text Book Fee GST111 GST112',
+        'text_book_3': 'Text Book Fee GST222',
+        'text_book_4': 'Text Book Fee ENT201',
+        'registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
+        'registration_2': 'Registration Fee GST222',
+        'registration_3': 'Registration Fee ENT201',
+        'fac_dep': 'Faculty and Departmental Dues',
         }
 
@@ -69 +77 @@
         'concessional': 'Concessional Fee',
         #'id_card': 'Student ID Card',
+        'text_book_1': 'Text Book Fee GST101 GST102',
+        'text_book_2': 'Text Book Fee GST111 GST112',
+        'text_book_3': 'Text Book Fee GST222',
+        'text_book_4': 'Text Book Fee ENT201',
+        'registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
+        'registration_2': 'Registration Fee GST222',
+        'registration_3': 'Registration Fee ENT201',
+        'fac_dep': 'Faculty and Departmental Dues',
         }
 
@@ -91 +107 @@
         'matric_gown': 'Matriculation Gown Fee',
         'id_card': 'Student ID Card',
+        'text_book_1': 'Text Book Fee GST101 GST102',
+        'text_book_2': 'Text Book Fee GST111 GST112',
+        'text_book_3': 'Text Book Fee GST222',
+        'text_book_4': 'Text Book Fee ENT201',
+        'registration_1': 'Registration Fee GST101 GST102 GST111 GST112',
+        'registration_2': 'Registration Fee GST222',
+        'registration_3': 'Registration Fee ENT201',
+        'fac_dep': 'Faculty and Departmental Dues',
         }