Ignore:
Timestamp:
14 Nov 2006, 11:09:10 (18 years ago)
Author:
Henrik Bettermann
Message:

state deferred moved to the end of the workflow
objection_raised (raise_objection) instead of deferment by student
(not yet tested)

Location:
WAeUP_SRP/trunk/skins/waeup_student
Files:
2 added
2 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt

    r843 r863  
    6363            <td align="left" valign="top" rowspan="3"></td>
    6464            <td align="left" valign="top">
    65                 <input type="submit" name="defer_admission:method" value="Reject/Defer Admission"
     65                <input type="submit" name="raise_objection:method" value="Raise an Objection"
    6666                       class="destructive"
    6767                       tal:attributes="onclick python:'return window.confirm(\'%s\')' %
    68                        (cpsmcat('Confirm that you want to reject/defer your admision.'), )"
     68                       (cpsmcat('Confirm that you want to raise an objection.'), )"
    6969                       />
    7070                <input type="submit" name="application_edit:method"
  • WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt

    r837 r863  
    6767
    6868 
    69   <span tal:condition="python:path('info/review_state')=='deferred'">
    70   <tr><td class="stopped">Admission deferred</td></tr>
     69  <span tal:condition="python:path('info/review_state')=='objection_raised'">
     70  <tr><td class="stopped">Objection raised</td></tr>
    7171  </span>
    72   <span tal:condition="python:path('info/review_state')!='deferred'">
    73   <tr><td>Admission deferred</td></tr>
     72  <span tal:condition="python:path('info/review_state')!='objection_raised'">
     73  <tr><td>Objection raised</td></tr>
    7474  </span> 
    7575
     
    100100  <tr><td>Cleared</td></tr>
    101101  </span>
     102 
     103  <span tal:condition="python:path('info/review_state')=='deferred'">
     104  <tr><td class="active">Admission deferred</td></tr>
     105  </span>
     106  <span tal:condition="python:path('info/review_state')!='deferred'">
     107  <tr><td>Admission deferred</td></tr>
     108  </span>   
    102109
    103110</table>
Note: See TracChangeset for help on using the changeset viewer.