Ignore:
Timestamp:
26 Jun 2012, 07:46:32 (13 years ago)
Author:
Henrik Bettermann
Message:

Merged with waeup.uniben 8802:HEAD.

Location:
main/waeup.aaue/trunk/src/waeup/aaue
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue

  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/browser.py

    r8711 r8805  
    3333    ApplicantBaseDisplayFormPage)
    3434from waeup.kofa.applicants.viewlets import (
    35     PaymentReceiptActionButton)
     35    PaymentReceiptActionButton, PDFActionButton)
    3636from waeup.kofa.applicants.pdf import PDFApplicationSlip
    3737from waeup.aaue.applicants.interfaces import (
     
    4141    UG_OMIT_PDF_FIELDS, PG_OMIT_PDF_FIELDS,
    4242    UG_OMIT_MANAGE_FIELDS, PG_OMIT_MANAGE_FIELDS,
    43     UG_OMIT_EDIT_FIELDS, PG_OMIT_EDIT_FIELDS, PUTME_OMIT_EDIT_FIELDS)
     43    UG_OMIT_EDIT_FIELDS, PG_OMIT_EDIT_FIELDS, PUTME_OMIT_EDIT_FIELDS,
     44    UG_OMIT_RESULT_SLIP_FIELDS)
    4445from waeup.aaue.interfaces import MessageFactory as _
    4546
     
    6364    grok.context(ICustomApplicantOnlinePayment)
    6465
     66class PDFActionButton(PDFActionButton):
     67
     68    @property
     69    def text(self):
     70        if getattr(self.context, 'result_uploaded', False):
     71            return _('Download result slip')
     72        return _('Download application slip')
     73
     74
    6575class CustomPDFApplicationSlip(PDFApplicationSlip):
    6676
    67     note = _(u'<br /><br /><br />'
    68               'Comfirm your exam venue 72 hours to the exam.')
     77    def _reduced_slip(self):
     78        return getattr(self.context, 'result_uploaded', False)
     79
     80    @property
     81    def note(self):
     82        target = getattr(self.context.__parent__, 'prefix', None)
     83        if target is not None and not target.startswith('pg') \
     84            and not self._reduced_slip():
     85            return _(u'<br /><br /><br />'
     86                      'Comfirm your exam venue 72 hours to the exam.')
     87        return
    6988
    7089    @property
     
    7796        else:
    7897            form_fields = grok.AutoFields(IUGApplicant)
    79             for field in UG_OMIT_PDF_FIELDS:
    80                 form_fields = form_fields.omit(field)
     98            if self._reduced_slip():
     99                for field in UG_OMIT_RESULT_SLIP_FIELDS:
     100                    form_fields = form_fields.omit(field)
     101            else:
     102                for field in UG_OMIT_PDF_FIELDS:
     103                    form_fields = form_fields.omit(field)
     104        if not getattr(self.context, 'student_id'):
     105            form_fields = form_fields.omit('student_id')
    81106        return form_fields
    82107
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

    r8746 r8805  
    3434from waeup.aaue.payments.interfaces import ICustomOnlinePayment
    3535
    36 UG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
     36UG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted',
     37    'password', 'result_uploaded')
    3738UG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone')
    3839UG_OMIT_MANAGE_FIELDS = ()
    3940UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
    4041    'student_id', 'screening_score', 'screening_venue', 'notice',
    41     'screening_date')
     42    'screening_date', 'result_uploaded')
    4243PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + (
    4344    'firstname', 'middlename', 'lastname', 'sex',
    4445    'course1', 'lga', 'jamb_score', 'jamb_subjects')
     46UG_OMIT_RESULT_SLIP_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone',
     47    'date_of_birth', 'sex',
     48    'nationality', 'lga', 'perm_address', 'course2', 'screening_venue',
     49    'screening_date')
    4550
    4651PG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
     
    105110        )
    106111    screening_score = schema.Int(
    107         title = _(u'Screening Score'),
    108         required = False,
     112        title = _(u'Screening Score (%)'),
     113        required = False,
     114        )
     115    aggregate = schema.Int(
     116        title = _(u'Aggregate Score (%)'),
     117        description = _(u'(average of relative JAMB and PUTME scores)'),
     118        required = False,
     119        )
     120    result_uploaded = schema.Bool(
     121        title = _(u'Result uploaded'),
     122        default = False,
    109123        )
    110124    student_id = schema.TextLine(
  • main/waeup.aaue/trunk/src/waeup/aaue/applicants/tests.py

    r8728 r8805  
    309309        # into two parts.
    310310        self.assertTrue(
    311             'applicant_id,application_date,application_number,course1,course2,'
     311            'aggregate,applicant_id,application_date,application_number,course1,course2,'
    312312            'course_admitted,date_of_birth,display_fullname,email,emp2_end,'
    313313            'emp2_position,emp2_reason,emp2_start,emp_end,emp_position,'
     
    317317            'nationality,notice,nysc_lga,'
    318318            'nysc_year,password,perm_address,phone,pp_school,presently_inst,'
    319             'reg_number,screening_date,screening_score,screening_venue,sex,'
     319            'reg_number,result_uploaded,screening_date,screening_score,screening_venue,sex,'
    320320            'state,student_id,'
    321321            'container_code'
     
    324324            'Application initialized by system\'],,,,,,,,,Tester,,0,M.,,'
    325325            '"Some notice\nin lines.",,,any password,,+234-123-12345,,,'
    326             '123456,"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,'
    327             'initialized,,dp2011' in result)
    328         # We can import the same file with if we ignore some columns.
     326            '123456,,"Saturday, 16th June 2012 2:00:00 PM",98,Exam Room,f,'
     327            'initialized,,dp2011'
     328            in result)
     329        # We can import the same file if we ignore some columns.
    329330        # Since the applicants_catalog hasn't been notified, the same
    330331        # record with same reg_number can be imported twice.
     
    332333        result = processor.doImport(
    333334            self.outfile,
    334             ['ignore_applicant_id','application_date','ignore_application_number',
    335             'course1','course2',
     335            ['aggreagate','ignore_applicant_id','application_date',
     336            'ignore_application_number','course1','course2',
    336337            'course_admitted','date_of_birth','ignore3','email','emp2_end',
    337338            'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',
     
    341342            'nationality','notice','nysc_lga',
    342343            'nysc_year','password','perm_address','phone','pp_school','presently_inst',
    343             'reg_number','screening_date','screening_score','screening_venue','sex',
     344            'reg_number','result_uploaded',
     345            'screening_date','screening_score','screening_venue','sex',
    344346            'state','student_id','container_code'],
    345347            mode='create')
     
    355357        result = processor.doImport(
    356358            self.outfile,
    357             ['ignore_applicant_id','application_date','ignore_application_number',
    358             'course1','course2',
     359            ['aggregate','ignore_applicant_id','application_date',
     360            'ignore_application_number','course1','course2',
    359361            'course_admitted','date_of_birth','ignore3','email','emp2_end',
    360362            'emp2_position','emp2_reason','emp2_start','emp_end','emp_position',
     
    364366            'nationality','notice','nysc_lga',
    365367            'nysc_year','password','perm_address','phone','pp_school','presently_inst',
    366             'reg_number','screening_date','screening_score','screening_venue','sex',
     368            'reg_number','result_uploaded','screening_date','screening_score',
     369            'screening_venue','sex',
    367370            'state','student_id','ignore_container_code'],
    368371            mode='update')
Note: See TracChangeset for help on using the changeset viewer.