Changeset 9905

Timestamp:

22 Jan 2013, 08:55:00 (12 years ago)

Author:

Henrik Bettermann

Message:

Remove school fee installment payments and restricted course registration. Seems that all these customizations have been a waste of time.

Location:

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

Files:

• etranzact/tests.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• students/browser.py (modified) (2 diffs)
• students/interfaces.py (modified) (2 diffs)
• students/student.py (modified) (1 diff)
• students/studylevel.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (9 diffs)
• students/utils.py (modified) (5 diffs)
• utils/utils.py (modified) (1 diff)

main/waeup.aaue/trunk/src/waeup/aaue/etranzact/tests.py

@@ -50 +50 @@
         # Managers can add online payment tickets
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-        self.app['configuration']['2004'].school_fee_base = 1234.0
+        self.app['configuration']['2004'].school_fee = 1234.0
         self.browser.open(self.payments_path)
         IWorkflowState(self.student).setState('cleared')
         self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
@@ -81 +81 @@
             'RETURN_TYPE=%s&'
             'PROGRAMME_TYPE=CERT1&'
-            'PAYMENT_TYPE=School Fee 1st instalment&'
+            'PAYMENT_TYPE=School Fee&'
             'ACADEMIC_SESSION=2004/2005&'
             'MATRIC_NO=E1000000&'

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

@@ -32 +32 @@
     # Base fees, do not remove.
 
