Ignore:
Timestamp:
29 Oct 2006, 05:24:04 (18 years ago)
Author:
Henrik Bettermann
Message:

passport_entry_view renamed
layouts modified
and more

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

Legend:

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

    r680 r770  
    99           
    1010        <div style="text-align: right"
    11              tal:condition="python:review_state=='admission_applied'">
     11             tal:condition="python:review_state in ('admission_applied', 'clearance_pin_entered',)">
    1212        <a href="" target="slip" tal:attributes="href string:application_slip"
    1313            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/clearance_edit.pt

    r769 r770  
    1616  <metal:block fill-slot="header">
    1717    <h3>
    18       <tal:block condition="python: edition and not metadata"
    19         i18n:translate="">Edit <span id="page_title" i18n:name="title"
    20         tal:content="here/title_or_id">Page Title</span></tal:block>
     18      Edit your Clearance Data!
    2119    </h3>
    2220  </metal:block>
  • WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

    r768 r770  
    6868else:
    6969    info['clear'] = None
    70    
     70
    7171res = context.portal_catalog(container_path=student_path,
    7272                             portal_type='StudentPume')
     
    7777    info['pume_review_state'] = wf.getInfoFor(pume,'review_state',None)
    7878else:
    79     info['pume'] = None   
     79    info['pume'] = None
    8080
    8181items = []
    82 s_edit_links = {'StudentApplication': 'student_edit',
     82s_edit_links = {'StudentApplication': 'application_edit',
    8383              'StudentAccommodation': '',
    8484              'StudentClearance': 'clearance_edit',
    8585              'StudentPersonal': '',
    8686              }
    87 s_view_links = {'StudentApplication': None,
     87s_view_links = {'StudentApplication': 'application_view',
    8888              'StudentAccommodation': 'accommodation_view',
    8989              'StudentClearance': 'clearance_view',
    9090              'StudentPersonal': None,
    91               'StudentApplication': 'application_view',
    9291              'StudentStudyCourse': 'study_course_view',
    9392              'StudentPume': 'pume_view',
     
    110109        row['s_edit_link'] = "%s/%s" % (soo.absolute_url(),se_link)
    111110    row['review_state'] = so.review_state
    112     row['display'] = so.review_state in ('opened','closed',) or\
     111    row['display'] = so.review_state in ('opened','closed','public',) or\
    113112                     so.portal_type in ("StudentAccommodation","StudentStudyCourse")
    114113    items.append(row)
  • WAeUP_SRP/trunk/skins/waeup_student/layout_application_view.pt

    r613 r770  
    88                                 'app_ac_pin',
    99                                 'app_ac_date',
     10                                 'app_email',
     11                                 'app_mobile',
    1012                                 'jamb_lastname',
    1113                                 'jamb_sex',
  • WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_info.pt

    r669 r770  
    55              dm options/datastructure/getDataModel;
    66              widgets python:context.getRenderedWidgets(layout);
    7               fields python:('jamb_lastname','jamb_sex',)"
     7              fields python:('jamb_lastname','jamb_sex','app_email','app_mobile')"
    88              >
    99 
  • WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt

    r712 r770  
    88                                 'app_ac_pin',
    99                                 'app_ac_date',
     10                                 'app_email',
     11                                 'app_mobile',
    1012                                 'jamb_lastname',
    1113                                 'jamb_sex',
  • WAeUP_SRP/trunk/skins/waeup_student/student_edit.py

    r767 r770  
    4141                                    layout_mode = 'edit',
    4242                                    use_session=True)
    43         action = "/passport_entry_view"
     43        action = "/application_edit"
    4444        if is_valid:
    4545            if app_doc.passport is not None:
     
    5858                                    layout_mode = 'edit',
    5959                                    use_session=True)
    60         action = "/passport_entry_view"
     60        action = "/application_edit"
    6161        if is_valid:
    6262            args = {}
     
    8282            app_doc = info['app_doc']
    8383            dc = {}
    84             dc['email'] = app_doc.appl_email
    85             dc['mobil'] = app_doc.appl_mobile
     84            dc['email'] = app_doc.app_email
    8685            info['clear_doc'].edit(mapping = dc)
    8786            wftool.doActionFor(app,'close',dest_container= app)
    8887            psm = 'You successfully started the clearance process.'
    89             action = "/clearance_view"
     88            action = "/clearance_edit"
    9089        else:
    9190            action = "/clearance_view"
  • WAeUP_SRP/trunk/skins/waeup_student/student_index.py

    r767 r770  
    3333        return redirect("%s/application_view" % student.absolute_url())
    3434    elif state in ('application_pin_entered','admitted'):
    35         return redirect("%s/passport_entry_view" % student.absolute_url())
     35        return redirect("%s/application_edit" % student.absolute_url())
    3636    elif state == 'clearance_pin_entered':
    3737        return redirect("%s/student_view" % info['clear'].absolute_url())
Note: See TracChangeset for help on using the changeset viewer.