Changeset 8803

Timestamp:

26 Jun 2012, 07:17:19 (12 years ago)

Author:

Henrik Bettermann

Message:

Provide reduced result slip. The attribute result_uploaded must be set True by import. Then the result download button shows up and the application slip is abridged.

Location:

main/waeup.uniben/trunk/src/waeup/uniben

Files:

• applicants/browser.py (modified) (4 diffs)
• applicants/interfaces.py (modified) (2 diffs)
• students/interfaces.py (modified) (1 diff)

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

@@ -33 +33 @@
     ApplicantBaseDisplayFormPage)
 from waeup.kofa.applicants.viewlets import (
-    PaymentReceiptActionButton)
+    PaymentReceiptActionButton, PDFActionButton)
 from waeup.kofa.applicants.pdf import PDFApplicationSlip
 from waeup.uniben.applicants.interfaces import (
@@ -41 +41 @@
     UG_OMIT_PDF_FIELDS, PG_OMIT_PDF_FIELDS,
     UG_OMIT_MANAGE_FIELDS, PG_OMIT_MANAGE_FIELDS,
-    UG_OMIT_EDIT_FIELDS, PG_OMIT_EDIT_FIELDS, PUTME_OMIT_EDIT_FIELDS)
+    UG_OMIT_EDIT_FIELDS, PG_OMIT_EDIT_FIELDS, PUTME_OMIT_EDIT_FIELDS,
+    UG_OMIT_RESULT_SLIP_FIELDS)
 from waeup.uniben.interfaces import MessageFactory as _
 
@@ -63 +64 @@
     grok.context(ICustomApplicantOnlinePayment)
 
+class PDFActionButton(PDFActionButton):
+
+    @property
+    def text(self):
+        if getattr(self.context, 'result_uploaded', False):
+            return _('Download result slip')
+        return _('Download application slip')
+
+
 class CustomPDFApplicationSlip(PDFApplicationSlip):
 
+    def _reduced_slip(self):
+        return getattr(self.context, 'result_uploaded', False)
+
     @property
     def note(self):
         target = getattr(self.context.__parent__, 'prefix', None)
-        if target is not None and not target.startswith('pg'):
+        if target is not None and not target.startswith('pg') \
+            and not self._reduced_slip():
             return _(u'<br /><br /><br />'
                       'Comfirm your exam venue 72 hours to the exam.')
@@ -82 +96 @@
         else:
             form_fields = grok.AutoFields(IUGApplicant)
-            for field in UG_OMIT_PDF_FIELDS:
-                form_fields = form_fields.omit(field)
+            if self._reduced_slip():
+                for field in UG_OMIT_RESULT_SLIP_FIELDS:
+                    form_fields = form_fields.omit(field)
+            else:
+                for field in UG_OMIT_PDF_FIELDS:
+                    form_fields = form_fields.omit(field)
+        if not getattr(self.context, 'student_id'):
+            form_fields = form_fields.omit('student_id')
         return form_fields
 

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

@@ -34 +34 @@
 from waeup.uniben.payments.interfaces import ICustomOnlinePayment
 
-UG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
+UG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted',
+    'password', 'result_uploaded')
 UG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone')
 UG_OMIT_MANAGE_FIELDS = ()
 UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
     'student_id', 'screening_score', 'screening_venue', 'notice',
-    'screening_date')
+    'screening_date', 'result_uploaded')
 PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + (
     'firstname', 'middlename', 'lastname', 'sex',
     'course1', 'lga', 'jamb_score', 'jamb_subjects')
+UG_OMIT_RESULT_SLIP_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone',
+    'date_of_birth', 'sex',
+    'nationality', 'lga', 'perm_address', 'course2', 'screening_venue',
+    'screening_date')
 
 PG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
@@ -105 +110 @@
         )
     screening_score = schema.Int(
-        title = _(u'Screening Score'),
-        required = False,
+        title = _(u'Screening Score (%)'),
+        required = False,
+        )
+    aggregate = schema.Int(
+        title = _(u'Aggregate Score (%)'),
+        description = _(u'(average of relative JAMB and PUTME scores)'),
+        required = False,
+        )
+    result_uploaded = schema.Bool(
+        title = _(u'Result uploaded'),
+        default = False,
         )
     student_id = schema.TextLine(

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

@@ -33 +33 @@
 from waeup.uniben.interfaces import MessageFactory as _
 from waeup.uniben.payments.interfaces import ICustomOnlinePayment
-from waeup.uniben.utils.lgas import LGAS