Changeset 2496 for WAeUP_SRP/base


Ignore:
Timestamp:
1 Nov 2007, 08:50:40 (17 years ago)
Author:
Henrik Bettermann
Message:

new student workflow state deactivated
student workflow cleaned

Location:
WAeUP_SRP/base
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/WAeUPTool.py

    r2495 r2496  
    15221522            open("%s/import/%s_not_imported%s.csv" % (i_home,filename,current),"a").write(
    15231523                                                '\n'.join(not_imported))
    1524         em = " Finished: %d imported, %d not imported (of total %d)" % (total_imported,total_not_imported,total)
     1524        em = "Finished: %d imported, %d not imported (of total %d)" % (total_imported,total_not_imported,total)
    15251525        logger.info(em)
    15261526        return em

  • WAeUP_SRP/base/skins/waeup_layout/portlet_student_workflow_display.pt

    r2407 r2496  
    1111
    1212<table class="registration" tal:condition="not:info/cr">
     13
    1314  <span tal:condition="python:path('info/review_state')=='admitted'">
    1415  <tr>
    … …  
    2021  </tr>
    2122  </span>
    22   <span tal:condition="python:path('info/review_state')=='admission_rejected'">
    23   <tr><td class="stopped">Admission rejected</td></tr>
    24   </span>
    25   <span tal:condition="python:path('info/review_state') in ('objection_raised','clearance_pin_entered','clearance_requested','cleared_and_validated',)">
     23  <span tal:condition="python:path('info/review_state') in ('objection_raised','clearance_pin_entered','clearance_requested','cleared_and_validated','deactivated')">
    2624  <tr>
    2725    <td>

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

    r2408 r2496  
    116116
    117117
     118      <div tal:condition="python:info['review_state']=='deactivated'">
     119      <font color="red">This student record has been deactivated!</font>
     120      </div>
    118121     
    119122
    120       <table tal:condition="is_student" class="contentListing" width="" summary="content layout" id="folder_content">     
     123      <table tal:condition="python:is_student and info['review_state']!='deactivated'" class="contentListing" width="" summary="content layout" id="folder_content">     
    121124        <span tal:repeat="row rows">
    122125          <tr tal:condition="row/display">
    … …  
    152155        </tr>
    153156      </table>
    154        
     157
     158     
    155159    </metal:block>
    156160    </metal:block>
Note: See TracChangeset for help on using the changeset viewer.