Changeset 796 for WAeUP_SRP


Ignore:
Timestamp:
8 Nov 2006, 23:01:05 (18 years ago)
Author:
Henrik Bettermann
Message:

many things fixed accorging to email of Nov 8

Location:
WAeUP_SRP/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/Widgets.py

    r794 r796  
    466466                break
    467467            if ok == 0:
    468                 err = 'PIN already used'
     468                err = 'PIN already used.'
    469469                break
    470470            if ok >= 1:
    … …  
    477477                    student = getStudentByRegNo(self,ref)
    478478                if student is None:
    479                     err = "Student not Found in validate SC"
     479                    err = "Student not found."
    480480                    break
    481481                s_id = student.getId()
    482482                if ok == 2:
    483                     err = "You already used this PIN please login"
     483                    err = "You are a portal member, please login with your Student Id and Password."
    484484                    break
    485485                student.getContent().makeStudentMember(s_id,password=pin[4:])

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

    r794 r796  
    5555  </property>
    5656  <property name="hidden_readonly_layout_modes"/>
    57   <property name="render_format">radio</property>   
     57  <property name="render_format">radio</property>
    5858 </widget>
    5959 <widget name="age_dec" meta_type="Image Widget">
    … …  
    237237  </property>
    238238  <property name="hidden_readonly_layout_modes"/>
    239   <property name="render_format">radio</property>   
     239  <property name="render_format">radio</property>
    240240 </widget>
    241241 <widget name="entry_date" meta_type="Date Widget">
    … …  
    246246  <property name="label">Entry Date</property>
    247247  <property name="label_edit">Entry Date</property>
    248   <property name="readonly_layout_modes"/>
     248  <property name="readonly_layout_modes">
     249    <element value="edit"/>
     250  </property>
    249251  <property name="hidden_layout_modes">
    250252    <element value="create"/>
    … …  
    259261  <property name="label">Entry Session</property>
    260262  <property name="label_edit">Entry Session</property>
    261   <property name="readonly_layout_modes"/>
     263  <property name="readonly_layout_modes">
     264    <element value="edit"/>
     265  </property>
    262266  <property name="hidden_layout_modes">
    263267    <element value="create"/>
    … …  
    289293  <property name="label">Former Matric/RegNo</property>
    290294  <property name="label_edit">Former Matric/RegNo</property>
    291   <property name="readonly_layout_modes"/>
     295  <property name="readonly_layout_modes">
     296  </property>
    292297  <property name="hidden_layout_modes">
    293298    <element value="create"/>
    … …  
    308313  </property>
    309314  <property name="hidden_readonly_layout_modes"/>
    310   <property name="render_format">radio</property>   
     315  <property name="render_format">radio</property>
    311316 </widget>
    312317 <widget name="fst_sit_date" meta_type="Date Widget">
    … …  
    414419  <property name="label">Higher Qualification Grade</property>
    415420  <property name="label_edit">Higher Qualification Grade</property>
    416   <property name="description">Higher Qualification Data</property>
    417421  <property name="readonly_layout_modes"/>
    418422  <property name="hidden_layout_modes">
    … …  
    485489  <property name="label">Higher Qualification</property>
    486490  <property name="label_edit">Higher Qualification</property>
     491  <property name="description">Higher Qualification Data</property>
    487492  <property name="readonly_layout_modes"/>
    488493  <property name="hidden_layout_modes">
    … …  
    564569  <property name="label">Matriculation Number</property>
    565570  <property name="label_edit">Matriculation Number</property>
    566   <property name="readonly_layout_modes"/>
     571  <property name="readonly_layout_modes">
     572    <element value="edit"/>
     573  </property>
    567574  <property name="hidden_layout_modes">
    568575    <element value="create"/>
    … …  
    632639  </property>
    633640  <property name="hidden_readonly_layout_modes"/>
    634   <property name="render_format">radio</property>   
     641  <property name="render_format">radio</property>
    635642 </widget>
    636643 <widget name="scd_sit_date" meta_type="Date Widget">
    … …  
    747754  </property>
    748755  <property name="hidden_readonly_layout_modes"/>
    749   <property name="render_format">radio</property>   
     756  <property name="render_format">radio</property>
    750757 </widget>
    751758 <widget name="uniben" meta_type="Boolean Widget">
    … …  
    761768  </property>
    762769  <property name="hidden_readonly_layout_modes"/>
    763   <property name="render_format">radio</property>   
     770  <property name="render_format">radio</property>
    764771 </widget>
    765772 <table>

  • WAeUP_SRP/trunk/profiles/default/vocabularies/searchable_student_states.xml

    r786 r796  
    1111 <item key="pume_passed" msgid="">pume passed</item>
    1212 <item key="pume_failed" msgid="">pume failed</item>
    13  <item key="deferred" msgid="">deferred</item>
     13 <item key="deferred" msgid="">admission deferred</item>
    1414 <item key="admission_rejected" msgid="">admission rejected</item>
    1515 <item key="finally_rejected" msgid="">finally rejected</item>

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

    r788 r796  
    5454                #student.content_status_modify(workflow_action="enter_clearance_pin")
    5555                wftool.doActionFor(info['app'],'open',dest_container=info['app'])
     56                if info['pume'] is not None:
     57                  wftool.doActionFor(info['pume'],'close',dest_container=info['pume'])
    5658                da = {}
    5759                pin = request.get('pin')
    … …  
    9092    if info['review_state'] == "application_pin_entered":
    9193        return response.redirect("%s/application_edit" % student.absolute_url())
     94    elif info['review_state'] == "admitted":
     95        return response.redirect("%s/admission_accept_form" % student.absolute_url())
    9296    elif info['review_state'] == "clearance_pin_entered":
    9397        return response.redirect("%s/clearance_edit" % student.absolute_url())       

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

    r794 r796  
    3333clear_doc = info['clear_doc']
    3434state = context.getStudentInfo()['review_state']
    35 is_valid, ds = app_doc.validate(request=REQUEST, 
     35is_valid, ds = app_doc.validate(request=REQUEST,
    3636                                schema_id = 'student_application',
    3737                                layout_id = 'student_application_fe',
    … …  
    4343action = "/application_edit_form"
    4444base_url = app.absolute_url()
     45
     46if app_doc.passport is not None:
     47    args['proceed'] = 'Continue'
     48
    4549if cpsdocument_edit_button:
    4650    if is_valid:
    4751        if app_doc.passport is not None:
    48             args['proceed'] = 'Continue to Clearance'
    49             psm = 'You successfully uploaded your passport image.'
     52            args['portal_status_message'] = 'You successfully uploaded your passport picture.'
    5053        else:
    51             psm = "You didn't upload a passport image."
     54            args['portal_status_message'] = "You didn't upload a passport picture."
    5255elif proceed:
    5356    if is_valid:
    … …  
    5558        base_url = clear.absolute_url()
    5659    else:
    57         psm = 'psm_content_error'
    58 args['portal_status_message'] = psm
    59 url = base_url + action + '?' + urlencode(args)
     60        args['portal_status_message'] = 'psm_content_error'
     61if args:
     62  url = base_url + action + '?' + urlencode(args)
     63else:
     64  url = base_url + action
    6065REQUEST.RESPONSE.redirect(url)

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

    r794 r796  
    77                      use_session=True, no_form=True)">
    88  <metal:body use-macro="here/waeup_content_master/macros/master">
     9 
     10    <metal:block fill-slot="header">
     11      <a href=""
     12         tal:attributes="href string:${here/academicsParent}">
     13        <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
     14        Up one level
     15      </a>
     16      <h3>Update your Application Data!</h3>
     17      <br />
     18    </metal:block> 
     19 
    920    <metal:main fill-slot="main">
    1021      <span tal:condition="not: info">
    1122        <metal:block use-macro="here/error_not_found/macros/not_found" />
    1223      </span>
    13       <span tal:condition="info"
    14             tal:define="review_state info/review_state">
    15         <h3>Upload or Change your Passport Picture!</h3>
    16         <br />
     24      <span tal:condition="info">
    1725        <span tal:omit-tag="" tal:replace="structure rendered_main"/>
    1826      </span>

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

    r789 r796  
    4141
    4242  <metal:block fill-slot="header">
    43     <metal:block define-slot="header">
    44         <h3> Edit your clearance Data</h3>
    45     </metal:block>
     43     <a href=""
     44       tal:attributes="href string:${here/academicsParent}">
     45      <img tal:attributes="src string:${here/portal_url}/arrow_up.gif"/>
     46      Up one level
     47    </a>
     48    <h3>Fill Your Clearance Form!</h3>
     49    <br />   
    4650  </metal:block>
    47 
    4851
    4952  <metal:block fill-slot="main">

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

    r788 r796  
    1414    </metal:block>
    1515      <metal:block fill-slot="main">
    16         <h3>Request Clearance! </h3>
     16        <h3>Start Clearance! </h3>
    1717        <br />
    1818        <div tal:replace="structure rendered_main" />
    19           <p>Instructions :</p>
    20           <ul>
    21             <li>Buy a Clearance Scratch Card.</li>
    22             <li>Apply</li>
    23           </ul>
    2419      </metal:block>
    2520      <metal:block fill-slot="sub">

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

    r787 r796  
    124124        row['s_edit_link'] = "%s/%s" % (soo.absolute_url(),se_link)
    125125    row['review_state'] = so.review_state
    126     row['display'] = so.review_state in ('opened','closed','public',) or\
    127                      so.portal_type in ("StudentAccommodation","StudentStudyCourse")
     126    row['display'] = so.review_state in ('opened','closed','public',) #or\
     127                     #so.portal_type in ("StudentAccommodation","StudentStudyCourse")
    128128    items.append(row)
    129129info['items'] = items

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

    r790 r796  
    55              dm options/datastructure/getDataModel;
    66              widgets python:context.getRenderedWidgets(layout);
    7               fields python:('jamb_reg_no',
    8                                  'app_ac_pin',
    9                                  'app_ac_date',
    10                                  'app_email',
    11                                  'app_mobile',
    12                                  'jamb_lastname',
    13                                  'jamb_sex',
    14                                  'jamb_first_cos',
    15                                  'jamb_second_cos',)"
     7              fields python:('')"
    168                                 >
    179  <table cellpadding="2" cellspacing="2" summary="layout">
    … …  
    4032      </tal:block>
    4133    </tr>
    42     <tr>
    43       <tal:block define="cell widgets/passport;
    44                          widget cell/widget"
    45                          >
    46           <div tal:attributes="class cell/widget_css_class|nothing;
    47               id python:widget.getHtmlWidgetId()+'_widget';">
    48             <td valign="top">
    49             <tal:block condition="widget/label">
    50               <span class="label"
    51                     tal:content="widget/label">label</span>:
    52             </tal:block>
    53             </td>
    54             <td>
    55               <img src="img" tal:replace="structure cell/widget_rendered">
    56             </td>
    57           </div>
    58       </tal:block>
    59     </tr>   
    6034  </table>
    6135</metal:block>

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

    r786 r796  
    6262 
    6363  <span tal:condition="python:path('info/review_state')=='deferred'">
    64   <tr><td class="stopped">Deferred</td></tr>
     64  <tr><td class="stopped">Admission deferred</td></tr>
    6565  </span>
    6666  <span tal:condition="python:path('info/review_state')!='deferred'">
    67   <tr><td>Deferred</td></tr>
     67  <tr><td>Admission deferred</td></tr>
    6868  </span> 
    6969

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

    r790 r796  
    2525                      layout_mode='create',
    2626                      formaction = "request_clearance",
    27                       button = "Request Clearance",
     27                      button = "Start",
    2828                      )
    2929if psm == 'invalid':
Note: See TracChangeset for help on using the changeset viewer.