Changeset 2322


Ignore:
Timestamp:
6 Oct 2007, 08:04:42 (17 years ago)
Author:
Henrik Bettermann
Message:

make apply_pume work (not yet finished)

Location:
WAeUP_SRP
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/skins/waeup_student/apply_admission.py

    r2316 r2322  
    6363elif traverse_subpath and traverse_subpath[0] == "pde":
    6464    layout = "application_pde"
    65     application_type = "pce"
     65    application_type = "pde"
    6666elif traverse_subpath and traverse_subpath[0] == "cest":
    6767    layout = "application_cest"
    68     application_type = "pce"
     68    application_type = "cest"
    6969else:
    7070    return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
    … …  
    7979if not reg_no:
    8080    reg_no = request.form.get('reg_no','').upper()
    81 
    82 
     81if not reg_no:
     82    reg_no = request.get('widget__pin_n','').upper()
    8383
    8484object = {}
    … …  
    117117                             commit = False,
    118118                            )
     119                           
     120                       
    119121
    120122if slip:
    … …  
    146148if without_reg_no:
    147149    reg_no = ds.get('reg_no')
     150   
     151 
    148152data = {}
    149153dm = ds.getDataModel()
    … …  
    152156        data[field] = dm.get(field)
    153157data['reg_no'] = reg_no
     158data['screening_type'] = application_type
     159
     160
    154161
    155162if apply_admission:
    … …  
    227234        psm = "Content changed!"
    228235        data['status'] = "edited"
     236        #set_trace()
    229237        context.applicants_catalog.modifyRecord(**data)
    230238        logger.info('%s/%s modified application record' % (member,reg_no))

  • WAeUP_SRP/base/skins/waeup_student/apply_admission_form.pt

    r2316 r2322  
    3434                 tal:attributes="value ds/pin|nothing"
    3535                 tal:condition="ds/pin|nothing"/>
    36           <input type="hidden" name="application_type"
    37                  tal:attributes="value application_type|nothing"
    38                  tal:condition="application_type|nothing"/>
    39                  
     36               
    4037          <div tal:replace="structure rendered_main" />
    4138         

  • WAeUP_SRP/fceokene/profiles/default/layouts/application_manage.xml

    r2316 r2322  
    9595  </widget>
    9696  <widget name="firstname" meta_type="String Widget">
    97     <property name="title">Firstname</property>
     97    <property name="title">First Name</property>
    9898    <property name="fields">
    9999      <element value="firstname"/>
    100100    </property>
    101     <property name="label">Firstname</property>
    102     <property name="label_edit">Firstname</property>
     101    <property name="label">First Name</property>
     102    <property name="label_edit">First Name</property>
    103103    <property name="description"></property>
    104104    <property name="help"></property>
    … …  
    274274  </widget>
    275275  <widget name="lastname" meta_type="String Widget">
    276     <property name="title">Name</property>
     276    <property name="title">Surname</property>
    277277    <property name="fields">
    278278      <element value="lastname"/>
    279279    </property>
    280     <property name="label">Name</property>
    281     <property name="label_edit">Name</property>
     280    <property name="label">Surname</property>
     281    <property name="label_edit">Surname</property>
    282282    <property name="description"></property>
    283283    <property name="help"></property>
    … …  
    309309  </widget>
    310310  <widget name="middlenames" meta_type="String Widget">
    311     <property name="title">Middlenames</property>
     311    <property name="title">Middle Names</property>
    312312    <property name="fields">
    313313      <element value="middlenames"/>
    314314    </property>
    315     <property name="label">Middlenames</property>
    316     <property name="label_edit">Middlenames</property>
     315    <property name="label">Middle Names</property>
     316    <property name="label_edit">Middle Names</property>
    317317    <property name="description"></property>
    318318    <property name="help"></property>
    … …  
    426426    <property name="css_class_expr">string:row</property>
    427427  </widget>
    428   <widget name="screening_type" meta_type="String Widget">
     428  <widget name="screening_type" meta_type="Select Widget">
    429429    <property name="title">Screening Type</property>
    430430    <property name="fields">
    … …  
    441441    <property name="hidden_readonly_layout_modes"/>
    442442    <property name="css_class_expr">string:row</property>
     443    <property name="vocabulary">screening_types</property>
    443444  </widget>
    444445  <widget name="reg_no" meta_type="JambRegNo Widget">
    … …  
    619620  </row>
    620621  <row>
     622   <cell name="firstname" ncols="2"/>
     623  </row>
     624  <row>
     625   <cell name="middlenames" ncols="2"/>
     626  </row> 
     627  <row>
    621628   <cell name="lastname" ncols="2"/>
    622629  </row>
    623630  <row>
    624631   <cell name="date_of_birth" ncols="2"/>
    625   </row> 
     632  </row>
    626633  <row>
    627634   <cell name="email" ncols="2"/>
    … …  
    667674  </row>
    668675  <row>
     676   <cell name="screening_type" ncols="2"/>
     677  </row>
     678  <row>
    669679   <cell name="passport" ncols="2"/>
    670680  </row>

  • WAeUP_SRP/fceokene/profiles/default/layouts/application_pce.xml

    r2312 r2322  
    426426    <property name="css_class_expr">string:row</property>
    427427  </widget>
    428   <widget name="screening_type" meta_type="String Widget">
     428  <widget name="screening_type" meta_type="Select Widget">
    429429    <property name="title">Screening Type</property>
    430430    <property name="fields">
    … …  
    441441    <property name="hidden_readonly_layout_modes"/>
    442442    <property name="css_class_expr">string:row</property>
     443    <property name="vocabulary">screening_types</property>
    443444  </widget>
    444445  <widget name="reg_no" meta_type="JambRegNo Widget">

  • WAeUP_SRP/fceokene/profiles/default/layouts/application_prence.xml

    r2316 r2322  
    2525    <property name="hidden_layout_modes">
    2626      <element value="create"/>
     27      <element value="edit"/>
    2728    </property>
    2829    <property name="hidden_readonly_layout_modes"/>
    … …  
    121122  </widget>
    122123  <widget name="firstname" meta_type="String Widget">
    123     <property name="title">Firstname</property>
     124    <property name="title">First Name</property>
    124125    <property name="fields">
    125126      <element value="firstname"/>
    126127    </property>
    127     <property name="label">Firstname</property>
    128     <property name="label_edit">Firstname</property>
     128    <property name="label">First Name</property>
     129    <property name="label_edit">First Name</property>
    129130    <property name="description"></property>
    130131    <property name="help"></property>
    … …  
    300301  </widget>
    301302  <widget name="lastname" meta_type="String Widget">
    302     <property name="title">Name</property>
     303    <property name="title">Surname</property>
    303304    <property name="fields">
    304305      <element value="lastname"/>
    305306    </property>
    306     <property name="label">Name</property>
    307     <property name="label_edit">Name</property>
     307    <property name="label">Surname</property>
     308    <property name="label_edit">Surname</property>
    308309    <property name="description"></property>
    309310    <property name="help"></property>
    … …  
    335336  </widget>
    336337  <widget name="middlenames" meta_type="String Widget">
    337     <property name="title">Middlenames</property>
     338    <property name="title">Middle Names</property>
    338339    <property name="fields">
    339340      <element value="middlenames"/>
    340341    </property>
    341     <property name="label">Middlenames</property>
    342     <property name="label_edit">Middlenames</property>
     342    <property name="label">Middle Names</property>
     343    <property name="label_edit">Middle Names</property>
    343344    <property name="description"></property>
    344345    <property name="help"></property>
    … …  
    452453    <property name="css_class_expr">string:row</property>
    453454  </widget>
    454   <widget name="screening_type" meta_type="String Widget">
     455  <widget name="screening_type" meta_type="Select Widget">
    455456    <property name="title">Screening Type</property>
    456457    <property name="fields">
    … …  
    467468    <property name="hidden_readonly_layout_modes"/>
    468469    <property name="css_class_expr">string:row</property>
     470    <property name="vocabulary">screening_types</property>
    469471  </widget>
    470472  <widget name="score" meta_type="Int Widget">
    … …  
    628630  </row>
    629631  <row>
     632   <cell name="firstname" ncols="2"/>
     633  </row>
     634  <row>
     635   <cell name="middlenames" ncols="2"/>
     636  </row> 
     637  <row>
    630638   <cell name="lastname" ncols="2"/>
    631639  </row>

  • WAeUP_SRP/fceokene/profiles/default/layouts/application_pume.xml

    r2316 r2322  
    2525    </property>
    2626    <property name="view_format">%d/%m/%Y</property>
    27     <property name="time_setting">False</property>   
     27    <property name="time_setting">False</property>
    2828    <property name="hidden_readonly_layout_modes"/>
    2929    <property name="css_class_expr">string:row</property>
    … …  
    428428    <property name="css_class_expr">string:row</property>
    429429  </widget>
    430   <widget name="screening_type" meta_type="String Widget">
     430  <widget name="screening_type" meta_type="Select Widget">
    431431    <property name="title">Screening Type</property>
    432432    <property name="fields">
    … …  
    443443    <property name="hidden_readonly_layout_modes"/>
    444444    <property name="css_class_expr">string:row</property>
     445    <property name="vocabulary">screening_types</property>
    445446  </widget>
    446447  <widget name="reg_no" meta_type="JambRegNo Widget">

  • WAeUP_SRP/fceokene/profiles/default/vocabularies.xml

    r2131 r2322  
    4141 <object name="global_roles" meta_type="CPS Vocabulary"/>
    4242 <object name="cos" meta_type="CPS Vocabulary"/>
     43 <object name="screening_types" meta_type="CPS Vocabulary"/>
    4344 </object>
Note: See TracChangeset for help on using the changeset viewer.