Changeset 863 for WAeUP_SRP/trunk


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
Files:
2 added
2 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/layouts/student_application.xml

    r853 r863  
    3535 <property name="reference">jamb_reg_no</property>
    3636</widget>
    37 <widget name="defer_date" meta_type="DateTime Widget">
    38  <property name="title">Defer Date</property>
     37<widget name="objection_date" meta_type="DateTime Widget">
     38 <property name="title">Objection Date</property>
    3939 <property name="fields">
    40   <element value="defer_date"/>
    41  </property>
    42  <property name="label">Defer Date</property>
    43  <property name="label_edit">Defer Date</property>
     40  <element value="objection_date"/>
     41 </property>
     42 <property name="label">Objection Date</property>
     43 <property name="label_edit">Objection Date</property>
    4444 <property name="readonly_layout_modes">
    4545  <element value="edit"/>

  • WAeUP_SRP/trunk/profiles/default/layouts/student_application_fe.xml

    r853 r863  
    3939  <property name="reference">jamb_reg_no</property>
    4040  </widget>
    41 <widget name="defer_date" meta_type="DateTime Widget">
    42  <property name="title">Defer Date</property>
     41<widget name="objection_date" meta_type="DateTime Widget">
     42 <property name="title">Objection Date</property>
    4343 <property name="fields">
    44   <element value="defer_date"/>
     44  <element value="objection_date"/>
    4545 </property>
    46  <property name="label">Defer Date</property>
    47  <property name="label_edit">Defer Date</property>
     46 <property name="label">Objection Date</property>
     47 <property name="label_edit">Objection Date</property>
    4848 <property name="readonly_layout_modes">
    4949  <element value="edit"/>

  • WAeUP_SRP/trunk/profiles/default/schemas/student_application.xml

    r785 r863  
    66 <field name="app_mobile" meta_type="CPS String Field"/>
    77 <field name="entry_mode" meta_type="CPS String Field"/>
    8   <field name="defer_date" meta_type="CPS DateTime Field"/>
     8  <field name="objection_date" meta_type="CPS DateTime Field"/>
    99  <field name="jamb_age" meta_type="CPS Int Field"/>
    1010 <field name="jamb_first_cos" meta_type="CPS String Field"/>

  • WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_student_states.xml

    r805 r863  
    1111 <item key="pume_passed" msgid="">pume passed</item>
    1212 <item key="pume_failed" msgid="">pume failed</item>
    13  <item key="deferred" msgid="">admission deferred</item>
     13 <item key="objection_raised" msgid="">objection raised</item>
    1414 <item key="admission_rejected" msgid="">admission rejected</item>
    1515 <item key="finally_rejected" msgid="">finally rejected</item>
    … …  
    1818 <item key="clearance_requested" msgid="">clearance requested</item>
    1919 <item key="cleared_and_validated" msgid="">cleared and validated</item>
     20 <item key="deferred" msgid="">admission deferred</item>
    2021 <item key="content_addable" msgid="">content addable</item>
    2122 <item key="category_A" msgid="">category A</item>

  • WAeUP_SRP/trunk/skins/waeup_default/portlet_waeup_status_display.pt

    r805 r863  
    1010                                        'admitted',
    1111                                        'deferred',
     12                                        'objection_raised',
    1213                                        'admission_rejected',
    1314                                        'finally_rejected',

  • 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.