Changeset 2068 for WAeUP_SRP/trunk

Timestamp:

27 Jul 2007, 13:56:17 (17 years ago)

Author:

Henrik Bettermann

Message:

see comment 07/27/07 13:57:14 in ticket #315

basic student statistics included

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getNewStudentStatistics.py (modified) (2 diffs)
• getRetStudentStatistics.py (modified) (8 diffs)
• getSimpleStudentStatistics.py (added)
• search_students_form.pt (modified) (2 diffs)
• statistics_simple_view.pt (added)

WAeUP_SRP/trunk/skins/waeup_student/getNewStudentStatistics.py

@@ -20 +20 @@
     return 'Not allowed'
 
-entry_sessions = ('06','6')
+entry_sessions = ('-1','06','6')
+
+# students with entry_session None (-1) are interprteted as new AND returning students if they are 
+# in either of the last three states
 
 new_states =      ('admitted',
@@ -46 +49 @@
 dict['title'] = 'All Faculties'
 
-res_ft = context.students_catalog(entry_session = entry_sessions,  mode = full_time)
+res_ft = context.students_catalog(entry_session = entry_sessions,  mode = full_time, review_state = new_states)
 dict['total_ft'] = len(res_ft)
 
-res_pt = context.students_catalog(entry_session = entry_sessions,  mode = part_time)
+res_pt = context.students_catalog(entry_session = entry_sessions,  mode = part_time, review_state = new_states)
 dict['total_pt'] = len(res_pt)
 

WAeUP_SRP/trunk/skins/waeup_student/getRetStudentStatistics.py

@@ -20 +20 @@
     return 'Not allowed'
 
-entry_sessions = ('94','95','96','97','98','99','00','01','02','03','04','05','0','1','2','3','4','5')
+entry_sessions = ('-1','94','95','96','97','98','99','00','01','02','03','04','05','0','1','2','3','4','5')
 
 ret_states =      ('returning',
@@ -28 +28 @@
                    )
 full_time =       ('ume_ft','de_ft','ug_ft','pg_ft')
-part_time =       (         'de_pt','ug_pt','pg_pt')                   
-                   
+part_time =       (         'de_pt','ug_pt','pg_pt')
+
 faculties = context.portal_catalog(portal_type="Faculty")
 
@@ -41 +41 @@
 dict['title'] = 'All Faculties'
 
-res_ft = context.students_catalog(entry_session = entry_sessions,  mode = full_time)
+res_ft = context.students_catalog(entry_session = entry_sessions,  mode = full_time, review_state = ret_states)
 dict['total_ft'] = len(res_ft)
 
-res_pt = context.students_catalog(entry_session = entry_sessions,  mode = part_time)
+res_pt = context.students_catalog(entry_session = entry_sessions,  mode = part_time, review_state = ret_states)
 dict['total_pt'] = len(res_pt)
 
@@ -57 +57 @@
     else:
         dict[statepercent] = 0
-        
+
     # part_time
     res_pt = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = part_time)
@@ -66 +66 @@
         dict[statepercent] = "%.0f" % round(dict[state_pt]*100.0/dict['total_pt'])
     else:
-        dict[statepercent] = 0        
-        
+        dict[statepercent] = 0
+
 l.append(dict)
 
@@ -78 +78 @@
     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)    
+    dict['total_pt'] = len(res_pt)
     for state in ret_states:
         # full_time
@@ -89 +89 @@
         else:
             dict[statepercent] = 0
-            
+
         # part_time
         res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = part_time)
@@ -98 +98 @@
             dict[statepercent] = "%.0f" % round(dict[state_pt]*100.0/dict['total_pt'])
         else:
-            dict[statepercent] = 0            
-            
+            dict[statepercent] = 0
+
     l.append(dict)
 

WAeUP_SRP/trunk/skins/waeup_student/search_students_form.pt

@@ -18 +18 @@
       <nobr><a href="statistics_ret_view">Returning Student Statistics</a>
       &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
-      <nobr><a href="list_students">Cleared Student Export</a>
-      &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
       <span tal:condition="is_so">
          <nobr><a href="view_logs">View Log Files</a>
@@ -25 +23 @@
          <nobr><a href="add_student">Add Student Record</a>        
          &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
-         <nobr><a href="paid_transfer_list">Export Transfer Students</a></nobr>    
+         <nobr><a href="paid_transfer_list">Export Transfer Students</a>
+         &nbsp;&nbsp;&nbsp;&nbsp;</nobr>
+         <nobr><a href="list_students">Cleared Student Export</a></nobr>             
       </span>
       </strong>