Changeset 3575


Ignore:
Timestamp:
17 Jul 2008, 10:03:10 (16 years ago)
Author:
Henrik Bettermann
Message:

customize statistics

Location:
WAeUP_SRP/aaua/waeup_custom
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/aaua/waeup_custom/getSimpleStudentStatistics.py

    r3075 r3575  
    4242
    4343
    44 returning =  ('110','120','200','210','220','300','310','320',)
    45 new =        ('100')
    46 prence   =   ('000')
     44returning =  ('110','120','200','210','220','300','310','320','400','410','420','500','510', '520','500','510','520','610','620','700','710','720','800','810','820',)
     45new =        ('100','600')
    4746
    4847
    … …  
    5453
    5554dict = {}
    56 dict['id'] = 'All Schools'
    57 dict['title'] = 'All Schools'
     55dict['id'] = 'All Faculties'
     56dict['title'] = 'All Faculties'
    5857
    5958
    … …  
    6463dict['total_pt'] = len(res_pt)
    6564
    66 res_dp = context.students_catalog(level = prence)
    67 dict['total_dp'] = len(res_dp)
    68 
    6965res_Aft = context.students_catalog(review_state = catA, level = returning, session = current_session)
    7066dict['total_Aft'] = len(res_Aft)
    … …  
    7369dict['total_Apt'] = len(res_Apt)
    7470
    75 res_Adp = context.students_catalog(review_state = catA, level = prence, session = current_session)
    76 dict['total_Adp'] = len(res_Adp)
     71
    7772
    7873res_Bft = context.students_catalog(review_state = catB, level = returning, session = current_session)
    … …  
    8277dict['total_Bpt'] = len(res_Bpt)
    8378
    84 res_Bdp = context.students_catalog(review_state = catB, level = prence, session = current_session)
    85 dict['total_Bdp'] = len(res_Bdp)
     79
    8680
    8781res_Cft = context.students_catalog(review_state = catC, level = returning, session = current_session)
    … …  
    9185dict['total_Cpt'] = len(res_Cpt)
    9286
    93 res_Cdp = context.students_catalog(review_state = catC, level = prence, session = current_session)
    94 dict['total_Cdp'] = len(res_Cdp)
     87
    9588
    9689
    9790res_total = context.students_catalog()
    9891dict['total_in_catalog'] = len(res_total)
    99 dict['not_categorized'] = dict['total_in_catalog'] - dict['total_ft'] - dict['total_pt'] - dict['total_dp']
     92dict['not_categorized'] = dict['total_in_catalog'] - dict['total_ft'] - dict['total_pt']
    10093
    10194l.append(dict)
    … …  
    113106    dict['total_pt'] = len(res_pt)
    114107
    115     res_dp = context.students_catalog(faculty = f.getId, level = prence)
    116     dict['total_dp'] = len(res_dp)
    117108
    118109    res_Aft = context.students_catalog(faculty = f.getId, review_state = catA, level = returning, session = current_session)
    … …  
    122113    dict['total_Apt'] = len(res_Apt)
    123114
    124     res_Adp = context.students_catalog(faculty = f.getId, review_state = catA, level = prence, session = current_session)
    125     dict['total_Adp'] = len(res_Adp)
     115
    126116
    127117    res_Bft = context.students_catalog(faculty = f.getId, review_state = catB, level = returning, session = current_session)
    … …  
    131121    dict['total_Bpt'] = len(res_Bpt)
    132122
    133     res_Bdp = context.students_catalog(faculty = f.getId, review_state = catB, level = prence, session = current_session)
    134     dict['total_Bdp'] = len(res_Bdp)
     123
    135124
    136125    res_Cft = context.students_catalog(faculty = f.getId, review_state = catC, level = returning, session = current_session)
    … …  
    140129    dict['total_Cpt'] = len(res_Cpt)
    141130
    142     res_Cdp = context.students_catalog(faculty = f.getId, review_state = catC, level = prence, session = current_session)
    143     dict['total_Cdp'] = len(res_Cdp)
     131
    144132
    145133

  • WAeUP_SRP/aaua/waeup_custom/statistics_simple_view.pt

    r3075 r3575  
    2727            <th>&nbsp;</th>
    2828           
    29             <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">All Students</th>
     29            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="2">All Students</th>
    3030           
    31             <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Category A</th>
     31            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="2">Category A</th>
    3232
    33             <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Category B</th>
     33            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="2">Category B</th>
    3434
    35             <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="3">Category C</th>
     35            <th style="border-style:solid; border-width:1px; border-color:black" align="center" colspan="2">Category C</th>
    3636
    3737
    … …  
    3939
    4040          <tr class="odd ajaxtd">
    41             <th >School</th>
     41            <th >Faculty</th>
    4242            <th align="right">Returning</th>
    4343            <th align="right">New</th>
    44             <th align="right">Pre-NCE</th>
     44
    4545            <th align="right">Returning</th>
    4646            <th align="right">New</th>
    47             <th align="right">Pre-NCE</th>
     47
    4848            <th align="right">Returning</th>
    4949            <th align="right">New</th>
    50             <th align="right">Pre-NCE</th>
     50
    5151            <th align="right">Returning</th>
    5252            <th align="right">New</th>
    53             <th align="right">Pre-NCE</th>
     53
    5454
    5555          </tr>
    … …  
    6666              </td>             
    6767
    68               <td width="60px" align="right">
    69                 <span tal:content="d/total_dp" />
    70               </td>                 
    71              
     68
    7269              <td width="60px" align="right">
    7370                <span tal:content="d/total_Aft" />
    … …  
    7875              </td>             
    7976
    80               <td width="60px" align="right">
    81                 <span tal:content="d/total_Adp" />
    82               </td>             
     77     
    8378
    8479              <td width="60px" align="right">
    … …  
    9085              </td>             
    9186             
    92               <td width="60px" align="right">
    93                 <span tal:content="d/total_Bdp" />
    94               </td>     
     87   
    9588             
    9689              <td width="60px" align="right">
    … …  
    10295              </td>     
    10396             
    104               <td width="60px" align="right">
    105                 <span tal:content="d/total_Cdp" />
    106               </td>                                               
     97                                       
    10798
    10899                                       
    … …  
    117108        <tr><td>Category B: </td> <td>students who registered their courses online (A contains B) in <span tal:content="session_str" /></td></tr>
    118109        <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>
     110        <tr><td>New: </td> <td>students in level 100 or 600</td></tr>
    121111        <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
    122112        <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.