Changeset 2087

Timestamp:

5 Aug 2007, 20:41:13 (17 years ago)

Author:

Henrik Bettermann

Message:

see ticket #315 (not yet tested)

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getSimpleStudentStatistics.py (modified) (2 diffs)
• statistics_simple_view.pt (modified) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getSimpleStudentStatistics.py

@@ -54 +54 @@
 dict['title'] = 'All Faculties'
 
+
+res_ft = context.students_catalog(mode = full_time)
+dict['total_ft'] = len(res_ft)
+
+res_pt = context.students_catalog(mode = part_time)
+dict['total_pt'] = len(res_pt)
+
+res_dp = context.students_catalog(mode = diploma)
+dict['total_dp'] = len(res_dp)
+
 res_Aft = context.students_catalog(review_state = catA, mode = full_time)
 dict['total_Aft'] = len(res_Aft)
@@ -93 +103 @@
     dict['id'] = f.getId
     dict['title'] = f.Title
+    
+    res_ft = context.students_catalog(faculty = f.getId, mode = full_time)
+    dict['total_ft'] = len(res_ft)
+
+    res_pt = context.students_catalog(faculty = f.getId, mode = part_time)
+    dict['total_pt'] = len(res_pt)
+
+    res_dp = context.students_catalog(faculty = f.getId, mode = diploma)
+    dict['total_dp'] = len(res_dp)    
+    
     res_Aft = context.students_catalog(faculty = f.getId, review_state = catA, mode = full_time)
     dict['total_Aft'] = len(res_Aft)

WAeUP_SRP/trunk/skins/waeup_student/statistics_simple_view.pt

@@ -28 +28 @@
           <tr>
             <th>&nbsp;</th>
+            
+            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Total</th>
+            
             <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Category A</th>
 
@@ -48 +51 @@
             <th align="right">PT</th>
             <th align="right">DP</th>
+            <th align="right">FT</th>
+            <th align="right">PT</th>
+            <th align="right">DP</th>
 
           </tr>
@@ -54 +60 @@
               <td width="80px"> <span tal:content="d/id" /> </td>
 
+              <td width="60px" align="right"> 
+                <span tal:content="d/total_ft" />
+              </td>              
+
+              <td width="60px" align="right"> 
+                <span tal:content="d/total_pt" />
+              </td>              
+
+              <td width="60px" align="right"> 
+                <span tal:content="d/total_dp" />
+              </td>                 
+              
               <td width="60px" align="right"> 
                 <span tal:content="d/total_Aft" />
@@ -100 +118 @@
         <tr><td>Category A: </td> <td>students who paid their school fee</td></tr>
         <tr><td>Category B: </td> <td>students who registered their courses online (A contains B)</td></tr>
-        <tr><td>Category C: </td> <td>students who who have not yet paid their school fee</td></tr>
+        <tr><td>Category C: </td> <td>students who have not yet paid their school fee</td></tr>
         <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
         <tr><td colspan="2"><strong>Notice:</strong> Category C is not complete.