Changeset 5569 for WAeUP_SRP/trunk


Ignore:
Timestamp:
15 Oct 2010, 06:49:26 (14 years ago)
Author:
Henrik Bettermann
Message:

FCEOkene: show both course_registration_slip and examination_slip

course_registration_slip.pt: schow 'validated by system' if no validated_by string

Location:
WAeUP_SRP/trunk/skins
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/skins/waeup_fceokene/examination_slip.pt

    r5568 r5569  
    1717          ">
    1818      <h3><span tal:content="info/level_str" /> Examination Clearance Slip</h3>
    19       <br />
    20       <div tal:condition="validated">
    21         - cleared by <span tal:replace="cv_member" /> on <span tal:replace="python:info['doc'].validation_date.aCommon()" />
    22         -
     19      <div tal:condition="python: validated and cv_id">
     20        <br />
     21        - cleared by
     22            <span tal:replace="cv_member" /> on <span tal:replace="python:info['doc'].validation_date.aCommon()" /> -
     23        <br />
    2324      </div>
    2425      <div tal:condition="not: validated">
     26        <br />
    2527        - not yet cleared -
     28        <br />
    2629      </div>
    27       <br />
    28       <span tal:omit-tag=""
     30      <div tal:condition="python: validated and not cv_id">
     31        <br />
     32        - cleared by system -
     33        <br />
     34      </div>     
     35      <span tal:condition="validated"
     36            tal:omit-tag=""
    2937            tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
    3038            layout_mode='view_info',
    3139            layout_id='student_application')"
    3240            />           
    33       <table  cellpadding="2" cellspacing="0">
     41      <table  tal:condition="validated" cellpadding="2" cellspacing="0">
    3442        <tr>
    3543          <td valign="top" width="180px"><span class="dlabel">Faculty Id</span>:
  • WAeUP_SRP/trunk/skins/waeup_fceokene/study_level_view.pt

    r5568 r5569  
    2727      Up one level
    2828    </a>
     29   
     30    <div style="text-align: right"
     31         tal:condition="rejection_allowed">
     32    <a href="" target="slip" tal:attributes="href string:course_registration_slip"
     33        onclick="javascript:window.open('','slip','width=600, height=700, directories=no, toolbar=no, location=no, menubar=yes, scrollbars=yes, status=no, resizable=no, dependent=no')">
     34        <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
     35        Course Registration Slip
     36    </a>
     37    </div>   
    2938
    3039    <div style="text-align: right"
  • WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt

    r4305 r5569  
    1313          is_student info/is_student;
    1414          validated info/validated;
     15          cv_id info/doc/validated_by|nothing;
     16          cv_member python:context.waeup_tool.getOfficerName(cv_id);         
    1517          ">
    1618      <h3>Course Registration Slip for <span tal:content="info/level_str" /></h3>
    17       <br />
    18       <div tal:condition="validated">
    19         - validated by <span tal:condition="info/doc/validated_by|nothing" tal:omit-tag="">
    20           <span tal:replace="info/doc/validated_by" /> on <span tal:replace="python:info['doc'].validation_date.aCommon()" />
    21         </span> -
     19      <div tal:condition="python: validated and cv_id">
     20        <br />
     21        - validated by
     22            <span tal:replace="cv_member" /> on <span tal:replace="python:info['doc'].validation_date.aCommon()" /> -
     23        <br />
    2224      </div>
    2325      <div tal:condition="not: validated">
     26        <br />
    2427        - not yet validated by Course Adviser -
     28        <br />
    2529      </div>
    26       <br />
     30      <div tal:condition="python: validated and not cv_id">
     31        <br />
     32        - validated by system -
     33        <br />
     34      </div>     
    2735      <span tal:omit-tag=""
    2836            tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
Note: See TracChangeset for help on using the changeset viewer.