Changeset 1593 for WAeUP_SRP/branches/uli/skins/waeup_student/statistics_ret_view.pt

Timestamp:

19 Mar 2007, 18:57:54 (18 years ago)

Author:

uli

Message:

Merged current trunk into uli-branch.

File:

• WAeUP_SRP/branches/uli/skins/waeup_student/statistics_ret_view.pt (modified) (3 diffs)

WAeUP_SRP/branches/uli/skins/waeup_student/statistics_ret_view.pt

@@ -24 +24 @@
       <h3>Returning Student Statistics</h3>
       <br />      
+      <span tal:content="python:departments[0]['total_ret']" /> 
+      returning student records have been imported. 
+      <span tal:content="python:departments[0]['total_li']" /> returning students 
+      have logged in.
+      <br /><br />
       <span tal:condition="not:isAnon">
         <table>
           <tr class="odd ajaxtd">
             <th >Faculty</th>
-            <th align="right">Returning</th>
+            <th align="right">RET</th>
+            <th align="right">SFP</th>
           </tr>
           <tr tal:define="d python:departments[0]"
@@ -34 +40 @@
               <td width="80px">All Faculties</td>
               <td width="80px" align="right"> 
-                <span tal:content="d/sum" /> of <span tal:content="d/total" />
+                <span tal:content="d/ret" />
+              </td>   
+              <td width="80px" align="right"> 
+                <span tal:content="d/sfp" />
               </td>              
           </tr>
@@ -41 +50 @@
               <td width="80px"> <span tal:content="d/id" /> </td>
               <td width="80px" align="right"> 
-                <span tal:content="d/returned " />
-              </td>              
+                <span tal:content="d/ret" />
+              </td>       
+              <td width="80px" align="right"> 
+                <span tal:content="d/sfp" />
+              </td>                              
           </tr>
         </table>
         <br />
+        <table>
+        <tr><td>RET:</td> <td>Returning students who have logged in</td></tr>
+        <tr><td>SFP:</td> <td>Returning students who already paid their school fee</td></tr>
+        </table>        
       </span>
       </span>