Changeset 2660 for WAeUP_SRP/base

Timestamp:

14 Nov 2007, 22:01:09 (17 years ago)

Author:

Henrik Bettermann

Message:

prepare statistics for session 2007/2008

06/07 new students who are not yet cleared will not be counted.

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/getSchoolFee.py (modified) (1 diff)
• waeup_statistics/getNewStudentStatistics.py (modified) (1 diff)
• waeup_statistics/getRetStudentStatistics.py (modified) (1 diff)
• waeup_student/student_view.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_epayment/getSchoolFee.py

@@ -26 +26 @@
                 '05': ('22200','23700'),
                 '06': ('22200','23700'),
+                '07': ('22200','23700'),
                 }
 pt_fees = {

WAeUP_SRP/base/skins/waeup_statistics/getNewStudentStatistics.py

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

WAeUP_SRP/base/skins/waeup_statistics/getRetStudentStatistics.py

@@ -18 +18 @@
 logger.info('%s invoked statistics' % context.portal_membership.getAuthenticatedMember())
 if not context.isStaff():
-    return
+    return 'Not allowed'
 
-entry_sessions = ('-1','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','06','0','1','2','3','4','5','6')
 
 ret_states =      ('returning',

WAeUP_SRP/base/skins/waeup_student/student_view.pt

@@ -90 +90 @@
             <td>
               <a href="edit" tal:attributes="href string:session_results_view">
-                <strong>Session Results</strong>
+                <strong>Session Results 2005/2006</strong>
               </a>             
             </td>