-    school_fee_base = schema.Float(
-        title = _(u'School Fee Instalments'),
+    #school_fee_base = schema.Float(
+    #    title = _(u'School Fee Instalments'),
+    #    default = 0.0,
+    #    required = False,
+    #    )
+
+    school_fee = schema.Float(
+        title = _(u'School Fee'),
         default = 0.0,
         required = False,

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

@@ -26 +26 @@
 
 from waeup.aaue.students.interfaces import (
-    ICustomStudentOnlinePayment, ICustomCourseTicketAdd)
+    ICustomStudentOnlinePayment)
 
 class CustomOnlinePaymentDisplayFormPage(NigeriaOnlinePaymentDisplayFormPage):
@@ -53 +53 @@
     form_fields['creation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     form_fields['payment_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-
-class CourseTicketAddFormPage2(CourseTicketAddFormPage):
-    """Add a course ticket by student.
-    """
-    grok.name('ctadd')
-    grok.require('waeup.handleStudent')
-    form_fields = grok.AutoFields(ICustomCourseTicketAdd)

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

@@ -30 +30 @@
 from waeup.aaue.payments.interfaces import ICustomOnlinePayment
 from waeup.aaue.interfaces import MessageFactory as _
-
-class CourseSource(BasicContextualSourceFactory):
-    """A course source delivers all courses inside the portal by looking
-       up a catalog.
-    """
-    def getValues(self, context):
-        catalog = getUtility(ICatalog, name='courses_catalog')
-        courses = sorted(list(catalog.searchResults(
-            code=(None, None))),key=lambda value: value.code)
-        payments = context.student.getPaymentTuples()
-        if (context.student.current_session, 'schoolfee_2', 'paid') in payments:
-            pass
-        else:
-            courseslist = list(courses)
-            for course in courseslist:
-                if course.semester == 2:
-                    courses.remove(course)
-        return courses
-
-    def getToken(self, context, value):
-        return value.code
-
-    def getTitle(self, context, value):
-        return "%s - %s (%d)" % (
-            value.code, value.title[:64], value.semester)
 
 class ICustomStudentBase(INigeriaStudentBase):
@@ -119 +94 @@
     """
 
-class ICustomCourseTicketAdd(IKofaObject):
-    """An interface for adding course tickets.
-
-    """
-    course = schema.Choice(
-        title = _(u'Course'),
-        source = CourseSource(),
-        readonly = False,
-        )
-
 class ICustomStudentUpdateByRegNo(INigeriaStudentUpdateByRegNo):
     """Representation of a student. Skip regular reg_number validation.

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

@@ -35 +35 @@
     grok.provides(ICustomStudent)
 
-    def getPaymentTuples(self):
-        """Special AAUE method needed for selecting courses in semesters
-        the student has paid for.
-        """
-        payments = [(p.p_session, p.p_category, p.p_state)
-            for p in self['payments'].values()]
-        return payments
-
 # Set all attributes of Student required in IStudent as field
 # properties. Doing this, we do not have to set initial attributes

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

@@ -39 +39 @@
     grok.provides(ICustomStudentStudyLevel)
 
-    def addCertCourseTickets(self, cert):
-        """Collect all certificate courses and create course
-        tickets automatically.
-
-        Add ticket only if student has paid for the course.semester.
-        """
-        payments = self.student.getPaymentTuples()
-        if cert is not None:
-            for key, val in cert.items():
-                if val.level != self.level:
-                    continue
-                if val.course.semester == 2 and \
-                    not (self.student.current_session,
-                    'schoolfee_2', 'paid') in payments:
-                    continue
-                ticket = createObject(u'waeup.CourseTicket')
-                ticket.automatic = True
-                ticket.mandatory = val.mandatory
-                ticket.carry_over = False
-                self.addCourseTicket(ticket, val.course)
-        return
-
 CustomStudentStudyLevel = attrs_to_fields(
     CustomStudentStudyLevel, omit=['total_credits', 'gpa'])

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

@@ -92 +92 @@
         self.browser.open(self.payments_path)
         self.browser.getLink("Add current session payment ticket").click()
-        self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...Wrong state...',
@@ -101 +101 @@
         self.assertMatches('...Amount could not be determined...',
                            self.browser.contents)
-        self.app['configuration']['2004'].school_fee_base = 6666.0
-        self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
+        self.app['configuration']['2004'].school_fee = 6666.0
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
@@ -119 +119 @@
         ticket.p_state = 'paid'
         self.browser.open(self.payments_path + '/addop')
-        self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
         self.assertMatches('...This type of payment has already been made...',
@@ -151 +151 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
-        # Remove all payments so that we can add a school fee payment again
-        keys = [i for i in self.student['payments'].keys()]
-        for payment in keys:
-            del self.student['payments'][payment]
+
+
+    def deactivated_test_for_instalment_payments(self):
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open(self.payments_path)
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
@@ -194 +195 @@
         configuration.academic_session = 2005
         self.app['configuration'].addSessionConfiguration(configuration)
-        self.app['configuration']['2005'].school_fee_base = 7777.0
+        self.app['configuration']['2005'].school_base = 7777.0
         self.browser.open(self.payments_path + '/addop')
         self.browser.getControl(name="form.p_category").value = ['schoolfee_1']
@@ -239 +240 @@
         self.app['configuration']['2004'].maint_fee = 180.0
         self.app['configuration']['2004'].clearance_fee = 1234.0
-        self.app['configuration']['2004'].school_fee_base = 6666.0
+        self.app['configuration']['2004'].school_fee = 6666.0
         utils = getUtility(IStudentsUtils)
 
@@ -245 +246 @@
         configuration.academic_session = 2005
         self.app['configuration'].addSessionConfiguration(configuration)
-        self.app['configuration']['2005'].school_fee_base = 7777.0
-
-        error, payment = utils.setPaymentDetails('schoolfee_1',self.student)
+        self.app['configuration']['2005'].school_fee = 7777.0
+
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment, None)
         self.assertEqual(error, u'Wrong state.')
 
         IWorkflowState(self.student).setState('cleared')
-        error, payment = utils.setPaymentDetails('schoolfee_1',self.student)
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 100)
         self.assertEqual(payment.p_session, 2004)
@@ -264 +265 @@
         # ... for returning
         self.app['configuration']['2005'].penalty_ug = 88.0
-        error, payment = utils.setPaymentDetails('schoolfee_1',self.student)
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.amount_auth, 6765.0)
         IWorkflowState(self.student).setState('returning')
