Changeset 869


Ignore:
Timestamp:
15 Nov 2006, 13:46:49 (18 years ago)
Author:
Henrik Bettermann
Message:

comments field removed in mail form
admission slip shown in objection_raised_view

Location:
WAeUP_SRP/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/PatchBasicWidgetsCPSStringWidget.py

    r867 r869  
    11#-*- mode: python; mode: fold -*-
    22from Products.CPSSchemas.BasicWidgets import CPSStringWidget
    3 CPSStringWidget.display_width = 40
     3from Products.CPSSchemas.BasicWidgets import CPSEmailWidget
     4CPSStringWidget.display_width = 30
     5CPSEmailWidgetdisplay_width = 30

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

    r868 r869  
    4646  <exit-transition transition_id="defer"/>
    4747  <exit-transition transition_id="reject_clearance"/>
     48  <exit-transition transition_id="create_content"/>
    4849  <permission-map name="Modify portal content"
    4950                  acquired="True">
    … …  
    99100             new_state="admitted" trigger="USER"
    100101             before_script="" after_script="">
    101  
     102
    102103  <guard>
    103104   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    107108             new_state="admission_applied" trigger="USER"
    108109             before_script="" after_script="">
    109  
     110
    110111  <guard>
    111112   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    115116             new_state="cleared_and_validated"
    116117             trigger="USER" before_script="" after_script="">
    117  
     118
    118119  <guard>
    119120   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    123124             new_state="student_created" trigger="USER"
    124125             before_script="" after_script="">
    125  
     126
    126127  <guard>
    127128  </guard>
    … …  
    132133             new_state="" trigger="USER" before_script=""
    133134             after_script="">
    134  
     135
    135136  <guard>
    136137   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    141142             new_state="deferred" trigger="USER"
    142143             before_script="" after_script="">
    143  
     144
    144145  <guard>
    145146   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    149150             new_state="application_pin_entered"
    150151             trigger="USER" before_script="" after_script="">
    151  
     152
    152153  <guard>
    153154   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    157158             new_state="clearance_pin_entered"
    158159             trigger="USER" before_script="" after_script="">
    159  
     160
    160161  <guard>
    161162   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    165166             new_state="finally_rejected" trigger="USER"
    166167             before_script="" after_script="">
    167  
     168
    168169  <guard>
    169170   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    173174             new_state="pume_failed" trigger="USER"
    174175             before_script="" after_script="">
    175  
     176
    176177  <guard>
    177178   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    181182             new_state="pume_passed" trigger="USER"
    182183             before_script="" after_script="">
    183  
     184
    184185  <guard>
    185186   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    189190             new_state="objection_raised" trigger="USER"
    190191             before_script="" after_script="">
    191  
     192
    192193  <guard>
    193194   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    197198             new_state="admission_rejected" trigger="USER"
    198199             before_script="" after_script="">
    199  
     200
    200201  <guard>
    201202   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    205206             new_state="clearance_pin_entered"
    206207             trigger="USER" before_script="" after_script="">
    207  
     208
    208209  <guard>
    209210   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    213214             new_state="clearance_requested" trigger="USER"
    214215             before_script="" after_script="">
    215  
     216
    216217  <guard>
    217218   <guard-expression>python: context.student_wf_guard(transition,state_change)</guard-expression>
    … …  
    222223  <description>Time of the last transition</description>
    223224  <default>
    224    
     225
    225226   <expression>state_change/getDateTime</expression>
    226227  </default>

  • WAeUP_SRP/trunk/skins/waeup_default/mail2admin.py

    r864 r869  
    2626Problem Type: %s
    2727Description: %s
    28 Comment: %s
    2928"""
    3029
    … …  
    4342     probtype,
    4443     descr,
    45      commt,
    4644     )
    4745mhost.send(msg)

  • WAeUP_SRP/trunk/skins/waeup_student/admission_form.pt

    r866 r869  
    1010
    1111      <div style="text-align: right"
    12            tal:condition="python:review_state in ('admitted', 'clearance_pin_entered', 'clearance_requested', 'cleared',)">
     12           tal:condition="python:review_state in ('admitted', 'clearance_pin_entered', 'clearance_requested', 'cleared', 'objection_raised',)">
    1313      <a href="" target="slip" tal:attributes="href string:admission_slip"
    1414          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')">

  • WAeUP_SRP/trunk/skins/waeup_student/contact_student.pt

    r831 r869  
    5252          </td>
    5353        </tr>
    54         <tr>
    55           <td valign="top">
    56              <strong>Comments: </strong>
    57           </td>
    58           <td>
    59              <textarea name="commt" rows="10" cols="60" id="commt"></textarea>
    60           </td>
    61         </tr>
    6254     
    6355        <tr>

  • WAeUP_SRP/trunk/skins/waeup_student/objection_raised_view.pt

    r864 r869  
    1 <metal:html tal:define="info options/info|context/getStudentInfo">
     1<metal:html tal:define="info options/info|context/getStudentInfo;
     2                        review_state info/review_state">
    23  <metal:body use-macro="here/waeup_content_master/macros/master">
    34    <metal:main fill-slot="main">
     5   
     6      <div style="text-align: right"
     7           tal:condition="python:review_state in ('admitted', 'clearance_pin_entered', 'clearance_requested', 'cleared', 'objection_raised',)">
     8      <a href="" target="slip" tal:attributes="href string:admission_slip"
     9          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')">
     10          <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
     11          Admission Slip
     12      </a>
     13      </div>       
     14   
    415      <h3>You raised an objection, please explain why!</h3>
    516     
    … …  
    1728          </td>
    1829          <td>
    19              <input name="fullname" type="text" id="fullname"
     30             <input name="fullname" type="text" id="fullname" size="30"
    2031                    tal:attributes="value info/student/Title"/>
    2132          </td>
    … …  
    2637          </td>
    2738          <td>
    28              <input name="email" type="text" id="email"
     39             <input name="email" type="text" id="email"  size="30"
    2940                    tal:attributes="value info/app_doc/app_email"/>
    3041          </td>
Note: See TracChangeset for help on using the changeset viewer.