Changeset 2067 for WAeUP_SRP/trunk/skins/waeup_student/getNewStudentStatistics.py

Timestamp:

27 Jul 2007, 10:17:53 (17 years ago)

Author:

Henrik Bettermann

Message:

resolve ticket #315 number 1 and 2

File:

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

WAeUP_SRP/trunk/skins/waeup_student/getNewStudentStatistics.py

@@ -31 +31 @@
                    'courses_validated',
                    )
+
+full_time =       ('ume_ft','de_ft','ug_ft','pg_ft')
+part_time =       (         'de_pt','ug_pt','pg_pt')
+
 faculties = context.portal_catalog(portal_type="Faculty")
 
@@ -41 +45 @@
 dict['id'] = 'All Faculties'
 dict['title'] = 'All Faculties'
-res = context.students_catalog(entry_session = entry_sessions)
-dict['total'] = len(res)
+
+res_ft = context.students_catalog(entry_session = entry_sessions,  mode = full_time)
+dict['total_ft'] = len(res_ft)
+
+res_pt = context.students_catalog(entry_session = entry_sessions,  mode = part_time)
+dict['total_pt'] = len(res_pt)
+
 for state in new_states:
-    res = context.students_catalog(entry_session = entry_sessions, review_state = state)
-    dict[state] = len(res)
-    statepercent = state+'_percent'
-    if dict['total'] > 0:
-        dict[statepercent] = "%.0f" % round(dict[state]*100.0/dict['total'])
+    # full_time
+    res_ft = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = full_time)
+    state_ft = state + '_ft'
+    dict[state_ft] = len(res_ft)
+    statepercent = state+'_ft_percent'
+    if dict['total_ft'] > 0:
+        dict[statepercent] = "%.0f" % round(dict[state_ft]*100.0/dict['total_ft'])
     else:
         dict[statepercent] = 0
+        
+    # part_time
+    res_pt = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = part_time)
+    state_pt = state + '_pt'
+    dict[state_pt] = len(res_pt)
+    statepercent = state+'_pt_percent'
+    if dict['total_pt'] > 0:
+        dict[statepercent] = "%.0f" % round(dict[state_pt]*100.0/dict['total_pt'])
+    else:
+        dict[statepercent] = 0        
+        
 l.append(dict)
+
 
 for f in faculties:
@@ -57 +80 @@
     dict['id'] = f.getId
     dict['title'] = f.Title
-    res = context.students_catalog(entry_session = entry_sessions, faculty = f.getId)
-    dict['total'] = len(res)
+    res_ft = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, mode = full_time)
+    dict['total_ft'] = len(res_ft)
+    res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, mode = part_time)
+    dict['total_pt'] = len(res_pt)    
     for state in new_states:
-        res = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state)
-        dict[state] = len(res)
-        statepercent = state+'_percent'
-        if dict['total'] > 0:
-            dict[statepercent] = "%.0f" % round(dict[state]*100.0/dict['total'])
+        # full_time
+        res_ft = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = full_time)
+        state_ft = state + '_ft'
+        dict[state_ft] = len(res_ft)
+        statepercent = state+'_ft_percent'
+        if dict['total_ft'] > 0:
+            dict[statepercent] = "%.0f" % round(dict[state_ft]*100.0/dict['total_ft'])
         else:
             dict[statepercent] = 0
+            
+        # part_time
+        res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = part_time)
+        state_pt = state + '_pt'
+        dict[state_pt] = len(res_pt)
+        statepercent = state+'_pt_percent'
+        if dict['total_pt'] > 0:
+            dict[statepercent] = "%.0f" % round(dict[state_pt]*100.0/dict['total_pt'])
+        else:
+            dict[statepercent] = 0            
+            
     l.append(dict)
+
+
 
 return l