Ignore:
Timestamp:
30 May 2012, 20:37:11 (12 years ago)
Author:
Henrik Bettermann
Message:

Catch up on changes made in waeup.uniben.

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

Legend:

Unmodified
Added
Removed
  • main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/browser.py

    r8531 r8566  
    3939    ICustomApplicantOnlinePayment, IPUTMEApplicantEdit,
    4040    UG_OMIT_DISPLAY_FIELDS, PG_OMIT_DISPLAY_FIELDS,
     41    UG_OMIT_PDF_FIELDS, PG_OMIT_PDF_FIELDS,
    4142    UG_OMIT_MANAGE_FIELDS, PG_OMIT_MANAGE_FIELDS,
    4243    UG_OMIT_EDIT_FIELDS, PG_OMIT_EDIT_FIELDS, PUTME_OMIT_EDIT_FIELDS)
     
    6465class CustomPDFApplicationSlip(PDFApplicationSlip):
    6566
     67    note = _(u'<br /><br /><br />'
     68              'Comfirm your exam venue 72 hours to the exam.')
     69
    6670    @property
    6771    def form_fields(self):
     
    6973        if target is not None and target.startswith('pg'):
    7074            form_fields = grok.AutoFields(IPGApplicant)
    71             for field in PG_OMIT_DISPLAY_FIELDS:
     75            for field in PG_OMIT_PDF_FIELDS:
    7276                form_fields = form_fields.omit(field)
    7377        else:
    7478            form_fields = grok.AutoFields(IUGApplicant)
    75             for field in UG_OMIT_DISPLAY_FIELDS:
     79            for field in UG_OMIT_PDF_FIELDS:
    7680                form_fields = form_fields.omit(field)
    7781        return form_fields
  • main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/interfaces.py

    r8537 r8566  
    3535
    3636UG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
     37UG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone')
    3738UG_OMIT_MANAGE_FIELDS = ()
    3839UG_OMIT_EDIT_FIELDS = UG_OMIT_MANAGE_FIELDS + ('locked', 'course_admitted',
    39     'student_id', 'screening_score', 'screening_venue')
     40    'student_id', 'screening_score', 'screening_venue', 'notice')
    4041PUTME_OMIT_EDIT_FIELDS = UG_OMIT_EDIT_FIELDS + (
    4142    'firstname', 'middlename', 'lastname', 'sex',
     
    4344
    4445PG_OMIT_DISPLAY_FIELDS = ('locked', 'course_admitted', 'password')
     46PG_OMIT_PDF_FIELDS = UG_OMIT_DISPLAY_FIELDS + ('email', 'phone')
    4547PG_OMIT_MANAGE_FIELDS = ()
    4648PG_OMIT_EDIT_FIELDS = PG_OMIT_MANAGE_FIELDS + (
    4749    'locked', 'course_admitted',
    48     'student_id', 'screening_score', 'screening_venue')
     50    'student_id', 'screening_score', 'screening_venue', 'notice')
    4951
    5052class IUGApplicant(IApplicantBaseData):
     
    349351        constraint=validate_email,
    350352        )
    351 
     353    date_of_birth = FormattedDate(
     354        title = _(u'Date of Birth'),
     355        required = True,
     356        show_year = True,
     357        )
     358
     359IPUTMEApplicantEdit[
     360    'date_of_birth'].order =  IUGApplicant['date_of_birth'].order
    352361IPUTMEApplicantEdit[
    353362    'email'].order =  IUGApplicant['email'].order
  • main/waeup.fceokene/trunk/src/waeup/fceokene/applicants/utils.py

    r8537 r8566  
    3434        'pude': ['Post UDE Screening', 'PUDE'],
    3535        'prence': ['Pre-NCE Programme', 'PRE'],
    36         'sandwich': ['Part Time Degree in Education', 'SAND'],
     36        'sandwich': ['Part-Time Degree in Education', 'SAND'],
    3737        'pt': ['Part-Time Degree Programmes', 'PTP'],
    38         'putme': ['Post UTME Screening Test', 'PUTME'],
     38        'putme': ['Post-UTME Screening Exercise', 'PUTME'],
    3939        'app': ['General Studies', 'APP'],
    4040        'cest': ['Common Entry Screening Test', 'CEST'],
  • main/waeup.fceokene/trunk/src/waeup/fceokene/utils/utils.py

    r8528 r8566  
    4040
    4141    PREFERRED_LANGUAGES_DICT = {
    42         'en':(1, u'English'),
    43         'fr':(2, u'Fran&ccedil;ais'),
    44         'de':(3, u'Deutsch'),
    4542        }
    4643
     
    182179        'pg_pt': 'Postgraduate Part Time',
    183180        'jm_ft': 'Joint Matriculation Full Time',
    184         'utme_ft': 'UTME Full Time',
    185181        'de_ft': 'Direct Entry Full Time',
    186182        'ph_ft': 'Post Higher Education Full Time',
Note: See TracChangeset for help on using the changeset viewer.