Changeset 5511

Timestamp:

2 Sep 2010, 05:58:26 (14 years ago)

Author:

Henrik Bettermann

Message:

second choice pde application - part2

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTool.py (modified) (1 diff)
• skins/waeup_statistics/getApplicantsStatistics.py (modified) (2 diffs)
• skins/waeup_student/apply_admission.py (modified) (1 diff)
• skins/waeup_student/apply_admission_manage_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/WAeUPTool.py

@@ -966 +966 @@
                 else:
                     reg_no = "%s%s/%s" % (brain.course_admitted[:3],brain.serial,brain.entry_session)
-            elif brain.screening_type == 'pume2':
+            elif brain.screening_type in ('pume2','pde2'):
                 reg_no = brain.jamb_reg_no.upper()
             else:

WAeUP_SRP/trunk/skins/waeup_statistics/getApplicantsStatistics.py

@@ -29 +29 @@
 res_not_admitted = context.applicants_catalog(status = 'not admitted')
 res_submitted_pde = context.applicants_catalog(status = 'submitted', screening_type = 'pde')
+res_submitted_pde2 = context.applicants_catalog(status = 'submitted', screening_type = 'pde2')
 res_admitted = context.applicants_catalog(status = 'admitted')
 res_created = context.applicants_catalog(status = 'created')
@@ -40 +41 @@
 info['not_admitted'] = len(res_not_admitted)
 info['submitted_pde'] = len(res_submitted_pde)
+info['submitted_pde2'] = len(res_submitted_pde2)
 info['created'] = len(res_created)
 

WAeUP_SRP/trunk/skins/waeup_student/apply_admission.py

@@ -31 +31 @@
 
 #manage = "manage" in request.keys()
-screening_types = ('prence','pume','pume2','pce','pde','cest','sandwich','dp','ct','pt','sandwich2008')
+screening_types = ('prence','pume','pume2','pce','pde','pde2','cest','sandwich','dp','ct','pt','sandwich2008')
 if not (traverse_subpath and traverse_subpath[0] in screening_types):
     return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())

WAeUP_SRP/trunk/skins/waeup_student/apply_admission_manage_form.pt

@@ -27 +27 @@
               <td>2nd choice PUME Applicants (status submitted):</td> 
               <td><span tal:replace="info_applicants/submitted_pume2" /></td>  
-            </tr>            
+            </tr>  
             <tr> 
               <td>PUDE Applicants (status submitted):</td> 
               <td><span tal:replace="info_applicants/submitted_pde" /></td>
             </tr>
+            <tr> 
+              <td>2nd choice PUDE Applicants (status submitted):</td> 
+              <td><span tal:replace="info_applicants/submitted_pde2" /></td>  
+            </tr>                    
             <tr> 
               <td>CEST Applicants (status submitted):</td>