Changeset 2528

Timestamp:

4 Nov 2007, 20:15:03 (17 years ago)

Author:

Henrik Bettermann

Message:

show proper application statistics
commit after 2000 if importing application data

Location:

WAeUP_SRP/base

Files:

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

WAeUP_SRP/base/WAeUPTool.py

@@ -1577 +1577 @@
         total = 0
         iname = "import_%s" % name
+        if iname == 'import_application':
+            commit_after = 2000
+        else:
+            commit_after = 100
         stool = getToolByName(self, 'portal_schemas')
         ltool = getToolByName(self, 'portal_layouts')
@@ -1666 +1670 @@
                 logger.info("%(total_imported)d of %(total)d %(em)s" % vars())
 
-            if total and not total % 100:
+            if total and not total % commit_after:
                 transaction.commit()
                 if len(not_imported) > 0:
@@ -1680 +1684 @@
                 logger.info(em)
                 tr_count = 0
+                #if total > 100:
+                #    return
         if len(imported) > 0:
             open("%s/import/%s_imported%s.csv" % (i_home,filename,current),"a").write(

WAeUP_SRP/base/skins/waeup_student/apply_admission_manage_form.pt

@@ -20 +20 @@
             <table tal:define="info_applicants context/getApplicantsStatistics">
             <tr> 
-              <td>PUME Screening Applications:</td> 
+              <td>PUME Applications - submitted:</td> 
               <td><span tal:replace="info_applicants/submitted_pume" /></td>  
             </tr>
             <tr> 
-              <td>PUDE Screening Applications:</td> 
+              <td>PUME Applications - admitted:</td> 
+              <td><span tal:replace="info_applicants/admitted_pume" /></td>  
+            </tr>
+            <tr> 
+              <td>PUME Applications - not admitted:</td> 
+              <td><span tal:replace="info_applicants/not_admitted_pume" /></td>  
+            </tr>                        
+            <tr> 
+              <td>PUDE Applications - submitted:</td> 
               <td><span tal:replace="info_applicants/submitted_pde" /></td>
             </tr>

WAeUP_SRP/base/skins/waeup_student/getApplicantsStatistics.py

@@ -26 +26 @@
 #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_submitted_pde = context.applicants_catalog(status = 'submitted', screening_type = 'pde')
 #info['entered'] = len(res_entered)
@@ -33 +35 @@
 
 info['submitted_pume'] = len(res_submitted_pume)
+info['admitted_pume'] = len(res_admitted_pume)
+info['not_admitted_pume'] = len(res_not_admitted_pume)
 info['submitted_pde'] = len(res_submitted_pde)