Changeset 2685 for WAeUP_SRP

Timestamp:

17 Nov 2007, 07:36:29 (17 years ago)

Author:

Henrik Bettermann

Message:

modify applicants statistics

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• apply_admission_manage_form.pt (modified) (1 diff)
• getApplicantsStatistics.py (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/apply_admission_manage_form.pt

@@ -20 +20 @@
             <table tal:define="info_applicants context/getApplicantsStatistics">
             <tr> 
-              <td>PUME Applications - submitted:</td> 
+              <td>PUME Applicants (status submitted):</td> 
               <td><span tal:replace="info_applicants/submitted_pume" /></td>  
             </tr>
             <tr> 
-              <td>PUME Applications - admitted:</td> 
-              <td><span tal:replace="info_applicants/admitted_pume" /></td>  
+              <td>PUDE Applicants (status submitted):</td> 
+              <td><span tal:replace="info_applicants/submitted_pde" /></td>
             </tr>
             <tr> 
-              <td>PUME Applications - not admitted:</td> 
-              <td><span tal:replace="info_applicants/not_admitted_pume" /></td>  
+              <td>Admitted Applicants (status admitted):</td> 
+              <td><span tal:replace="info_applicants/admitted" /></td>  
+            </tr>
+            <tr> 
+              <td>Non-admitted Applicants (status not admitted):</td> 
+              <td><span tal:replace="info_applicants/not_admitted" /></td>  
             </tr>                        
+
             <tr> 
-              <td>PUDE Applications - submitted:</td> 
-              <td><span tal:replace="info_applicants/submitted_pde" /></td>
-            </tr>
+              <td>Student Records Created (status created):</td> 
+              <td><span tal:replace="info_applicants/created" /></td>
+            </tr>            
             </table>            
             

WAeUP_SRP/base/skins/waeup_student/getApplicantsStatistics.py

@@ -22 +22 @@
 
 info = {}
-#res_entered = context.applicants_catalog(status = 'entered')
-#res_edited = context.applicants_catalog(status = 'edited')
-#res_submitted = context.applicants_catalog(status = 'submitted')
 res_submitted_pume = context.applicants_catalog(status = 'submitted', screening_type = 'pume')
-res_admitted_pume = context.applicants_catalog(status = 'admitted', screening_type = 'pume')
-res_not_admitted_pume = context.applicants_catalog(status = 'not admitted', screening_type = 'pume')
+res_not_admitted = context.applicants_catalog(status = 'not admitted')
 res_submitted_pde = context.applicants_catalog(status = 'submitted', screening_type = 'pde')
-#info['entered'] = len(res_entered)
-#info['edited'] = len(res_edited)
-#info['submitted'] = len(res_submitted)
-#info['pin_entered'] = info['entered'] + info['submitted'] + info['edited']
+res_admitted = context.applicants_catalog(status = 'admitted')
+res_created = context.applicants_catalog(status = 'created')
 
 info['submitted_pume'] = len(res_submitted_pume)
-info['admitted_pume'] = len(res_admitted_pume)
-info['not_admitted_pume'] = len(res_not_admitted_pume)
+info['admitted'] = len(res_admitted)
+info['not_admitted'] = len(res_not_admitted_pume)
 info['submitted_pde'] = len(res_submitted_pde)
+info['created'] = len(res_created)
 
 return info