Changeset 3959

Timestamp:

11 Feb 2009, 05:12:40 (16 years ago)

Author:

Henrik Bettermann

Message:

resolve #611 (part 3)

Location:

WAeUP_SRP/trunk/skins/waeup_statistics

Files:

• getNewStudentStatistics.py (modified) (1 diff)
• statistics_new_view.pt (modified) (7 diffs)

WAeUP_SRP/trunk/skins/waeup_statistics/getNewStudentStatistics.py

@@ -20 +20 @@
     return
 
-entry_sessions = (context.getSessionId()[0])
+session_id = context.getSessionId()[0]
+session_id_num = int(session_id)
+entry_sessions = (session_id,str(session_id_num))
 
 # students with entry_session None (-1) are interprteted as new AND returning students if they are

WAeUP_SRP/trunk/skins/waeup_statistics/statistics_new_view.pt

@@ -29 +29 @@
             <th >Faculty</th>
             <th align="right">Total New</th>
+            <th align="right">SC</th>
             <th align="right">AD</th>
             <th align="right">OR</th>
@@ -46 +47 @@
               </td>
               <td width="80px" align="right"> 
+                <span tal:content="d/student_created_ft" />
+                (<span tal:content="d/student_created_ft_percent" />%)
+              </td>    
+              <td width="80px" align="right"> 
                 <span tal:content="d/admitted_ft" />
                 (<span tal:content="d/admitted_ft_percent" />%)
@@ -88 +93 @@
             <th >Faculty</th>
             <th align="right">Total New</th>
+            <th align="right">SC</th>
             <th align="right">AD</th>
             <th align="right">OR</th>
@@ -105 +111 @@
               </td>
               <td width="80px" align="right"> 
+                <span tal:content="d/student_created_pt" />
+                (<span tal:content="d/student_created_pt_percent" />%)
+              </td>                  
+              <td width="80px" align="right"> 
                 <span tal:content="d/admitted_pt" />
                 (<span tal:content="d/admitted_pt_percent" />%)
@@ -147 +157 @@
             <th >Faculty</th>
             <th align="right">Total New</th>
+            <th align="right">SC</th>
             <th align="right">AD</th>
             <th align="right">OR</th>
@@ -164 +175 @@
               </td>
               <td width="80px" align="right"> 
+                <span tal:content="d/student_created_dp" />
+                (<span tal:content="d/student_created_dp_percent" />%)
+              </td>                  
+              <td width="80px" align="right"> 
                 <span tal:content="d/admitted_dp" />
                 (<span tal:content="d/admitted_dp_percent" />%)
@@ -202 +217 @@
         <br />
         <table>
+        <tr><td>SC:</td> <td>Created (not yet logged in)</td></tr>
         <tr><td>AD:</td> <td>Admitted</td></tr>
         <tr><td>OR:</td> <td>Objection raised</td></tr>