Changeset 770 for WAeUP_SRP/trunk


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

Legend:

Unmodified
Added
Removed

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

    r544 r770  
    44 <property name="layout_edit_method"></property>
    55 <property name="layout_view_method"></property>
    6  <property name="style_prefix">layout_default_</property>
     6 <property name="style_prefix">layout_waeup_</property>
    77 <property name="flexible_widgets"/>
    88 <property name="validate_values_expr"></property>

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

    r745 r770  
    4949  <property name="hidden_readonly_layout_modes"/>
    5050 </widget>
    51  <widget name="appl_email" meta_type="Email Widget">
     51 <widget name="app_email" meta_type="Email Widget">
    5252  <property name="is_required">False</property>
    5353  <property name="title">Email Address</property>
    5454  <property name="fields">
    55    <element value="appl_email"/>
     55   <element value="app_email"/>
    5656  </property>
    5757  <property name="label">Email Address</property>
    … …  
    6363  <property name="hidden_readonly_layout_modes"/>
    6464 </widget>
    65  <widget name="appl_mobile" meta_type="String Widget">
     65 <widget name="app_mobile" meta_type="String Widget">
    6666  <property name="title">Mobile Phone No</property>
    6767  <property name="fields">
    68    <element value="appl_mobile"/>
     68   <element value="app_mobile"/>
    6969  </property>
    7070  <property name="label">Mobile Phone No</property>
    … …  
    259259  </row>
    260260  <row>
    261    <cell name="appl_email" ncols="3"/>
    262   </row>
    263   <row>
    264    <cell name="appl_mobile" ncols="3"/>
     261   <cell name="app_email" ncols="3"/>
     262  </row>
     263  <row>
     264   <cell name="app_mobile" ncols="3"/>
    265265  </row>
    266266  <row>

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

    r766 r770  
    2424 </widget>
    2525 <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
    26   <property name="title">Application PIN</property>
     26  <property name="title">Access Code</property>
    2727  <property name="fields">
    2828   <element value="app_ac_pin"/>
    … …  
    3030  <property name="is_required">True</property>
    3131  <property name="label">Access Code</property>
    32   <property name="label_edit">Application PIN</property>
     32  <property name="label_edit">Access Code</property>
    3333  <property name="readonly_layout_modes">
    3434   <element value="edit"/>
    … …  
    5454  <property name="hidden_readonly_layout_modes"/>
    5555 </widget>
    56  <widget name="appl_email" meta_type="Email Widget">
     56 <widget name="app_email" meta_type="Email Widget">
    5757  <property name="title">Email Address</property>
    5858  <property name="fields">
    59    <element value="appl_email"/>
     59   <element value="app_email"/>
    6060  </property>
    6161  <property name="label">Email Address</property>
    … …  
    6767  <property name="hidden_readonly_layout_modes"/>
    6868 </widget>
    69  <widget name="appl_mobile" meta_type="String Widget">
     69 <widget name="app_mobile" meta_type="String Widget">
    7070  <property name="title">Mobile Phone No</property>
    7171  <property name="fields">
    72    <element value="appl_mobile"/>
     72   <element value="app_mobile"/>
    7373  </property>
    7474  <property name="label">Mobile Phone No</property>
    … …  
    234234  </row>
    235235  <row>
    236    <cell name="appl_email" ncols="3"/>
    237   </row>
    238   <row>
    239    <cell name="appl_mobile" ncols="3"/>
     236   <cell name="app_email" ncols="3"/>
     237  </row>
     238  <row>
     239   <cell name="app_mobile" ncols="3"/>
    240240  </row>
    241241  <row>

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

    r488 r770  
    497497  <property name="vocabulary">states</property>
    498498 </widget>
    499  <widget name="passport" meta_type="Image Widget">
    500   <property name="title">Passport</property>
    501   <property name="fields">
    502    <element value="passport"/>
    503   </property>
    504   <property name="label">Passport</property>
    505   <property name="label_edit">Passport</property>
    506   <property name="readonly_layout_modes"/>
    507   <property name="hidden_layout_modes"/>
    508   <property name="hidden_readonly_layout_modes"/>
    509   <property name="size_max">204800</property>
    510   <property name="display_width">300</property>
    511   <property name="display_height">600</property>
    512   <property name="allow_resize">True</property>
    513  </widget>
    514499 <widget name="ref_let" meta_type="Image Widget">
    515500  <property name="title">Referee Letter</property>
    … …  
    759744  </row>
    760745  <row>
    761    <cell name="passport"/>
    762   </row>
    763   <row>
    764746   <cell name="jamb_let"/>
    765747  </row>

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

    r766 r770  
    498498  <property name="vocabulary">states</property>
    499499 </widget>
    500  <widget name="passport" meta_type="Image Widget">
    501   <property name="title">Passport</property>
    502   <property name="fields">
    503    <element value="passport"/>
    504   </property>
    505   <property name="label">Passport</property>
    506   <property name="label_edit">Passport</property>
    507   <property name="readonly_layout_modes"/>
    508   <property name="hidden_layout_modes"/>
    509   <property name="hidden_readonly_layout_modes"/>
    510   <property name="size_max">204800</property>
    511   <property name="display_width">300</property>
    512   <property name="display_height">600</property>
    513   <property name="allow_resize">True</property>
    514  </widget>
    515500 <widget name="ref_let" meta_type="Image Widget">
    516501  <property name="title">Referee Letter</property>
    … …  
    667652  </row>
    668653  <row>
    669    <cell name="passport"/>
    670   </row>
    671   <row>
    672654   <cell name="lga"/>
    673655  </row>

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

    r764 r770  
    88 <property name="validate_values_expr"></property>
    99
    10  <widget name="pume_eng_score" meta_type="String Widget">
     10 <widget name="pume_eng_score" meta_type="Float Widget">
    1111  <property name="title">PUME English Score</property>
    1212  <property name="fields">
    … …  
    2020  <property name="hidden_readonly_layout_modes"/>
    2121 </widget>
    22  <widget name="pume_gen_score" meta_type="String Widget">
     22 <widget name="pume_gen_score" meta_type="Float Widget">
    2323  <property name="title">PUME General Score</property>
    2424  <property name="fields">
    … …  
    3232  <property name="hidden_readonly_layout_modes"/>
    3333 </widget>
    34  <widget name="pume_math_score" meta_type="String Widget">
     34 <widget name="pume_math_score" meta_type="Float Widget">
    3535  <property name="title">PUME Mathematics Score</property>
    3636  <property name="fields">
    … …  
    4444  <property name="hidden_readonly_layout_modes"/>
    4545 </widget>
    46  <widget name="pume_tot_score" meta_type="String Widget">
     46 <widget name="pume_tot_score" meta_type="Float Widget">
    4747  <property name="title">PUME Total Score</property>
    4848  <property name="fields">

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

    r752 r770  
    33 <field name="app_ac_date" meta_type="CPS DateTime Field"/>
    44 <field name="app_ac_pin" meta_type="CPS String Field"/>
    5  <field name="appl_email" meta_type="CPS String Field"/>
    6  <field name="appl_mobile" meta_type="CPS String Field"/>
     5 <field name="app_email" meta_type="CPS String Field"/>
     6 <field name="app_mobile" meta_type="CPS String Field"/>
    77 <field name="entry_mode" meta_type="CPS String Field"/>
    88 <field name="jamb_age" meta_type="CPS Int Field"/>

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

    r752 r770  
    5151 <field name="cert" meta_type="CPS Image Field"/>
    5252 <field name="evid" meta_type="CPS Image Field"/>
    53  <field name="passport" meta_type="CPS Image Field"/>
    5453 <field name="jamb_let" meta_type="CPS Image Field"/>
    5554 <field name="res_stat" meta_type="CPS Image Field"/>

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

    r764 r770  
    11<?xml version="1.0"?>
    22<object name="student_pume" meta_type="CPS Schema">
    3  <field name="pume_eng_score" meta_type="CPS String Field"/>
    4  <field name="pume_gen_score" meta_type="CPS String Field"/>
    5  <field name="pume_math_score" meta_type="CPS String Field"/>
    6  <field name="pume_tot_score" meta_type="CPS String Field"/>
     3 <field name="pume_eng_score" meta_type="CPS Float Field"/>
     4 <field name="pume_gen_score" meta_type="CPS Float Field"/>
     5 <field name="pume_math_score" meta_type="CPS Float Field"/>
     6 <field name="pume_tot_score" meta_type="CPS Float Field"/>
    77</object>

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

    r695 r770  
    88 <property name="product">WAeUP_SRP</property>
    99 <property name="factory">addScratchCardBatch</property>
    10  <property name="immediate_view">folder_view</property>
     10 <property name="immediate_view">batch_view</property>
    1111 <property name="global_allow">True</property>
    1212 <property name="filter_content_types">True</property>

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

    r730 r770  
    99 <state state_id="closed" title="">
    1010  <exit-transition transition_id="open"/>
     11  <exit-transition transition_id="publish"/>
    1112 </state>
    1213 <state state_id="content_addable" title="">
    … …  
    5152                  acquired="True">
    5253   <permission-role>Owner</permission-role>
     54  </permission-map>
     55 </state>
     56 <state state_id="public" title="">
     57  <exit-transition transition_id="close"/>
     58  <permission-map name="Add portal content" acquired="True">
     59  </permission-map>
     60  <permission-map name="Modify portal content"
     61                  acquired="True">
     62  </permission-map>
     63  <permission-map name="View" acquired="True">
     64   <permission-role>Anonymous</permission-role>
    5365  </permission-map>
    5466 </state>
    … …  
    97109  </guard>
    98110 </transition>
     111 <transition transition_id="publish" title=""
     112             new_state="public" trigger="USER"
     113             before_script="" after_script="">
     114 
     115  <guard>
     116   <guard-role>Manager</guard-role>
     117   <guard-role>SectionManager</guard-role>
     118  </guard>
     119 </transition>
    99120</cps-workflow>

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

    r767 r770  
    8787    member.setProperties(last_login_time=current,login_time=current)
    8888    if info['review_state'] == "application_pin_entered":
    89         return response.redirect("%s/passport_entry_view" % student.absolute_url())
     89        return response.redirect("%s/application_edit" % student.absolute_url())
     90    elif info['review_state'] == "clearance_pin_entered":
     91        return response.redirect("%s/clearance_edit" % student.absolute_url())       
    9092    return response.redirect("%s/student_index" % info['url'])
    9193

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

    r617 r770  
    5050              <tal:block condition="not: widget/label">
    5151              <td>
    52                 <div valign="top" width=30%> no label </div>
     52                <div valign="top"> no label </div>
    5353              </td>
    5454              </tal:block>             

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

    r753 r770  
    66                                        'admission_applied',
    77                                        'cleared_and_validated',
     8                                        'admitted',
     9                                        'clearance_pin_entered',
    810                                        'category_A',
    911                                        'category_B',

  • WAeUP_SRP/trunk/skins/waeup_pins/batch_view.pt

    r711 r770  
    2222              />
    2323        <br />
     24       
    2425        <h3>Unused</h3>
    2526        <table>
    2627          <tr tal:repeat="pin info/unused">
    27             <td tal:content="pin/serial" />
     28            <td width="50px"> <span tal:content="pin/serial" />: </td>
    2829            <td tal:content="pin/pin" />
    2930          </tr>
    3031        </table>
     32       
    3133        <h3>Used</h3>
    3234        <table>
    3335          <tr tal:repeat="pin info/used">
    34             <td tal:content="pin/serial" />
     36            <td width="50px"> <span tal:content="pin/serial" />: </td>
    3537            <td tal:content="pin/pin" />
    3638            <td>

  • WAeUP_SRP/trunk/skins/waeup_pins/getBatchInfo.py

    r710 r770  
    2929
    3030for item in used:
    31     if bd.prefix == "APP":
    32         jno = item['student']
    33         res = context.portal_catalog(SearchableText=jno,portal_type='StudentApplication')
     31    sno = item['student']
     32    if len(sno)==10:
     33    #if bd.prefix == "APP":
     34        res = context.portal_catalog(SearchableText=sno,portal_type='StudentApplication')
    3435        if len(res) > 0:
    3536            item['student_url'] = "%s/%s" % (context.portal_url(),res[0].relative_path)

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