Changeset 1318

Timestamp:

18 Jan 2007, 11:12:10 (18 years ago)

Author:

Henrik Bettermann

Message:

statistics prepared for entry_level requests

File:

• WAeUP_SRP/trunk/skins/waeup_student/getNewStudentStatistics.py (modified) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getNewStudentStatistics.py

@@ -29 +29 @@
 dep['id'] = "All Faculties"
 
-total_new = aq_students(Eq('level','100'))
+umequery = Eq('level','100')
+#dequery = Eq('entry_mode','DE')  # only correct for 2006/2007
+#total_new = aq_students(umequery or dequery)
+total_new = aq_students(umequery)
 total_new = float(len(total_new))
 dep['new'] = "%.0f" % total_new
@@ -66 +69 @@
 dep['objection_raised_percent'] = "%.0f" % round(ora*100/total_new)
 
-ret_res = context.portal_catalog(review_state ='returning')
-ret_ids = [r.getId for r in ret_res]
-total_ret = aq_students(Ge('level','200'))
-total_ret = float(len(total_ret))
-dep['returning'] = "%.0f" % total_ret
-
 l.append(dep)
 fs = context.portal_catalog(portal_type="Faculty")
@@ -78 +75 @@
     dep['id'] = fid
     fquery = Eq('faculty',fid)
-    squery = Eq('level','100')
-    fac_res = aq_students(fquery & squery)
+    #umequery = Eq('level','100')
+    #fac_res = aq_students(fquery & umequery & dequery)
+    fac_res = aq_students(fquery & umequery)
     fac_ids = [r.id for r in fac_res]
     total = float(len(fac_res))
@@ -113 +111 @@
         dep['objection_raised_percent'] = "%.0f" % round(ora*100/total)
 
-    squery = Ge('level','200')
-    fac_res = aq_students(fquery & squery)
-    fac_ids = [r.id for r in fac_res]
-    ret = len([s for s in fac_ids if s in ret_ids])
-    dep['returning'] = ret
-
-    if total == 0 and ret == 0:
+    if total == 0:
         continue