Changeset 10831

Timestamp:

10 Dec 2013, 06:24:03 (11 years ago)

Author:

Henrik Bettermann

Message:

Implement a special application procedure. This application is meant for supplementary payments by alumni and other persons who are not students of the portal.

Attention: All custom packages have to be adjusted.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• applicants/applicant.py (modified) (1 diff)
• applicants/browser.py (modified) (6 diffs)
• applicants/interfaces.py (modified) (3 diffs)
• applicants/tests/test_browser.py (modified) (1 diff)
• applicants/tests/test_export.py (modified) (9 diffs)
• applicants/utils.py (modified) (3 diffs)
• university/vocabularies.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/applicants/applicant.py

@@ -89 +89 @@
         history = IObjectHistory(self)
         return history
+
+    @property
+    def special(self):
+        return self.__parent__.prefix.startswith('special')
 
     @property

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser.py

@@ -60 +60 @@
 from waeup.kofa.utils.helpers import string_from_bytes, file_size, now
 from waeup.kofa.widgets.datewidget import (
-    FriendlyDateDisplayWidget, FriendlyDateDisplayWidget,
+    FriendlyDateDisplayWidget,
     FriendlyDatetimeDisplayWidget)
 from waeup.kofa.widgets.htmlwidget import HTMLDisplayWidget
@@ -522 +522 @@
     grok.require('waeup.viewApplication')
     grok.template('applicantdisplaypage')
-    form_fields = grok.AutoFields(IApplicant).omit(
-        'locked', 'course_admitted', 'password', 'suspended')
     label = _('Applicant')
     pnav = 3
     hide_hint = False
+
+    @property
+    def form_fields(self):
+        if self.context.special:
+            form_fields = grok.AutoFields(IApplicant).select(
+                'applicant_id', 'firstname', 'middlename', 'lastname',
+                'reg_number', 'date_of_birth', 'email', 'special_application')
+        else:
+            form_fields = grok.AutoFields(IApplicant).omit(
+                'locked', 'course_admitted', 'password', 'suspended',
+                'special_application')
+        return form_fields
 
     @property
@@ -650 +660 @@
         container = self.context.__parent__
         payment = createObject(self.factory)
-        error = applicants_utils.setPaymentDetails(container, payment)
+        error = applicants_utils.setPaymentDetails(
+            container, payment, self.context)
         if error is not None:
             self.flash(error)
@@ -796 +807 @@
     grok.name('manage')
     grok.require('waeup.manageApplication')
-    form_fields = grok.AutoFields(IApplicant)
-    form_fields['student_id'].for_display = True
-    form_fields['applicant_id'].for_display = True
     grok.template('applicanteditpage')
     manage_applications = True
@@ -804 +812 @@
     display_actions = [[_('Save'), _('Final Submit')],
         [_('Add online payment ticket'),_('Remove selected tickets')]]
+
+    @property
+    def form_fields(self):
+        if self.context.special:
+            form_fields = grok.AutoFields(IApplicant).select(
+                'applicant_id', 'firstname', 'middlename', 'lastname',
+                'reg_number', 'date_of_birth', 'email', 'special_application',
+                'locked')
+        else:
+            form_fields = grok.AutoFields(IApplicant)
+            form_fields['student_id'].for_display = True
+            form_fields['applicant_id'].for_display = True
+        return form_fields
 
     @property
@@ -941 +962 @@
     grok.name('edit')
     grok.require('waeup.handleApplication')
-    form_fields = grok.AutoFields(IApplicantEdit).omit(
-        'locked', 'course_admitted', 'student_id',
-        'suspended'
-        )
-    form_fields['applicant_id'].for_display = True
-    form_fields['reg_number'].for_display = True
     grok.template('applicanteditpage')
     manage_applications = False
     submit_state = PAID
+
+    @property
+    def form_fields(self):
+        if self.context.special:
+            form_fields = grok.AutoFields(IApplicantEdit).select(
+                'applicant_id', 'firstname', 'middlename', 'lastname',
+                'reg_number', 'date_of_birth', 'email', 'special_application')
+        else:
+            form_fields = grok.AutoFields(IApplicantEdit).omit(
+                'locked', 'course_admitted', 'student_id',
+                'suspended', 'special_application'
+                )
+            form_fields['applicant_id'].for_display = True
+            form_fields['reg_number'].for_display = True
+        return form_fields
 
     @property

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

