Changeset 3803


Ignore:
Timestamp:
3 Dec 2008, 20:46:12 (16 years ago)
Author:
Henrik Bettermann
Message:

resolve ticket #13 FUTMinna

Location:
WAeUP_SRP/trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Widgets.py

    r3754 r3803  
    854854        else:
    855855            screening_type = 'all'
    856         if screening_type in ("all","cest","sandwich","pg"):
     856        if screening_type in ("all","cest","sandwich","pg","dp"):
    857857            application_category = screening_type
    858858        else:

  • WAeUP_SRP/trunk/profiles/futminna/vocabularies/entry_modes.xml

    r3770 r3803  
    2020 <item key="ct_pt" msgid="">Certificate Part Time</item>
    2121 <item key="rm_ft" msgid="">Remedial</item>
    22  
     22 <item key="ph_ft" msgid="">Post Higher Education Full Time</item>
    2323</object>

  • WAeUP_SRP/trunk/skins/waeup_student/getStudyCourseInfo.py

    r3801 r3803  
    115115               (previous_verdict in ('A','B','C','F','J','L','M') or\
    116116               current_level in ('000','100') or\
    117                (student_record.entry_mode.startswith('de') and current_level == '200'))
     117               (student_record.entry_mode.startswith('de') and current_level == '200') or\
     118               (student_record.entry_mode.startswith('ph') and current_level == '300'))
    118119
    119120missing_data = has_paid and\
    … …  
    121122               not (previous_verdict or student_record.level) and\
    122123               not (current_level == '100' or\
    123                (student_record.entry_mode.startswith('de') and current_level == '200'))
     124               (student_record.entry_mode.startswith('de') and current_level == '200')or\
     125               (student_record.entry_mode.startswith('ph') and current_level == '300'))
    124126
    125127info['missing_data'] = missing_data
Note: See TracChangeset for help on using the changeset viewer.