Changeset 2496


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
Files:
4 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>

  • WAeUP_SRP/fceokene/profiles/default/workflows/waeup_student_wf/definition.xml

    r2092 r2496  
    88 <permission>Modify portal content</permission>
    99 <permission>View</permission>
    10  <state state_id="admission_applied" title="">
    11   <exit-transition transition_id="create_content"/>
    12   <exit-transition transition_id="pume_fail"/>
    13   <exit-transition transition_id="pume_pass"/>
    14   <permission-map name="Delete objects" acquired="False">
    15   </permission-map>
    16   <permission-map name="Modify portal content"
    17                   acquired="True">
    18    <permission-role>SectionOfficer</permission-role>
    19   </permission-map>
    20   <permission-map name="View" acquired="True">
    21    <permission-role>SectionOfficer</permission-role>
    22   </permission-map>
    23  </state>
    24  <state state_id="admission_rejected" title="">
    25   <exit-transition transition_id="finally_reject"/>
    26   <permission-map name="Delete objects" acquired="False">
    27   </permission-map>
    28   <permission-map name="Modify portal content"
    29                   acquired="True">
    30    <permission-role>SectionOfficer</permission-role>
    31   </permission-map>
    32   <permission-map name="View" acquired="True">
    33    <permission-role>SectionOfficer</permission-role>
    34   </permission-map>
    35  </state>
    3610 <state state_id="admitted" title="">
    3711  <exit-transition transition_id="create_content"/>
    … …  
    4216  <permission-map name="Modify portal content"
    4317                  acquired="True">
    44   </permission-map>
    45   <permission-map name="View" acquired="True">
    46    <permission-role>Owner</permission-role>
    47    <permission-role>SectionOfficer</permission-role>
    48   </permission-map>
    49  </state>
    50  <state state_id="application_pin_entered" title="">
    51   <exit-transition transition_id="apply_for_admission"/>
    52   <exit-transition transition_id="create_content"/>
    53   <permission-map name="Delete objects" acquired="False">
    54   </permission-map>
    55   <permission-map name="Modify portal content"
    56                   acquired="True">
    57    <permission-role>SectionOfficer</permission-role>
    5818  </permission-map>
    5919  <permission-map name="View" acquired="True">
    … …  
    12484  </permission-map>
    12585 </state>
     86 <state state_id="deactivated" title="">
     87  <exit-transition transition_id="return"/>
     88  <permission-map name="Delete objects" acquired="True">
     89  </permission-map>
     90  <permission-map name="Modify portal content"
     91                  acquired="False">
     92   <permission-role>Manager</permission-role>
     93   <permission-role>SectionManager</permission-role>
     94   <permission-role>SectionOfficer</permission-role>
     95  </permission-map>
     96  <permission-map name="View" acquired="True">
     97   <permission-role>Owner</permission-role>
     98  </permission-map>
     99 </state>
    126100 <state state_id="deferred" title="">
    127101  <permission-map name="Delete objects" acquired="False">
    … …  
    132106  </permission-map>
    133107  <permission-map name="View" acquired="True">
    134    <permission-role>SectionOfficer</permission-role>
    135   </permission-map>
    136  </state>
    137  <state state_id="finally_rejected" title="">
    138   <permission-map name="Delete objects" acquired="False">
    139   </permission-map>
    140   <permission-map name="Modify portal content"
    141                   acquired="True">
    142    <permission-role>ClearanceOfficer</permission-role>
    143    <permission-role>SectionOfficer</permission-role>
    144   </permission-map>
    145   <permission-map name="View" acquired="True">
    146    <permission-role>Owner</permission-role>
    147108   <permission-role>SectionOfficer</permission-role>
    148109  </permission-map>
    … …  
    162123  </permission-map>
    163124 </state>
    164  <state state_id="pume_failed" title="">
    165   <exit-transition transition_id="reject_admission"/>
    166   <permission-map name="Delete objects" acquired="False">
    167   </permission-map>
    168   <permission-map name="Modify portal content"
    169                   acquired="True">
    170    <permission-role>SectionOfficer</permission-role>
    171   </permission-map>
    172   <permission-map name="View" acquired="True">
    173    <permission-role>Owner</permission-role>
    174    <permission-role>SectionOfficer</permission-role>
    175   </permission-map>
    176  </state>
    177  <state state_id="pume_passed" title="">
    178   <exit-transition transition_id="admit"/>
    179   <exit-transition transition_id="reject_admission"/>
    180   <permission-map name="Delete objects" acquired="False">
    181   </permission-map>
    182   <permission-map name="Modify portal content"
    183                   acquired="True">
    184    <permission-role>SectionOfficer</permission-role>
    185   </permission-map>
    186   <permission-map name="View" acquired="True">
    187    <permission-role>Owner</permission-role>
    188    <permission-role>SectionOfficer</permission-role>
    189   </permission-map>
    190  </state>
    191125 <state state_id="returning" title="">
    192126  <exit-transition transition_id="create_content"/>
     127  <exit-transition transition_id="deactivate"/>
    193128  <exit-transition transition_id="pay_school_fee"/>
    194129  <permission-map name="View" acquired="True">
    … …  
    228163             before_script="" after_script="">
    229164 
     165 
    230166  <guard>
    231167   <guard-role>SectionOfficer</guard-role>
    232168   <guard-role>ClearanceOfficer</guard-role>
    233    <guard-role>Manager</guard-role>
    234    <guard-role>SectionManager</guard-role>
    235   </guard>
    236  </transition>
    237  <transition transition_id="apply_for_admission" title=""
    238              new_state="admission_applied" trigger="USER"
    239              before_script="" after_script="">
    240  
    241   <guard>
    242    <guard-role>SectionOfficer</guard-role>
    243    <guard-role>Owner</guard-role>
    244169   <guard-role>Manager</guard-role>
    245170   <guard-role>SectionManager</guard-role>
    … …  
    250175             trigger="USER" before_script="" after_script="">
    251176 
     177 
    252178  <guard>
    253179   <guard-role>SectionOfficer</guard-role>
    … …  
    260186             new_state="student_created" trigger="USER"
    261187             before_script="" after_script="">
     188 
    262189 
    263190  <guard>
    … …  
    273200             after_script="">
    274201 
     202 
    275203  <guard>
    276204   <guard-role>Manager</guard-role>
    … …  
    282210  <transition-behavior behavior_id="allow-sub-delete"/>
    283211 </transition>
     212 <transition transition_id="deactivate" title=""
     213             new_state="deactivated" trigger="USER"
     214             before_script="" after_script="">
     215 
     216 
     217  <guard>
     218   <guard-role>SectionOfficer</guard-role>
     219   <guard-role>Manager</guard-role>
     220   <guard-role>SectionManager</guard-role>
     221  </guard>
     222 </transition>
    284223 <transition transition_id="defer" title=""
    285224             new_state="deferred" trigger="USER"
    286225             before_script="" after_script="">
    287226 
    288   <guard>
    289    <guard-role>SectionOfficer</guard-role>
    290    <guard-role>Owner</guard-role>
    291    <guard-role>Manager</guard-role>
    292    <guard-role>SectionManager</guard-role>
    293   </guard>
    294  </transition>
    295  <transition transition_id="enter_application_pin" title=""
    296              new_state="application_pin_entered"
    297              trigger="USER" before_script="" after_script="">
    298227 
    299228  <guard>
    … …  
    308237             trigger="USER" before_script="" after_script="">
    309238 
    310   <guard>
    311    <guard-role>SectionOfficer</guard-role>
    312    <guard-role>Owner</guard-role>
    313    <guard-role>Manager</guard-role>
    314    <guard-role>SectionManager</guard-role>
    315   </guard>
    316  </transition>
    317  <transition transition_id="finally_reject" title=""
    318              new_state="finally_rejected" trigger="USER"
    319              before_script="" after_script="">
    320  
    321   <guard>
    322    <guard-role>SectionOfficer</guard-role>
    323    <guard-role>ClearanceOfficer</guard-role>
    324    <guard-role>Manager</guard-role>
    325    <guard-role>SectionManager</guard-role>
    326   </guard>
    327  </transition>
    328 
     239 
     240  <guard>
     241   <guard-role>SectionOfficer</guard-role>
     242   <guard-role>Owner</guard-role>
     243   <guard-role>Manager</guard-role>
     244   <guard-role>SectionManager</guard-role>
     245  </guard>
     246 </transition>
    329247 <transition transition_id="pay_school_fee" title=""
    330248             new_state="school_fee_paid" trigger="USER"
    331249             before_script="" after_script="">
    332250 
    333   <guard>
    334    <guard-role>Manager</guard-role>
    335    <guard-role>SectionManager</guard-role>
    336    <guard-role>Owner</guard-role>
    337    <guard-role>SectionOfficer</guard-role>
    338   </guard>
    339  </transition>
    340  <transition transition_id="pume_fail" title=""
    341              new_state="pume_failed" trigger="USER"
    342              before_script="" after_script="">
    343  
    344   <guard>
    345    <guard-role>SectionOfficer</guard-role>
    346    <guard-role>ClearanceOfficer</guard-role>
    347    <guard-role>Manager</guard-role>
    348    <guard-role>SectionManager</guard-role>
    349   </guard>
    350  </transition>
    351  <transition transition_id="pume_pass" title=""
    352              new_state="pume_passed" trigger="USER"
    353              before_script="" after_script="">
    354  
    355   <guard>
    356    <guard-role>SectionOfficer</guard-role>
    357    <guard-role>ClearanceOfficer</guard-role>
    358    <guard-role>Manager</guard-role>
    359    <guard-role>SectionManager</guard-role>
     251 
     252  <guard>
     253   <guard-role>Manager</guard-role>
     254   <guard-role>SectionManager</guard-role>
     255   <guard-role>Owner</guard-role>
     256   <guard-role>SectionOfficer</guard-role>
    360257  </guard>
    361258 </transition>
    … …  
    364261             before_script="" after_script="">
    365262 
     263 
    366264  <guard>
    367265   <guard-role>SectionOfficer</guard-role>
    … …  
    376274             before_script="" after_script="">
    377275 
     276 
    378277  <guard>
    379278   <guard-role>CourseAdviser</guard-role>
    … …  
    382281   <guard-role>Owner</guard-role>
    383282   <guard-role>SectionOfficer</guard-role>
    384   </guard>
    385  </transition>
    386  <transition transition_id="reject_admission" title=""
    387              new_state="admission_rejected" trigger="USER"
    388              before_script="" after_script="">
    389  
    390   <guard>
    391    <guard-role>SectionOfficer</guard-role>
    392    <guard-role>ClearanceOfficer</guard-role>
    393    <guard-role>Manager</guard-role>
    394    <guard-role>SectionManager</guard-role>
    395283  </guard>
    396284 </transition>
    … …  
    399287             trigger="USER" before_script="" after_script="">
    400288 
     289 
    401290  <guard>
    402291   <guard-role>SectionOfficer</guard-role>
    … …  
    410299             before_script="" after_script="">
    411300 
     301 
    412302  <guard>
    413303   <guard-role>CourseAdviser</guard-role>
    … …  
    421311             before_script="" after_script="">
    422312 
     313 
    423314  <guard>
    424315   <guard-role>SectionOfficer</guard-role>
    … …  
    432323             before_script="" after_script="">
    433324 
     325 
    434326  <guard>
    435327   <guard-role>SectionOfficer</guard-role>
    … …  
    441333             new_state="courses_validated" trigger="USER"
    442334             before_script="" after_script="">
     335 
    443336 
    444337  <guard>
    … …  
    463356         filename="workflows/waeup_student_wf/scripts/open_application_personal.py"/>
    464357</cps-workflow>
     358
     359
     360
Note: See TracChangeset for help on using the changeset viewer.