-        error, payment = utils.setPaymentDetails('schoolfee_1',self.student)
+        error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
@@ -313 +314 @@
         return
 
-    def test_student_course_registration(self):
+    def deactivated_test_student_course_registration(self):
 
         # Add more courses

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

@@ -67 +67 @@
             return _(u'Session configuration object is not available.'), None
         # Determine fee.
-        if category == 'schoolfee':
-            return _('School fee has to be paid by two instalments.'), None
         if category == 'transfer':
             amount = academic_session.transfer_fee
@@ -80 +78 @@
             amount = academic_session.clearance_fee
             p_item = student['studycourse'].certificate.code
-        elif category == 'schoolfee_1':
+        elif category == 'schoolfee':
             try:
                 certificate = student['studycourse'].certificate
@@ -86 +84 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-            payment_allowed = False
             if student.state == CLEARED:
-                payment_allowed = True
-                amount = academic_session.school_fee_base
+                amount = academic_session.school_fee
             elif student.state == RETURNING or\
                 (student.is_postgrad and student.state == PAID):
@@ -101 +97 @@
                     # next session but their level always remains the same.
                     p_session += 1
-                initial_instalment_made = False
-                for key in student['payments'].keys():
-                    ticket = student['payments'][key]
-                    if ticket.p_category == 'schoolfee_1' and \
-                        ticket.p_state == 'paid':
-                        initial_instalment_made = True
-                    if ticket.p_state == 'paid' and\
-                        ticket.p_category == 'schoolfee_2' and \
-                        ticket.p_item == p_item and \
-                        ticket.p_session == p_session-1: #  = current session
-                        payment_allowed = True
-                if not initial_instalment_made:
-                    payment_allowed = True
                 try:
                     academic_session = grok.getSite()[
@@ -119 +102 @@
                 except KeyError:
                     return _(u'Session configuration object is not available.'), None
-                amount = academic_session.school_fee_base
+                amount = academic_session.school_fee
             else:
                 return _('Wrong state.'), None
-            if not payment_allowed:
-                return _('The previous 2nd school fee instalment '
-                         'has not yet been paid.'), None
-        elif category == 'schoolfee_2':
-            try:
-                certificate = student['studycourse'].certificate
-                p_item = certificate.code
-            except (AttributeError, TypeError):
-                return _('Study course data are incomplete.'), None
-            payment_allowed = False
-            for key in student['payments'].keys():
-                ticket = student['payments'][key]
-                if ticket.p_state == 'paid' and\
-                   ticket.p_category == 'schoolfee_1' and \
-                   ticket.p_item == p_item and \
-                   ticket.p_session == p_session:
-                   payment_allowed = True
-            if not payment_allowed:
-                return _('The 1st school fee instalment '
-                         'has not yet been paid or session has '
-                         'not yet been started.'), None
-            amount = academic_session.school_fee_base
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None
         # Add session specific penalty fee.
-        if category == 'schoolfee_1' and student.is_postgrad:
+        if category == 'schoolfee' and student.is_postgrad:
             amount += academic_session.penalty_pg
-        elif category == 'schoolfee_1':
+        elif category == 'schoolfee':
             amount += academic_session.penalty_ug
         # Create ticket.

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

@@ -40 +40 @@
 
     SELECTABLE_PAYMENT_CATEGORIES = {
-        'schoolfee_1': 'School Fee 1st instalment',
-        'schoolfee_2': 'School Fee 2nd instalment',
+        'schoolfee': 'School Fee',
+        #'schoolfee_1': 'School Fee 1st instalment',
+        #'schoolfee_2': 'School Fee 2nd instalment',
         'clearance': 'Acceptance Fee',
         'hostel_maintenance': 'Hostel Maintenance Fee',