Changeset 1671

Timestamp:

7 Apr 2007, 16:26:28 (17 years ago)

Author:

joachim

Message:

added a new line Check, which calculates the sum of the column

File:

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

WAeUP_SRP/trunk/skins/waeup_student/getNewStudentStatistics.py

@@ -72 +72 @@
     sid_in_faculty = [s.id for s in context.students_catalog(faculty=f.getId)]
     new_in_faculty = intersect(new_ids,sid_in_faculty)
-    rest = len(new_in_faculty)
+    dict['new'] = rest = len(new_in_faculty)
     for state in special_states:
         state_count = len(intersect(state_ids[state], new_in_faculty))
@@ -96 +96 @@
 fac_ids = [f.getId for f in faculties]
 fac_ids.sort()
+check_dict = {}
+check_dict['id'] = 'Check'
+check_dict['new'] = 0
+check_dict['new_percent'] = 0
+check_dict['rest'] = 0
+check_dict['rest_percent'] = 0
+for state in special_states:
+    check_dict[state] = 0
+    check_dict["%s_percent" % state] = 0
+    
 for f in fac_ids:
-    sum = 0
+    total_fac = fac_res[f]['new']
+    check_dict['new'] = check_dict['new'] + total_fac
+    check_dict['rest'] = check_dict['rest'] + fac_res[f]['rest']
     for state in special_states:
-        sum += fac_res[f][state]
-        fac_res[f]['%s_percent' % state] = "%.0f" % round(fac_res[f][state]*100/total_new)
-    fac_res[f]['rest_percent'] = "%.0f" % round(fac_res[f]['rest']*100/total_new)
-    sum += fac_res[f]['rest']
-    fac_res[f]['new'] = sum
+        check_dict[state] = check_dict[state] + fac_res[f][state]
+        if total_fac != 0:
+            fac_res[f]['%s_percent' % state] = "%.0f" % round(fac_res[f][state]*100/total_fac)
+        else:
+            fac_res[f]['%s_percent' % state] = "%.0f" % 0.0
+    if total_fac != 0:
+        fac_res[f]['rest_percent'] = "%.0f" % round(fac_res[f]['rest']*100/total_fac)
+    else:
+        fac_res[f]['rest_percent'] = "%.0f" % 0.0
     l.append(fac_res[f])
-    
+l.append(check_dict)    
 
 return l