Ignore:
Timestamp:
13 Nov 2007, 14:06:31 (17 years ago)
Author:
joachim
Message:

fix for #207

Location:
WAeUP_SRP/base/skins/waeup_student
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

    r2483 r2640  
    8181
    8282current_level = sbrain.level
     83set_trace
    8384levels = context.objectIds()
    8485review_state = wftool.getInfoFor(context,'review_state',None)
    … …  
    8788    wftool.doActionFor(context,'close_for_edit')
    8889may_register = (student_review_state in ('school_fee_paid',)) and\
    89                current_level not in levels and\
    90                (previous_verdict in ('A','B','C','F','J','L','M') or sbrain.level == '100' or (sbrain.mode.startswith('de') and sbrain.level == '200'))
    91 
     90                current_level not in levels and\
     91                (previous_verdict in ('A','B','C','F','J','L','M') or\
     92                sbrain.level == '100' or\
     93               (sbrain.mode.startswith('de') and sbrain.level == '200'))
    9294levels.sort()
    9395info['create_level'] = None
     96student_levels_voc = context.portal_vocabularies.student_levels
    9497if may_register:
    9598    info['create_level'] = current_level
     99    info['create_level_str'] = student_levels_voc.get(current_level)
    96100for l in levels:
    97101    row = {}
    98102    row['id'] = l
    99     row['title'] = "Level %s" % l
    100     #row['title'] = context.portal_vocabularies.levels_voc[l]
     103    #row['title'] = "Level %s" % l
     104    row['title'] = student_levels_voc.get(l)
    101105    row['url'] = "%s/%s" % (context.absolute_url(),l)
    102106    items.append(row)

  • WAeUP_SRP/base/skins/waeup_student/student_view.pt

    r2606 r2640  
    11<metal:body use-macro="here/main_template/macros/master">
    2     <metal:main fill-slot="main"
    3            tal:define="info context/getStudentFolderInfo;
    4                        baseinfo context/getStudentBaseInfo">
    5       <metal:block tal:condition="not: info">
    6         <span tal:content="here/illegal_view" />
    7       </metal:block>
    8       <metal:block tal:condition="info">
     2  <metal:main fill-slot="main"
     3              tal:define="info context/getStudentFolderInfo;
     4              baseinfo context/getStudentBaseInfo"
     5              >
     6    <metal:block tal:condition="not: info">
     7      <span tal:content="here/illegal_view" />
     8    </metal:block>
     9    <metal:block tal:condition="info">
    910      <metal:block tal:define="review_state info/review_state;
    10                         rows python: info['items'];
    11                         is_so info/is_sectionofficer|nothing;
    12                         is_staff info/is_staff|nothing;
    13                         is_student info/is_student">
    14 
    15       <a href="" tal:condition="is_staff"
    16          tal:attributes="href string:${here/academicsParent}">
    17         <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
    18         Up one level
    19       </a>
     11      rows python: info['items'];
     12      is_so info/is_sectionofficer|nothing;
     13      is_staff info/is_staff|nothing;
     14      is_student info/is_student"
     15      >
     16        <a href="" tal:condition="is_staff"
     17           tal:attributes="href string:${here/academicsParent}">
     18          <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
     19          Up one level
     20        </a>
    2021        <h3 tal:content="info/name" />
    2122        <br />
    22        
    23        
    24        
    25       <table>
    26         <tr>
    27           <td width="220px">Registration Number:</td>
    28           <td><span tal:content="baseinfo/student/jamb_reg_no" /></td>
    29         </tr>
    30         <tr>
    31           <td>Matriculation Number:</td>
    32           <td><span tal:content="baseinfo/student/matric_no" /></td>
    33         </tr>     
    34         <tr>
    35           <td>Certificate Code:</td>
    36           <td><span tal:content="baseinfo/student/course" /></td>
    37         </tr>
    38         <tr>
    39           <td>Faculty Id:</td>
    40           <td tal:content="baseinfo/student/faculty" />
    41         </tr>
    42         <tr>
    43           <td>Department Id:</td>
    44           <td><span tal:content="baseinfo/student/department" /></td>
    45         </tr>
    46         <tr>
    47           <td>Current Session:</td>
    48           <td><span tal:content="python:context.portal_vocabularies.sessions.get(baseinfo['student']['session'])" /></td>
    49         </tr>
    50         <tr>
    51           <td>Current Study Level:</td>
    52           <td><span tal:content="python:context.portal_vocabularies.levels.get(baseinfo['student']['level'])" /></td>
    53         </tr>
    54         <tr>
    55           <td>Current Study Mode:</td>
    56           <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(baseinfo['student']['mode'])" /></td>
    57         </tr>       
    58         <tr tal:define="verdict python:context.portal_vocabularies.verdicts.get(baseinfo['student']['verdict'])">
    59           <td>Current Verdict:</td>
    60           <td><span tal:condition="verdict" tal:content="python:verdict.upper()" /></td>
    61         </tr>
    62       </table>           
    63        
    64       <br />
    65      
    66       <table tal:condition="is_staff" class="contentListing" width="100%" summary="content layout" id="folder_content">     
    67 
    68         <span tal:repeat="row rows">
    69         <tr tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    70           <td><a href="view" tal:attributes="href string:${row/url}">
    71             <strong tal:content="row/title" /></a> </td>
    72           <td>
    73           <a tal:condition="python: row['is_editable'] and not row['type'] in ('StudentClearance','StudentAccommodation','PaymentsFolder')"
    74               href="edit" tal:attributes="href string:${row/url}/external_edit_form"
    75               target="edit"
    76               onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
    77               [edit]
    78           </a>
    79           <a tal:condition="python: row['is_editable'] and row['type']=='StudentClearance'"
    80               href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
    81               target="edit"
    82               onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
    83               [edit and change state]
    84           </a> 
    85           <a tal:condition="python: context.isClearanceOfficer() and row['type']=='StudentClearance'"
    86               href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
    87               target="edit"
    88               onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
    89               [change state]
    90           </a>                           
    91           </td>
    92          
    93         </tr>
    94         </span>
    95         <tr tal:condition="info/session">
    96           <td>
     23        <table>
     24          <tr>
     25            <td width="220px">Registration Number:</td>
     26            <td><span tal:content="baseinfo/student/jamb_reg_no" /></td>
     27          </tr>
     28          <tr>
     29            <td>Matriculation Number:</td>
     30            <td><span tal:content="baseinfo/student/matric_no" /></td>
     31          </tr>     
     32          <tr>
     33            <td>Certificate Code:</td>
     34            <td><span tal:content="baseinfo/student/course" /></td>
     35          </tr>
     36          <tr>
     37            <td>Faculty Id:</td>
     38            <td tal:content="baseinfo/student/faculty" />
     39          </tr>
     40          <tr>
     41            <td>Department Id:</td>
     42            <td><span tal:content="baseinfo/student/department" /></td>
     43          </tr>
     44          <tr>
     45            <td>Current Session:</td>
     46            <td><span tal:content="python:context.portal_vocabularies.sessions.get(baseinfo['student']['session'])" /></td>
     47          </tr>
     48          <tr>
     49            <td>Current Study Level:</td>
     50            <td><span tal:content="python:context.portal_vocabularies.student_levels.get(baseinfo['student']['level'])" /></td>
     51          </tr>
     52          <tr>
     53            <td>Current Study Mode:</td>
     54            <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(baseinfo['student']['mode'])" /></td>
     55          </tr>       
     56          <tr tal:define="verdict python:context.portal_vocabularies.verdicts.get(baseinfo['student']['verdict'])">
     57            <td>Current Verdict:</td>
     58            <td><span tal:condition="verdict" tal:content="python:verdict.upper()" /></td>
     59          </tr>
     60        </table>           
     61        <br />
     62        <table tal:condition="is_staff" class="contentListing" width="100%" summary="content layout" id="folder_content">     
     63          <span tal:repeat="row rows">
     64            <tr tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
     65              <td><a href="view" tal:attributes="href string:${row/url}">
     66                  <strong tal:content="row/title" /></a> </td>
     67              <td>
     68                <a tal:condition="python: row['is_editable'] and not row['type'] in ('StudentClearance','StudentAccommodation','PaymentsFolder')"
     69                   href="edit" tal:attributes="href string:${row/url}/external_edit_form"
     70                   target="edit"
     71                   onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
     72                  [edit]
     73                </a>
     74                <a tal:condition="python: row['is_editable'] and row['type']=='StudentClearance'"
     75                   href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
     76                   target="edit"
     77                   onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
     78                  [edit and change state]
     79                </a> 
     80                <a tal:condition="python: context.isClearanceOfficer() and row['type']=='StudentClearance'"
     81                   href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
     82                   target="edit"
     83                   onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
     84                  [change state]
     85                </a>                           
     86              </td>
     87            </tr>
     88          </span>
     89          <tr tal:condition="info/session">
     90            <td>
    9791              <a href="edit" tal:attributes="href string:session_results_view">
    98               <strong>Session Results</strong>
    99           </a>             
    100           </td>
    101           <td>
    102              &nbsp;
    103           </td>
    104         </tr>
    105       </table>
    106      
    107                
    108      
    109       <form action="mail_password_form" method="post" class="group"
    110             tal:condition="is_staff"
    111             tal:attributes="action string:${context/absolute_url}/mail_password_form">
    112          <br />
    113          <input type="submit" class="context" value="Send Email with Authentication Data" />
    114       </form>
    115 
    116 
    117       <div tal:condition="python:info['review_state']=='deactivated'">
    118       <font color="red">This student record has been deactivated!</font>
    119       </div>
    120      
    121 
    122       <table tal:condition="python:is_student and info['review_state']!='deactivated'" class="contentListing" width="" summary="content layout" id="folder_content">     
    123         <span tal:repeat="row rows">
    124           <tr tal:condition="row/display">
    125             <td width="220px"><a href="view" tal:condition="row/s_view_link"
    126                    tal:attributes="href string:${row/s_view_link}">
    127                 <strong tal:content="row/title" /></a>
    128              <strong tal:condition="not:row/s_view_link" tal:content="row/title" />
     92                <strong>Session Results</strong>
     93              </a>             
    12994            </td>
    130  
    131             <td align="left">
     95            <td>
     96              &nbsp;
     97            </td>
     98          </tr>
     99        </table>
     100        <form action="mail_password_form" method="post" class="group"
     101              tal:condition="is_staff"
     102              tal:attributes="action string:${context/absolute_url}/mail_password_form">
     103          <br />
     104          <input type="submit" class="context" value="Send Email with Authentication Data" />
     105        </form>
     106        <div tal:condition="python:info['review_state']=='deactivated'">
     107          <font color="red">This student record has been deactivated!</font>
     108        </div>
     109        <table tal:condition="python:is_student and info['review_state']!='deactivated'" class="contentListing" width="" summary="content layout" id="folder_content">     
     110          <span tal:repeat="row rows">
     111            <tr tal:condition="row/display">
     112              <td width="220px"><a href="view" tal:condition="row/s_view_link"
     113                                   tal:attributes="href string:${row/s_view_link}">
     114                  <strong tal:content="row/title" /></a>
     115                <strong tal:condition="not:row/s_view_link" tal:content="row/title" />
     116              </td>
     117              <td align="left">
    132118                <span tal:content="row/review_state" />
    133             </td>         
    134            
    135             <td width="40px" align="center">
    136               <a tal:condition="python: row['s_edit_link'] and row['is_editable']"
    137                  href="edit" tal:attributes="href string:${row/s_edit_link}">
    138                 [edit]
    139               </a>     
    140             </td>                 
    141            
    142  
     119              </td>         
     120              <td width="40px" align="center">
     121                <a tal:condition="python: row['s_edit_link'] and row['is_editable']"
     122                   href="edit" tal:attributes="href string:${row/s_edit_link}">
     123                  [edit]
     124                </a>     
     125              </td>                 
     126            </tr>
     127          </span>
     128          <tr tal:condition="info/session">
     129            <td>
     130              <a href="edit" tal:attributes="href string:session_results_view">
     131                <strong>Session Results</strong>
     132              </a>             
     133            </td>
     134            <td>
     135              &nbsp;
     136            </td>
    143137          </tr>
    144         </span>
    145         <tr tal:condition="info/session">
    146           <td>
    147               <a href="edit" tal:attributes="href string:session_results_view">
    148               <strong>Session Results</strong>
    149           </a>             
    150           </td>
    151           <td>
    152              &nbsp;
    153           </td>
    154         </tr>
    155       </table>
    156 
    157      
     138        </table>
     139      </metal:block>
    158140    </metal:block>
    159     </metal:block>
    160     </metal:main>
     141  </metal:main>
    161142</metal:body>

  • WAeUP_SRP/base/skins/waeup_student/study_level_view.pt

    r2631 r2640  
    3636      <span tal:condition="is_student">My </span>
    3737     
    38       Course Registration Form for <span tal:content="here/title_or_id" />
     38      Course Registration Form for <span tal:content="here/Title" />
    3939    </h3>
    4040             
Note: See TracChangeset for help on using the changeset viewer.