Changeset 3075


Ignore:
Timestamp:
31 Jan 2008, 16:50:40 (17 years ago)
Author:
Henrik Bettermann
Message:

statistics reworked

Location:
WAeUP_SRP/fceokene/waeup_custom
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/fceokene/waeup_custom/getSimpleStudentStatistics.py

    r3050 r3075  
    4242
    4343
    44 full_time =       ('ug_ft','',)
    45 part_time =       ('pce')
    46 diploma   =       ('prence')
     44returning =  ('110','120','200','210','220','300','310','320',)
     45new =        ('100')
     46prence   =   ('000')
    4747
    4848
    … …  
    5858
    5959
    60 res_ft = context.students_catalog(mode = full_time)
     60res_ft = context.students_catalog(level = returning)
    6161dict['total_ft'] = len(res_ft)
    6262
    63 res_pt = context.students_catalog(mode = part_time)
     63res_pt = context.students_catalog(level = new)
    6464dict['total_pt'] = len(res_pt)
    6565
    66 res_dp = context.students_catalog(mode = diploma)
     66res_dp = context.students_catalog(level = prence)
    6767dict['total_dp'] = len(res_dp)
    6868
    69 res_Aft = context.students_catalog(review_state = catA, mode = full_time, session = current_session)
     69res_Aft = context.students_catalog(review_state = catA, level = returning, session = current_session)
    7070dict['total_Aft'] = len(res_Aft)
    7171
    72 res_Apt = context.students_catalog(review_state = catA, mode = part_time, session = current_session)
     72res_Apt = context.students_catalog(review_state = catA, level = new, session = current_session)
    7373dict['total_Apt'] = len(res_Apt)
    7474
    75 res_Adp = context.students_catalog(review_state = catA, mode = diploma, session = current_session)
     75res_Adp = context.students_catalog(review_state = catA, level = prence, session = current_session)
    7676dict['total_Adp'] = len(res_Adp)
    7777
    78 res_Bft = context.students_catalog(review_state = catB, mode = full_time, session = current_session)
     78res_Bft = context.students_catalog(review_state = catB, level = returning, session = current_session)
    7979dict['total_Bft'] = len(res_Bft)
    8080
    81 res_Bpt = context.students_catalog(review_state = catB, mode = part_time, session = current_session)
     81res_Bpt = context.students_catalog(review_state = catB, level = new, session = current_session)
    8282dict['total_Bpt'] = len(res_Bpt)
    8383
    84 res_Bdp = context.students_catalog(review_state = catB, mode = diploma, session = current_session)
     84res_Bdp = context.students_catalog(review_state = catB, level = prence, session = current_session)
    8585dict['total_Bdp'] = len(res_Bdp)
    8686
    87 res_Cft = context.students_catalog(review_state = catC, mode = full_time, session = current_session)
     87res_Cft = context.students_catalog(review_state = catC, level = returning, session = current_session)
    8888dict['total_Cft'] = len(res_Cft)
    8989
    90 res_Cpt = context.students_catalog(review_state = catC, mode = part_time, session = current_session)
     90res_Cpt = context.students_catalog(review_state = catC, level = new, session = current_session)
    9191dict['total_Cpt'] = len(res_Cpt)
    9292
    93 res_Cdp = context.students_catalog(review_state = catC, mode = diploma, session = current_session)
     93res_Cdp = context.students_catalog(review_state = catC, level = prence, session = current_session)
    9494dict['total_Cdp'] = len(res_Cdp)
    9595
    … …  
    107107    dict['title'] = f.Title
    108108
    109     res_ft = context.students_catalog(faculty = f.getId, mode = full_time)
     109    res_ft = context.students_catalog(faculty = f.getId, level = returning)
    110110    dict['total_ft'] = len(res_ft)
    111111
    112     res_pt = context.students_catalog(faculty = f.getId, mode = part_time)
     112    res_pt = context.students_catalog(faculty = f.getId, level = new)
    113113    dict['total_pt'] = len(res_pt)
    114114
    115     res_dp = context.students_catalog(faculty = f.getId, mode = diploma)
     115    res_dp = context.students_catalog(faculty = f.getId, level = prence)
    116116    dict['total_dp'] = len(res_dp)
    117117
    118     res_Aft = context.students_catalog(faculty = f.getId, review_state = catA, mode = full_time, session = current_session)
     118    res_Aft = context.students_catalog(faculty = f.getId, review_state = catA, level = returning, session = current_session)
    119119    dict['total_Aft'] = len(res_Aft)
    120120
    121     res_Apt = context.students_catalog(faculty = f.getId, review_state = catA, mode = part_time, session = current_session)
     121    res_Apt = context.students_catalog(faculty = f.getId, review_state = catA, level = new, session = current_session)
    122122    dict['total_Apt'] = len(res_Apt)
    123123
    124     res_Adp = context.students_catalog(faculty = f.getId, review_state = catA, mode = diploma, session = current_session)
     124    res_Adp = context.students_catalog(faculty = f.getId, review_state = catA, level = prence, session = current_session)
    125125    dict['total_Adp'] = len(res_Adp)
    126126
    127     res_Bft = context.students_catalog(faculty = f.getId, review_state = catB, mode = full_time, session = current_session)
     127    res_Bft = context.students_catalog(faculty = f.getId, review_state = catB, level = returning, session = current_session)
    128128    dict['total_Bft'] = len(res_Bft)
    129129
    130     res_Bpt = context.students_catalog(faculty = f.getId, review_state = catB, mode = part_time, session = current_session)
     130    res_Bpt = context.students_catalog(faculty = f.getId, review_state = catB, level = new, session = current_session)
    131131    dict['total_Bpt'] = len(res_Bpt)
    132132
    133     res_Bdp = context.students_catalog(faculty = f.getId, review_state = catB, mode = diploma, session = current_session)
     133    res_Bdp = context.students_catalog(faculty = f.getId, review_state = catB, level = prence, session = current_session)
    134134    dict['total_Bdp'] = len(res_Bdp)
    135135
    136     res_Cft = context.students_catalog(faculty = f.getId, review_state = catC, mode = full_time, session = current_session)
     136    res_Cft = context.students_catalog(faculty = f.getId, review_state = catC, level = returning, session = current_session)
    137137    dict['total_Cft'] = len(res_Cft)
    138138
    139     res_Cpt = context.students_catalog(faculty = f.getId, review_state = catC, mode = part_time, session = current_session)
     139    res_Cpt = context.students_catalog(faculty = f.getId, review_state = catC, level = new, session = current_session)
    140140    dict['total_Cpt'] = len(res_Cpt)
    141141
    142     res_Cdp = context.students_catalog(faculty = f.getId, review_state = catC, mode = diploma, session = current_session)
     142    res_Cdp = context.students_catalog(faculty = f.getId, review_state = catC, level = prence, session = current_session)
    143143    dict['total_Cdp'] = len(res_Cdp)
    144144

  • WAeUP_SRP/fceokene/waeup_custom/statistics_simple_view.pt

    r2955 r3075  
    2727            <th>&nbsp;</th>
    2828           
    29             <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Total</th>
     29            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">All Students</th>
    3030           
    3131            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Category A</th>
    … …  
    4040          <tr class="odd ajaxtd">
    4141            <th >School</th>
    42             <th align="right">FT</th>
    43             <th align="right">PCE</th>
    44             <th align="right">PRENCE</th>
    45             <th align="right">FT</th>
    46             <th align="right">PCE</th>
    47             <th align="right">PRENCE</th>
    48             <th align="right">FT</th>
    49             <th align="right">PCE</th>
    50             <th align="right">PRENCE</th>
    51             <th align="right">FT</th>
    52             <th align="right">PCE</th>
    53             <th align="right">PRENCE</th>
     42            <th align="right">Returning</th>
     43            <th align="right">New</th>
     44            <th align="right">Pre-NCE</th>
     45            <th align="right">Returning</th>
     46            <th align="right">New</th>
     47            <th align="right">Pre-NCE</th>
     48            <th align="right">Returning</th>
     49            <th align="right">New</th>
     50            <th align="right">Pre-NCE</th>
     51            <th align="right">Returning</th>
     52            <th align="right">New</th>
     53            <th align="right">Pre-NCE</th>
    5454
    5555          </tr>
    … …  
    117117        <tr><td>Category B: </td> <td>students who registered their courses online (A contains B) in <span tal:content="session_str" /></td></tr>
    118118        <tr><td>Category C: </td> <td>students who 'arrived' in <span tal:content="session_str" /> but have not yet paid their school fee</td></tr>
     119        <tr><td>Returning: </td> <td>students in NCE-II or NCE-III</td></tr>
     120        <tr><td>New: </td> <td>students in NCE-I</td></tr>
    119121        <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
    120122        <tr><td colspan="2"><strong>Remark:</strong> <span tal:content="python: faculties[0]['not_categorized']" /> returning students are not categorized.
Note: See TracChangeset for help on using the changeset viewer.