@@ -36 +36 @@
 from waeup.kofa.schema import PhoneNumber
 from waeup.kofa.students.vocabularies import GenderSource, RegNumberSource
-from waeup.kofa.university.vocabularies import AppCatSource, CertificateSource
+from waeup.kofa.university.vocabularies import (
+    AppCatSource, CertificateSource, SpecialApplicationSource)
 
 #: Maximum upload size for applicant passport photographs (in bytes)
@@ -442 +443 @@
         )
 
+    special_application = schema.Choice(
+        title = _(u'Special Application'),
+        source = SpecialApplicationSource(),
+        required = False,
+        )
+
 class IApplicant(IApplicantBaseData):
     """An applicant.
@@ -497 +504 @@
         readonly = True,
         )
+    special_application = schema.Choice(
+        title = _(u'Special Application'),
+        source = SpecialApplicationSource(),
+        required = True,
+        )
 
 IApplicantEdit['email'].order = IApplicantEdit[

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_browser.py

@@ -868 +868 @@
             in logcontent)
         return
+
+
+    def test_pay_special_fee(self):
+        # Add special application container
+        container_name = u'special%s' % session_1
+        applicantscontainer = ApplicantsContainer()
+        applicantscontainer.code = container_name
+        applicantscontainer.prefix = 'special'
+        applicantscontainer.year = session_1
+        applicantscontainer.title = u'This is a special app container'
+        applicantscontainer.application_category = 'no'
+        applicantscontainer.mode = 'create'
+        applicantscontainer.strict_deadline = True
+        delta = timedelta(days=10)
+        applicantscontainer.startdate = datetime.now(pytz.utc) - delta
+        applicantscontainer.enddate = datetime.now(pytz.utc) + delta
+        self.app['applicants'][container_name] = applicantscontainer
+        # Add an applicant
+        applicant = createObject('waeup.Applicant')
+        # reg_number is the only field which has to be preset here
+        # because managers are allowed to edit this required field
+        applicant.reg_number = u'12345'
+        self.app['applicants'][container_name].addApplicant(applicant)
+        IUserAccount(
+            self.app['applicants'][container_name][
+            applicant.application_number]).setPassword('apwd')
+        # Add session configuration object
+        configuration = SessionConfiguration()
+        configuration.academic_session = session_1
+        configuration.transcript_fee = 200.0
+        self.app['configuration'].addSessionConfiguration(configuration)
+        # Login
+        self.browser.open(self.login_path)
+        self.browser.getControl(
+            name="form.login").value = applicant.applicant_id
+        self.browser.getControl(name="form.password").value = 'apwd'
+        self.browser.getControl("Login").click()
+        self.browser.getLink("Edit application record").click()
+        self.browser.getControl(name="form.firstname").value = 'John'
+        self.browser.getControl(name="form.middlename").value = 'Anthony'
+        self.browser.getControl(name="form.lastname").value = 'Tester'
+        self.browser.getControl(name="form.special_application").value = [
+            'transcript']
+        self.browser.getControl(name="form.date_of_birth").value = '09/09/1988'
+        #self.browser.getControl(name="form.sex").value = ['m']
+        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
+        self.browser.getControl("Save").click()
+        self.browser.getControl("Add online payment ticket").click()
+        self.assertMatches('...Payment ticket created...',
+                           self.browser.contents)
+        self.assertTrue(
+            '<span>Transcript Fee</span>' in self.browser.contents)
+        self.assertTrue(
+            'This is a special app container' in self.browser.contents)
+        self.assertTrue(
+            '<span>200.0</span>' in self.browser.contents)
+        return
+
 
     def test_duplicate_choice(self):

main/waeup.kofa/trunk/src/waeup/kofa/applicants/tests/test_export.py

@@ -142 +142 @@
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,state,'
+            'reg_number,sex,special_application,state,'
             'student_id,suspended,container_code\r\n'
             'dp2011_654321,,654321,,,,,Anna Tester,,Anna,'
@@ -148 +148 @@
         self.assertTrue(
             'Application initialized by system\'],Tester,'
-            '0,,,,,,,initialized,,0,dp2011\r\n'
+            '0,,,,,,,,initialized,,0,dp2011\r\n'
             in result)
         return
@@ -166 +166 @@
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,state,'
+            'reg_number,sex,special_application,state,'
             'student_id,suspended,container_code\r\n'
             'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
@@ -174 +174 @@
             'Application initialized by system\'],'
             'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345#,123456,f,initialized,,0,dp2011\r\n'
+            '+234-123-12345#,123456,f,,initialized,,0,dp2011\r\n'
             in result)
 
@@ -190 +190 @@
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,state,'
+            'reg_number,sex,special_application,state,'
             'student_id,suspended,container_code\r\n'
             'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
@@ -198 +198 @@
             'Application initialized by system\'],'
             'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345#,123456,f,initialized,,0,dp2011\r\n'
+            '+234-123-12345#,123456,f,,initialized,,0,dp2011\r\n'
             in result)
         return
@@ -212 +212 @@
             'course_admitted,date_of_birth,display_fullname,email,firstname,'
             'history,lastname,locked,middlename,notice,password,phone,'
-            'reg_number,sex,state,'
+            'reg_number,sex,special_application,state,'
             'student_id,suspended,container_code\r\n'
             'dp2011_654321,,654321,CERT1,CERT1,CERT1,1981-02-04#,'
@@ -220 +220 @@
             'Application initialized by system\'],'
             'Tester,0,M.,"Some notice\nin lines.",any password,'
-            '+234-123-12345#,123456,f,initialized,,0,dp2011\r\n'
+            '+234-123-12345#,123456,f,,initialized,,0,dp2011\r\n'
             in result)
         # In empty container no applicants are exported
@@ -233 +233 @@
             'course2,course_admitted,date_of_birth,display_fullname,email,'
             'firstname,history,lastname,locked,middlename,notice,password,'
-            'phone,reg_number,sex,state,student_id,suspended,container_code\r\n'
-            in result)
-        return
+            'phone,reg_number,sex,special_application,state,student_id,'
+            'suspended,container_code\r\n'
+            in result)
+        return

main/waeup.kofa/trunk/src/waeup/kofa/applicants/utils.py

@@ -35 +35 @@
     APP_TYPES_DICT = {
       'app': ['General Studies', 'APP'],
+      'special': ['Special Application', 'SPE'],
       }
 
@@ -42 +43 @@
       }
 
-    def setPaymentDetails(self, container, payment):
+    def setPaymentDetails(self, container, payment, applicant):
         """Set the payment data of an applicant.
         """
@@ -56 +57 @@
                 return _(u'Session configuration object is not available.')
             payment.amount_auth = session_config.application_fee
+            payment.p_category = 'application'
+        if container.prefix.startswith('special'):
+            fee_name = applicant.special_application + '_fee'
+            payment.amount_auth = getattr(session_config, fee_name, 0.0)
+            payment.p_category = applicant.special_application
         payment.p_id = "p%s" % timestamp
         payment.p_item = container.title
         payment.p_session = container.year
-        payment.p_category = 'application'
         return None
 

main/waeup.kofa/trunk/src/waeup/kofa/university/vocabularies.py

@@ -121 +121 @@
     def getTitle(self, context, value):
         return "%s - %s" % (value.code, value.title)
+
+class SpecialApplicationSource(ContextualDictSourceFactoryBase):
+    """A special application source delivers all types of
+    applications which are not linked with certificates.
+    """
+    #: name of dict to deliver from kofa utils.
+    DICT_NAME = 'SPECIAL_APP_DICT'

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

@@ -150 +150 @@
         'regular': 'Regular Hostel',
         'blocked': 'Blocked Hostel',
-        'pd': 'Postgraduate Hostel'
+        'pg': 'Postgraduate Hostel'
+        }
+
+    SPECIAL_APP_DICT = {
+        'transcript': 'Transcript Fee Payment',
         }