Changeset 8981

Timestamp:

12 Jul 2012, 08:53:27 (12 years ago)

Author:

Henrik Bettermann

Message:

Merged with waeup.fceokene 8978:8979.

Location:

main/waeup.futminna/trunk/src/waeup/futminna

Files:

• . (modified) (1 prop)
• applicants/interfaces.py (modified) (7 diffs)
• students/tests/test_browser.py (modified) (4 diffs)
• students/utils.py (modified) (2 diffs)

main/waeup.futminna/trunk/src/waeup/futminna/applicants/interfaces.py

@@ -33 +33 @@
     INigeriaUGApplicant, INigeriaPGApplicant,
     INigeriaApplicantOnlinePayment,
+    INigeriaUGApplicantEdit, INigeriaPGApplicantEdit,
+    INigeriaApplicantUpdateByRegNo,
+    IPUTMEApplicantEdit,
     UG_OMIT_DISPLAY_FIELDS,
     UG_OMIT_PDF_FIELDS,
@@ -82 +85 @@
         """
 
-class ICustomUGApplicantEdit(ICustomUGApplicant):
+class ICustomUGApplicantEdit(INigeriaUGApplicantEdit):
     """An undergraduate applicant interface for edit forms.
 
@@ -94 +97 @@
     """
 
-    email = schema.ASCIILine(
-        title = _(u'Email Address'),
-        required = True,
-        constraint=validate_email,
-        )
-    date_of_birth = FormattedDate(
-        title = _(u'Date of Birth'),
-        required = True,
-        show_year = True,
-        )
-
-ICustomUGApplicantEdit[
-    'date_of_birth'].order =  ICustomUGApplicant['date_of_birth'].order
-ICustomUGApplicantEdit[
-    'email'].order =  ICustomUGApplicant['email'].order
-
-class ICustomPGApplicantEdit(ICustomPGApplicant):
+class ICustomPGApplicantEdit(INigeriaPGApplicantEdit):
     """A postgraduate applicant interface for editing.
 
@@ -122 +109 @@
     """
 
-    email = schema.ASCIILine(
-        title = _(u'Email Address'),
-        required = True,
-        constraint=validate_email,
-        )
-    date_of_birth = FormattedDate(
-        title = _(u'Date of Birth'),
-        required = True,
-        show_year = True,
-        )
-
-ICustomPGApplicantEdit[
-    'date_of_birth'].order =  ICustomPGApplicant['date_of_birth'].order
-ICustomPGApplicantEdit[
-    'email'].order =  ICustomPGApplicant['email'].order
-
 class ICustomApplicantOnlinePayment(INigeriaApplicantOnlinePayment):
     """An applicant payment via payment gateways.
@@ -143 +114 @@
     """
 
-class IPUTMEApplicantEdit(ICustomUGApplicant):
+class IPUTMEApplicantEdit(IPUTMEApplicantEdit):
     """An undergraduate applicant interface for editing.
 
@@ -154 +125 @@
     respective form page.
     """
-    email = schema.ASCIILine(
-        title = _(u'Email Address'),
-        required = True,
-        constraint=validate_email,
-        )
-    date_of_birth = FormattedDate(
-        title = _(u'Date of Birth'),
-        required = True,
-        show_year = True,
-        )
 
-IPUTMEApplicantEdit[
-    'date_of_birth'].order =  ICustomUGApplicant['date_of_birth'].order
-IPUTMEApplicantEdit[
-    'email'].order =  ICustomUGApplicant['email'].order
-
-class ICustomApplicantUpdateByRegNo(ICustomApplicant):
+class ICustomApplicantUpdateByRegNo(INigeriaApplicantUpdateByRegNo):
     """Representation of an applicant.
 
@@ -176 +132 @@
     the applicant object.
     """
-    reg_number = schema.TextLine(
-        title = u'Registration Number',
-        required = False,
-        )
+

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

@@ -152 +152 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Session configuration object is not...',
+                           self.browser.contents)
+        # Uups, we forgot to add a session configuration for next session
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
+        self.browser.open(self.payments_path + '/addop')
+        self.browser.getControl(name="form.p_category").value = ['schoolfee']
+        self.browser.getControl("Create ticket").click()
         self.assertMatches('...ticket created...',
                            self.browser.contents)
@@ -188 +197 @@
         utils = getUtility(IStudentsUtils)
 
+        configuration = createObject('waeup.SessionConfiguration')
+        configuration.academic_session = 2005
+        self.app['configuration'].addSessionConfiguration(configuration)
+
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment, None)
@@ -200 +213 @@
         self.assertEqual(error, None)
 
-        # Add penalty fee.
+        # Add penalty fee ...
+        # ... for cleared
         self.app['configuration']['2004'].penalty_ug = 99.0
+        # ... for returning
+        self.app['configuration']['2005'].penalty_ug = 88.0
         error, payment = utils.setPaymentDetails('schoolfee',self.student)
         self.assertEqual(payment.amount_auth, 40099.0)
@@ -209 +225 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 20099.0)
+        self.assertEqual(payment.amount_auth, 20088.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

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

@@ -97 +97 @@
                 p_session, p_level = self.getReturningData(student)
                 amount = getattr(certificate, 'school_fee_2', 0.0)
+                try:
+                    academic_session = grok.getSite()[
+                        'configuration'][str(p_session)]
+                except KeyError:
+                    return _(u'Session configuration object is not available.'), None
             elif student.is_postgrad and student.state == PAID:
                 # Returning postgraduate students also pay for the next session
@@ -102 +107 @@
                 p_session += 1
                 amount = getattr(certificate, 'school_fee_2', 0.0)
+                try:
+                    academic_session = grok.getSite()[
+                        'configuration'][str(p_session)]
+                except KeyError:
+                    return _(u'Session configuration object is not available.'), None
         if amount in (0.0, None):
             return _(u'Amount could not be determined.'), None