Changeset 2707 for WAeUP_SRP

Timestamp:

19 Nov 2007, 07:18:47 (17 years ago)

Author:

Henrik Bettermann

Message:

total numbers changed

Location:

WAeUP_SRP/base/skins/waeup_statistics

Files:

• getSimpleStudentStatistics.py (modified) (3 diffs)
• statistics_simple_view.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_statistics/getSimpleStudentStatistics.py

@@ -85 +85 @@
 dict['total_Bdp'] = len(res_Bpt)
 
-res_Cft = context.students_catalog(review_state = catC, mode = full_time)
+res_Cft = context.students_catalog(review_state = catC, mode = full_time, session = current_session)
 dict['total_Cft'] = len(res_Cft)
 
-res_Cpt = context.students_catalog(review_state = catC, mode = part_time)
+res_Cpt = context.students_catalog(review_state = catC, mode = part_time, session = current_session)
 dict['total_Cpt'] = len(res_Cpt)
 
-res_Cdp = context.students_catalog(review_state = catC, mode = diploma)
+res_Cdp = context.students_catalog(review_state = catC, mode = diploma, session = current_session)
 dict['total_Cdp'] = len(res_Cdp)
 
@@ -97 +97 @@
 res_total = context.students_catalog()
 dict['total_in_catalog'] = len(res_total)
-dict['not_categorized'] = dict['total_in_catalog'] - dict['total_Aft'] - dict['total_Apt'] - dict['total_Adp'] - dict['total_Cft'] - dict['total_Cpt'] - dict['total_Cdp']
+dict['not_categorized'] = dict['total_in_catalog'] - dict['total_ft'] - dict['total_pt'] - dict['total_dp']
 
 l.append(dict)
@@ -134 +134 @@
     dict['total_Bdp'] = len(res_Bpt)
 
-    res_Cft = context.students_catalog(faculty = f.getId, review_state = catC, mode = full_time)
+    res_Cft = context.students_catalog(faculty = f.getId, review_state = catC, mode = full_time, session = current_session)
     dict['total_Cft'] = len(res_Cft)
 
-    res_Cpt = context.students_catalog(faculty = f.getId, review_state = catC, mode = part_time)
+    res_Cpt = context.students_catalog(faculty = f.getId, review_state = catC, mode = part_time, session = current_session)
     dict['total_Cpt'] = len(res_Cpt)
 
-    res_Cdp = context.students_catalog(faculty = f.getId, review_state = catC, mode = diploma)
+    res_Cdp = context.students_catalog(faculty = f.getId, review_state = catC, mode = diploma, session = current_session)
     dict['total_Cdp'] = len(res_Cdp)
 

WAeUP_SRP/base/skins/waeup_statistics/statistics_simple_view.pt

@@ -119 +119 @@
         <tr><td>Category A: </td> <td>students who paid their school fee in <span tal:content="session_str" /></td></tr>
         <tr><td>Category B: </td> <td>students who registered their courses online (A contains B) in <span tal:content="session_str" /></td></tr>
-        <tr><td>Category C: </td> <td>students who have not yet paid their school fee in <span tal:content="session_str" /></td></tr>
+        <tr><td>Category C: </td> <td>students who 'arrived' in <span tal:content="session_str" /> but have not yet paid their school fee</td></tr>
         <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-        <tr><td colspan="2">
+        <tr><td colspan="2"><strong>Remark:</strong> <span tal:content="python: faculties[0]['not_categorized']" /> returning students have not yet logged in and are thus not categorized.
              </td>
         </tr>