Changeset 2705


Ignore:
Timestamp:
18 Nov 2007, 20:42:56 (17 years ago)
Author:
Henrik Bettermann
Message:

new statistics for session 2007/2008

Location:
WAeUP_SRP/base/skins/waeup_statistics
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/skins/waeup_statistics/getNewStudentStatistics.py

    r2660 r2705  
    2525# in either of the last three states
    2626
    27 new_states =      ('admitted',
     27new_states =      ('student_created',
     28                   'admitted',
    2829                   'clearance_pin_entered',
    2930                   'objection_raised',

  • WAeUP_SRP/base/skins/waeup_statistics/getRetStudentStatistics.py

    r2660 r2705  
    2121
    2222entry_sessions = ('','-1','94','95','96','97','98','99','00','01','02','03','04','05','06','0','1','2','3','4','5','6')
     23
     24current_session = context.getSessionId()[0]
    2325
    2426ret_states =      ('returning',
    … …  
    4951for state in ret_states:
    5052    # full_time
    51     res_ft = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = full_time)
     53    res_ft = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = full_time, session = current_session)
    5254    state_ft = state + '_ft'
    5355    dict[state_ft] = len(res_ft)
    … …  
    5961
    6062    # part_time
    61     res_pt = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = part_time)
     63    res_pt = context.students_catalog(entry_session = entry_sessions, review_state = state,  mode = part_time, session = current_session)
    6264    state_pt = state + '_pt'
    6365    dict[state_pt] = len(res_pt)
    … …  
    8183    for state in ret_states:
    8284        # full_time
    83         res_ft = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = full_time)
     85        res_ft = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = full_time, session = current_session)
    8486        state_ft = state + '_ft'
    8587        dict[state_ft] = len(res_ft)
    … …  
    9193
    9294        # part_time
    93         res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = part_time)
     95        res_pt = context.students_catalog(entry_session = entry_sessions, faculty = f.getId, review_state = state, mode = part_time, session = current_session)
    9496        state_pt = state + '_pt'
    9597        dict[state_pt] = len(res_pt)

  • WAeUP_SRP/base/skins/waeup_statistics/getSimpleStudentStatistics.py

    r2431 r2705  
    2020    return
    2121
    22 #entry_sessions = ('-1','94','95','96','97','98','99','00','01','02','03','04','05','0','1','2','3','4','5')
    2322
    2423catA =      (      'school_fee_paid',
    … …  
    3130                   )
    3231
    33 catC =      (      'returning',
     32catC =      (      'student_created',
     33                   'returning',
    3434                   'admitted',
    3535                   'clearance_pin_entered',
    … …  
    3838                   'cleared_and_validated',
    3939                   )
     40
     41current_session = context.getSessionId()[0]
    4042
    4143
    … …  
    6567dict['total_dp'] = len(res_dp)
    6668
    67 res_Aft = context.students_catalog(review_state = catA, mode = full_time)
     69res_Aft = context.students_catalog(review_state = catA, mode = full_time, session = current_session)
    6870dict['total_Aft'] = len(res_Aft)
    6971
    70 res_Apt = context.students_catalog(review_state = catA, mode = part_time)
     72res_Apt = context.students_catalog(review_state = catA, mode = part_time, session = current_session)
    7173dict['total_Apt'] = len(res_Apt)
    7274
    73 res_Adp = context.students_catalog(review_state = catA, mode = diploma)
     75res_Adp = context.students_catalog(review_state = catA, mode = diploma, session = current_session)
    7476dict['total_Adp'] = len(res_Adp)
    7577
    76 res_Bft = context.students_catalog(review_state = catB, mode = full_time)
     78res_Bft = context.students_catalog(review_state = catB, mode = full_time, session = current_session)
    7779dict['total_Bft'] = len(res_Bft)
    7880
    79 res_Bpt = context.students_catalog(review_state = catB, mode = part_time)
     81res_Bpt = context.students_catalog(review_state = catB, mode = part_time, session = current_session)
    8082dict['total_Bpt'] = len(res_Bpt)
    8183
    82 res_Bdp = context.students_catalog(review_state = catB, mode = diploma)
     84res_Bdp = context.students_catalog(review_state = catB, mode = diploma, session = current_session)
    8385dict['total_Bdp'] = len(res_Bpt)
    8486
    … …  
    114116    dict['total_dp'] = len(res_dp)
    115117
    116     res_Aft = context.students_catalog(faculty = f.getId, review_state = catA, mode = full_time)
     118    res_Aft = context.students_catalog(faculty = f.getId, review_state = catA, mode = full_time, session = current_session)
    117119    dict['total_Aft'] = len(res_Aft)
    118120
    119     res_Apt = context.students_catalog(faculty = f.getId, review_state = catA, mode = part_time)
     121    res_Apt = context.students_catalog(faculty = f.getId, review_state = catA, mode = part_time, session = current_session)
    120122    dict['total_Apt'] = len(res_Apt)
    121123
    122     res_Adp = context.students_catalog(faculty = f.getId, review_state = catA, mode = diploma)
     124    res_Adp = context.students_catalog(faculty = f.getId, review_state = catA, mode = diploma, session = current_session)
    123125    dict['total_Adp'] = len(res_Adp)
    124126
    125     res_Bft = context.students_catalog(faculty = f.getId, review_state = catB, mode = full_time)
     127    res_Bft = context.students_catalog(faculty = f.getId, review_state = catB, mode = full_time, session = current_session)
    126128    dict['total_Bft'] = len(res_Bft)
    127129
    128     res_Bpt = context.students_catalog(faculty = f.getId, review_state = catB, mode = part_time)
     130    res_Bpt = context.students_catalog(faculty = f.getId, review_state = catB, mode = part_time, session = current_session)
    129131    dict['total_Bpt'] = len(res_Bpt)
    130132
    131     res_Bdp = context.students_catalog(faculty = f.getId, review_state = catB, mode = diploma)
     133    res_Bdp = context.students_catalog(faculty = f.getId, review_state = catB, mode = diploma, session = current_session)
    132134    dict['total_Bdp'] = len(res_Bpt)
    133135

  • WAeUP_SRP/base/skins/waeup_statistics/statistics_new_view.pt

    r2243 r2705  
    33  <metal:block tal:define="faculties context/getNewStudentStatistics;
    44                        mtool here/portal_membership;
    5                         member mtool/getAuthenticatedMember;">       
     5                        member mtool/getAuthenticatedMember;
     6                        session_str python:context.getSessionId()[1];">       
    67
    78      <span tal:condition="not: faculties">
    … …  
    1718      </strong>     
    1819
    19       <h3>New Student Statistics</h3>
     20      <h3>New Student Statistics <span tal:content="session_str" /></h3>
    2021      <br />     
    2122      <span tal:condition="not:isAnon">

  • WAeUP_SRP/base/skins/waeup_statistics/statistics_ret_view.pt

    r2243 r2705  
    33  <metal:block tal:define="faculties context/getRetStudentStatistics;
    44                        mtool here/portal_membership;
    5                         member mtool/getAuthenticatedMember;">       
     5                        member mtool/getAuthenticatedMember;
     6                        session_str python:context.getSessionId()[1];">       
    67
    78      <span tal:condition="not: faculties">
    … …  
    1718      </strong>     
    1819
    19       <h3>Returning Student Statistics</h3>
     20      <h3>Returning Student Statistics  <span tal:content="session_str" /></h3>
    2021      <br />     
    2122      <span tal:condition="not:isAnon">
    … …  
    4041                <span tal:content="d/total_ft" />
    4142              </td>
     43                         
    4244              <td width="80px" align="right">
    4345                <span tal:content="d/returning_ft" />
    … …  
    7981                <span tal:content="d/total_pt" />
    8082              </td>
     83         
    8184              <td width="80px" align="right">
    8285                <span tal:content="d/returning_pt" />

  • WAeUP_SRP/base/skins/waeup_statistics/statistics_simple_view.pt

    r2243 r2705  
    33  <metal:block tal:define="faculties context/getSimpleStudentStatistics;
    44                        mtool here/portal_membership;
    5                         member mtool/getAuthenticatedMember;">       
     5                        member mtool/getAuthenticatedMember;
     6                        session_str python:context.getSessionId()[1]">       
    67
    78      <span tal:condition="not: faculties">
    … …  
    1920      </strong>     
    2021
    21       <h3>Basic Student Statistics</h3>
     22      <h3>Basic Student Statistics <span tal:content="session_str" /></h3>
    2223      <br />     
    2324      <span tal:condition="not:isAnon">
    … …  
    116117        <table   border=0>
    117118
    118         <tr><td>Category A: </td> <td>students who paid their school fee</td></tr>
    119         <tr><td>Category B: </td> <td>students who registered their courses online (A contains B)</td></tr>
    120         <tr><td>Category C: </td> <td>students who have not yet paid their school fee</td></tr>
     119        <tr><td>Category A: </td> <td>students who paid their school fee in <span tal:content="session_str" /></td></tr>
     120        <tr><td>Category B: </td> <td>students who registered their courses online (A contains B) in <span tal:content="session_str" /></td></tr>
     121        <tr><td>Category C: </td> <td>students who have not yet paid their school fee in <span tal:content="session_str" /></td></tr>
    121122        <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
    122         <tr><td colspan="2"><strong>Notice:</strong> Category C is not complete.
    123                 <span tal:content="python: faculties[0]['not_categorized']" /> returning full-time students have not yet logged in and are thus not categorized.
     123        <tr><td colspan="2">
    124124             </td>
    125125        </tr>
Note: See TracChangeset for help on using the changeset viewer.