Changeset 5511 for WAeUP_SRP


Ignore:
Timestamp:
2 Sep 2010, 05:58:26 (14 years ago)
Author:
Henrik Bettermann
Message:

second choice pde application - part2

Location:
WAeUP_SRP/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/WAeUPTool.py

    r5373 r5511  
    966966                else:
    967967                    reg_no = "%s%s/%s" % (brain.course_admitted[:3],brain.serial,brain.entry_session)
    968             elif brain.screening_type == 'pume2':
     968            elif brain.screening_type in ('pume2','pde2'):
    969969                reg_no = brain.jamb_reg_no.upper()
    970970            else:
  • WAeUP_SRP/trunk/skins/waeup_statistics/getApplicantsStatistics.py

    r5259 r5511  
    2929res_not_admitted = context.applicants_catalog(status = 'not admitted')
    3030res_submitted_pde = context.applicants_catalog(status = 'submitted', screening_type = 'pde')
     31res_submitted_pde2 = context.applicants_catalog(status = 'submitted', screening_type = 'pde2')
    3132res_admitted = context.applicants_catalog(status = 'admitted')
    3233res_created = context.applicants_catalog(status = 'created')
     
    4041info['not_admitted'] = len(res_not_admitted)
    4142info['submitted_pde'] = len(res_submitted_pde)
     43info['submitted_pde2'] = len(res_submitted_pde2)
    4244info['created'] = len(res_created)
    4345
  • WAeUP_SRP/trunk/skins/waeup_student/apply_admission.py

    r5510 r5511  
    3131
    3232#manage = "manage" in request.keys()
    33 screening_types = ('prence','pume','pume2','pce','pde','cest','sandwich','dp','ct','pt','sandwich2008')
     33screening_types = ('prence','pume','pume2','pce','pde','pde2','cest','sandwich','dp','ct','pt','sandwich2008')
    3434if not (traverse_subpath and traverse_subpath[0] in screening_types):
    3535    return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
  • WAeUP_SRP/trunk/skins/waeup_student/apply_admission_manage_form.pt

    r5259 r5511  
    2727              <td>2nd choice PUME Applicants (status submitted):</td>
    2828              <td><span tal:replace="info_applicants/submitted_pume2" /></td> 
    29             </tr>           
     29            </tr> 
    3030            <tr>
    3131              <td>PUDE Applicants (status submitted):</td>
    3232              <td><span tal:replace="info_applicants/submitted_pde" /></td>
    3333            </tr>
     34            <tr>
     35              <td>2nd choice PUDE Applicants (status submitted):</td>
     36              <td><span tal:replace="info_applicants/submitted_pde2" /></td> 
     37            </tr>                   
    3438            <tr>
    3539              <td>CEST Applicants (status submitted):</td>
Note: See TracChangeset for help on using the changeset viewer.