Changeset 3774 for WAeUP_SRP/trunk/skins/waeup_statistics/getRetStudentStatistics.py

Timestamp:

19 Nov 2008, 08:06:27 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve ticket #462

File:

• WAeUP_SRP/trunk/skins/waeup_statistics/getRetStudentStatistics.py (modified) (6 diffs)

WAeUP_SRP/trunk/skins/waeup_statistics/getRetStudentStatistics.py

@@ -20 +20 @@
     return 'Not allowed'
 
-entry_sessions = ('','-1','94','95','96','97','98','99','00','01','02','03','04','05','06','0','1','2','3','4','5','6')
+current_session = context.getSessionId()[0]
 
-current_session = context.getSessionId()[0]
+
+
+range1 = range(94,100,1)
+range2 = range(0,int(current_session),1)
+missing_values = ['','-1']
+entry_sessions = missing_values + [str(k) for k in range1+range2] + ['0'+str(k) for k in range2]
+
+#entry_sessions = ('','-1','94','95','96','97','98','99','00','01','02','03','04','05','06','07','0','1','2','3','4','5','6','7')
 
 ret_states =      ('returning',
@@ -31 +38 @@
 full_time =       ('ume_ft','de_ft','ug_ft','pg_ft')
 part_time =       (         'de_pt','ug_pt','pg_pt')
+diploma   =       ('dp_ft','dp_pt')
 
 faculties = context.portal_catalog(portal_type="Faculty")
@@ -48 +56 @@
 res_pt = context.students_catalog(entry_session = entry_sessions,  mode = part_time, review_state = ret_states)
 dict['total_pt'] = len(res_pt)
+
+res_dp = context.students_catalog(entry_session = entry_sessions,  mode = diploma, review_state = ret_states)
+dict['total_dp'] = len(res_dp)
 
 for state in ret_states:
@@ -69 +80 @@
     else:
         dict[statepercent] = 0
+        
+    # diploma
+    res_dp = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = diploma, session = current_session)
+    state_dp = state + '_dp'
+    dict[state_dp] = len(res_dp)
+    statepercent = state+'_dp_percent'
+    if dict['total_dp'] > 0:
+        dict[statepercent] = "%.0f" % round(dict[state_dp]*100.0/dict['total_dp'])
+    else:
+        dict[statepercent] = 0        
 
 l.append(dict)
@@ -81 +102 @@
     res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, mode = part_time)
     dict['total_pt'] = len(res_pt)
+    res_dp = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, mode = diploma)
+    dict['total_dp'] = len(res_dp)    
     for state in ret_states:
         # full_time
@@ -101 +124 @@
         else:
             dict[statepercent] = 0
+            
+        # diploma
+        res_dp = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = diploma, session = current_session)
+        state_dp = state + '_dp'
+        dict[state_dp] = len(res_dp)
+        statepercent = state+'_dp_percent'
+        if dict['total_dp'] > 0:
+            dict[statepercent] = "%.0f" % round(dict[state_dp]*100.0/dict['total_dp'])
+        else:
+            dict[statepercent] = 0
+            
 
     l.append(dict)