Changeset 891 for WAeUP_SRP


Ignore:
Timestamp:
18 Nov 2006, 20:59:12 (18 years ago)
Author:
Henrik Bettermann
Message:

contact forms and methods renamed
contact_student_form and method for clearance officer added
clearance_edit swept
some psm edited

Is clearance_view.pt still necessary?

Location:
WAeUP_SRP/trunk
Files:
3 added
4 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/types/StudentClearance.xml

    r844 r891  
    3838 <action title="action_edit" action_id="edit" category="object"
    3939    condition_expr=""
    40     url_expr="string:${object_url}/clearance_edit_form_manager"
     40    url_expr="string:${object_url}/clearance_edit_form"
    4141    visible="True">
    4242  <permission value="Modify portal content"/>

  • WAeUP_SRP/trunk/skins/waeup_custom/cpsdocument_edit.py

    r873 r891  
    3838is_valid, ds = doc.validate(request=REQUEST, proxy=context, cluster=cluster,
    3939                            use_session=True)
     40args = {}
    4041
    4142if action is None:
    … …  
    5051        action = ''
    5152    psm = 'psm_content_changed'
    52     args = {}
     53
    5354else:
    5455    psm = 'psm_content_error'

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

    r890 r891  
    2929          </td>
    3030          <td>
    31              <textarea name="commt" rows="10" cols="60" id="commt"></textarea>
     31             <textarea name="descr" rows="10" cols="60" id="descr"></textarea>
    3232          </td>
    3333        </tr>

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

    r869 r891  
    1818From: %s <%s>
    1919To: %s
     20Cc: %s
    2021Bcc: %s
    2122Reply-To: %s
    … …  
    3435     email,
    3536     prop.email_from_address,
     37     email,
    3638     'henrik@waeup.org',
    3739#    'js@aixtraware.de',

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

    r885 r891  
    3434clear = info['clear']
    3535clear_doc = info['clear_doc']
    36 review_state = info['review_state']
    3736
    3837is_valid, ds = clear_doc.validate(request=REQUEST,
    … …  
    4746if is_valid:
    4847    if cpsdocument_edit_button:
    49         psm = 'Content changed.'
     48        psm = "Content changed!"
    5049    elif cpsdocument_edit_and_view_button:
    5150        wftool.doActionFor(info['clear'],'close')
    5251        wftool.doActionFor(info['student'],'request_clearance',dest_container=1)
     52        psm = "You successfully requested clearance!"
    5353    elif clear_and_validate_button:
    5454        wftool.doActionFor(info['student'],'clear_and_validate')
     55        psm = "Clearance and eligibility record is validated and and student is cleared!"
    5556    elif reject_clearance_button:
    5657        wftool.doActionFor(info['clear'],'open')
    5758        wftool.doActionFor(info['student'],'reject_clearance')
     59        action = "/contact_student_form"
     60        psm = "Student's clearance request has been rejected! Please fill and submit the form below!"
    5861else:
    59     psm = "Please correct your errors."
    60 args = getFormUidUrlArg(REQUEST)
    61 args['review_state'] = review_state
     62    psm = "Please correct your errors!"
     63    args = getFormUidUrlArg(REQUEST)
     64
     65
     66
    6267args['portal_status_message'] = psm
    63 if args:
    64   url = clear.absolute_url() + action + '?' + urlencode(args)
    65 else:
    66   url = clear.absolute_url() + action
     68url = clear.absolute_url() + action + '?' + urlencode(args)
    6769REQUEST.RESPONSE.redirect(url)

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

    r889 r891  
    6868           value="Reject Clearance"
    6969           id="reject_clearance_button"
    70            tal:condition="python:review_state == 'cleared_and_validated'" />
     70           tal:condition="python:review_state in ('cleared_and_validated','clearance_requested',)" />
    7171  </tal:block>
    7272  <!--  isStudent -->

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

    r840 r891  
    22                        is_manager info/is_manager|nothing;
    33                        is_student info/is_student|nothing;
    4                         s_info context/getStudentInfo;">
     4                        ">
    55  <metal:body use-macro="here/waeup_content_master/macros/master">
    66    <metal:main fill-slot="main">
    … …  
    2222
    2323        <h3>
    24            <span tal:condition="python:is_manager and s_info">
    25              <span tal:content="s_info/student/Title" />:
     24           <span tal:condition="python:is_manager and info">
     25             <span tal:content="info/student/Title" />:
    2626           </span>
    2727           <span tal:condition="python:is_student">

  • WAeUP_SRP/trunk/skins/waeup_student/raise_objection.py

    r863 r891  
    2424info['app_doc'].edit(mapping={'objection_date':current,})
    2525wf.doActionFor(info['student'],'raise_objection')
    26 return context.objection_raised_view(info=info)
     26return context.objection_raised_form(info=info)

  • WAeUP_SRP/trunk/skins/waeup_student/searchStudents.py

    r887 r891  
    171171            info = context.getStudentInfo(item)
    172172            students.append(info)
    173                
     173
    174174    return context.students_manager_view(rendered = rend,
    175175                             psm = "",
    … …  
    182182                             )
    183183return context.students_manager_view(rendered = rend,
    184                              psm = """Step: %s found: %s Your search for "%s" in %s with state %s failed.<br\>%s""" % (query_step,len(items),st,what,state,bools),
     184                             psm = "No student found!",
     185                             #psm = """Step: %s found: %s Your search for "%s" in %s with state %s failed.<br\>%s""" % (query_step,len(items),st,what,state,bools),
    185186                             students = students,
    186187                             allowed = True,

  • WAeUP_SRP/trunk/skins/waeup_student/student_index.py

    r888 r891  
    1 ## Script (Python) "student_indext"
     1## Script (Python) "student_index"
    22##bind container=container
    33##bind context=context
    … …  
    2525        return context.study_level_view()
    2626    elif context.portal_type == 'StudentClearance':
    27         return context.clearance_view()
     27        return context.clearance_edit_form()
    2828    elif context.portal_type == 'Student':
    2929        return redirect("%s/student_view" % context.absolute_url())
    … …  
    3232    info = context.getStudentInfo()
    3333    student = info['student']
    34     #doc = info['app_doc']
    35     #state = context.getStudentInfo()['review_state']
    36     #if state == 'admission_applied':
    37     #    return redirect("%s/application_view" % student.absolute_url())
    38     #elif state in ('application_pin_entered',):
    39     #    return redirect("%s/application_edit" % info['app'].absolute_url())
    40     #elif state in ('admitted',):
    41     #    return redirect("%s/admission_form" % student.absolute_url())
    42     #elif state == 'clearance_pin_entered':
    43     #    return redirect("%s/student_view" % info['clear'].absolute_url())
    44     #elif context.portal_type == 'StudentStudyLevel':
    45     #    return context.study_level_student_view()
    4634    return redirect("%s/student_view" % student.absolute_url())

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

    r887 r891  
    6464                <td><span tal:replace="python: student['app_doc'].jamb_reg_no" /></td>   
    6565                <td tal:condition="options/co_view|nothing"><a href="id"
    66                        tal:attributes="href string:${student/student/clearance/absolute_url}/clearance_edit_form_manager"
     66                       tal:attributes="href string:${student/student/clearance/absolute_url}/clearance_edit_form"
    6767                       tal:content="student/review_state"></a></td>   
    6868                <td tal:condition="not: options/co_view|nothing"><span tal:replace="student/review_state" /></td>   
Note: See TracChangeset for help on using the changeset viewer.