Changeset 8536

Timestamp:

28 May 2012, 05:26:01 (13 years ago)

Author:

Henrik Bettermann

Message:

See r8535.

Location:

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

Files:

• applicants/interfaces.py (modified) (2 diffs)
• applicants/tests.py (modified) (2 diffs)
• applicants/utils.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)

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

@@ -40 +40 @@
 PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + (
     'firstname', 'middlename', 'lastname', 'sex',
-    'course1', 'lga', 'jambscore')
+    'course1', 'lga', 'jamb_score', 'jamb_subjects')
 
 PG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
@@ -80 +80 @@
         required = False,
         )
-    jambscore = schema.Int(
-        title = _(u'JAMB Score'),
-        required = False,
-        )
-
-
-# More fields
-
-
+    jamb_subjects = schema.Text(
+        title = _(u'Subjects and Scores'),
+        required = False,
+        )
+    jamb_score = schema.Int(
+        title = _(u'Total Score'),
+        required = False,
+        )
     notice = schema.Text(
         title = _(u'Notice'),

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

@@ -254 +254 @@
             'emp_reason,emp_start,employer,employer2,firstname,history,'
             'hq_degree,hq_disc,hq_matric_no,hq_school,hq_session,hq_type,'
-            'jambscore,lastname,lga,locked,middlename,nationality,notice,nysc_lga,'
+            'jamb_score,jamb_subjects,lastname,lga,locked,middlename,'
+            'nationality,notice,nysc_lga,'
             'nysc_year,password,perm_address,phone,pp_school,presently_inst,'
             'reg_number,screening_score,screening_venue,sex,state,student_id,'
@@ -260 +261 @@
             in result)
         self.assertTrue(
-            'Application initialized by system\'],,,,,,,,Tester,,0,M.,,'
+            'Application initialized by system\'],,,,,,,,,Tester,,0,M.,,'
             '"Some notice\nin lines.",,,any password,,+234-123-12345,,,'
             '123456,98,Exam Room,f,initialized,,dp2011' in result)

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

@@ -53 +53 @@
         'form.nysc_year': _(u'NYSC Information'),
         'form.employer': _(u'Employment History'),
-        'form.jambscore': _(u'JAMB Data'),
+        'form.jamb_subjects': _(u'JAMB Data'),
         'form.notice': _(u'Application Process Information'),
         'form.pp_school': _(u'Post Primary School Qualification'),
         'form.presently_inst': _(u'Presently attending a course or programme'),
         }
-
-    def setPaymentDetails(self, container, payment):
-        """Set the payment data of an applicant.
-        """
-        timestamp = "%d" % int(time()*1000)
-        payment.p_id = "p%s" % timestamp
-        payment.p_item = container.title
-        payment.p_session = container.year
-        payment.p_category = 'application'
-        # We are using the container specific application fee
-        # instead of the session configuration application fee.
-        payment.amount_auth = container.application_fee
-        return None

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

@@ -102 +102 @@
 
     application_fee = schema.Float(
-        title = _(u'Application Fee (ignored)'),
+        title = _(u'Application Fee (fallback)'),
         default = 0.0,
         required = False,