Changeset 2670


Ignore:
Timestamp:
15 Nov 2007, 22:07:14 (17 years ago)
Author:
Henrik Bettermann
Message:

further modifications for session change

Location:
WAeUP_SRP
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/base/WAeUPTool.py

    r2666 r2670  
    760760            sex = 'F'
    761761        da['jamb_sex'] = sex
     762        da['jamb_age'] = brain.jamb_age
    762763        #da['app_ac_pin'] = brain.pin
    763         #if brain.lga:
    764         #    state_lga = brain.lga.split('_')
    765         #    da['state_lga'] = state_lga[0]
    766         #    da['jamb_lga'] = state_lga[-1]
    767         da['state_lga'] = brain.jamb_lga
    768         da['jamb_lga'] = brain.jamb_state
     764        da['jamb_lga'] = brain.jamb_lga
     765        da['jamb_state'] = brain.jamb_state
    769766        da['jamb_score'] = brain.aggregate
    770767        da['app_email'] = brain.email
    … …  
    781778        da['jamb_lastname'] = brain.lastname
    782779        da['jamb_middlename'] = brain.middlenames   # different field names!
    783         da['firstname'] = brain.firstname
     780        da['jamb_firstname'] = brain.firstname
    784781        da['screening_application_date'] = brain.application_date
    785782        da['date_of_birth'] = brain.date_of_birth
    … …  
    818815        dc = {'Title': 'Clearance/Eligibility Record'}
    819816        dc['lga'] = brain.lga
     817        dc['birthday'] = brain.date_of_birth
    820818        clearance.getContent().edit(mapping=dc)
    821819        #self.portal_workflow.doActionFor(clearance,'close',dest_container=clearance)

  • WAeUP_SRP/base/skins/waeup_epayment/dumpSCPayments.py

    r2667 r2670  
    2525import logging
    2626import DateTime
    27 logger = logging.getLogger('Skins.dumpSCPayments.py')
     27logger = logging.getLogger('Skins.dumpSCPayments')
    2828from Products.AdvancedQuery import Eq, Between, Le,In
    2929aq_pins = context.portal_pins.evalAdvancedQuery
    … …  
    4444
    4545used_query = ~Eq('student','') & ~In('prefix_batch',('APP1','APP2','APP3','APP4','APP5',))
    46              
     46
    4747pins = aq_pins(used_query,sortSpecs=('student',))
    4848#set_trace()
    … …  
    8282                #     break
    8383            count += 1
    84         student_id = d['student_id'] = pin.student 
     84        student_id = d['student_id'] = pin.student
    8585        costs = ["%8.2f" % cost_dict[pin.prefix_batch],]
    8686        pins = [pin.pin,]
    … …  
    9494logger.info('%s dumped sc payments to %s' % (member,csv_name))
    9595logger.info("finished for %d students total N %12.2f %12.2f Euros" % (count,sum_total,sum_total/170))
    96    
    97    
     96
     97

  • WAeUP_SRP/base/skins/waeup_layout/layout_clearance_edit.pt

    r2243 r2670  
    4040              <label tal:content="widget/label_edit"
    4141                     tal:attributes="for cell/widget_input_area_id|nothing;">label</label>:
    42             </div>
     42           
    4343            <button type="button" class="tooltipControl"
    4444                    tal:condition="widget/help"
    4545                    tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
     46            </div>       
    4647            </td>
    4748            <td valign="bottom">

  • WAeUP_SRP/base/skins/waeup_layout/layout_waeup_edit.pt

    r2332 r2670  
    5656              tal:content="widget/label_edit"
    5757              tal:attributes="for cell/widget_input_area_id|nothing;">label</label>
    58           </div>
     58         
    5959          <button type="button" class="tooltipControl"
    6060                  tal:condition="widget/help"
    6161                  tal:attributes="onclick python:'toggleElementVisibility(\'%s\')' % tooltip_id;"> ? </button>
     62          </div>
    6263          <div class="field">
    6364            <div tal:replace="structure cell/widget_rendered"/>

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

    r2573 r2670  
    77      <span tal:condition="info">
    88           
    9         <div style="text-align: right" tal:define="review_state info/review_state"
    10              tal:condition="python:review_state not in ('created','application_pin_entered',)">
    11         <a href="" target="slip" tal:attributes="href string:application_slip"
    12             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')">
    13             <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
    14             Application Slip
    15         </a>
    16        
    17           </div>
     9
    1810        <a href=""
    1911           tal:attributes="href string:${here/academicsParent}">

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

    r2598 r2670  
    6868        if not object['passport']:
    6969                object['passport'] = ''
    70         if object['status'] and ('submitted' in object['status'] or 'admitted' in object['status']):
     70        if object['status'] and ('submitted' in object['status'] or 'admitted' in object['status'] or 'created' in object['status']):
    7171            submitted = True
    7272

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

    r2586 r2670  
    7373          <metal:block tal:condition="python:info['status'] == 'created'">
    7474              <br />
    75                 <strong>You that you have been provisionally admitted into University of Benin. Your member record has been created.
     75                <strong>You have been provisionally admitted into University of Benin. Your member record has been created.
    7676                        Please purchase a second Application Scratch Card and proceed to 'Check Admission'.</strong>
    7777              <br />  <br /> 

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

    r2491 r2670  
    7474    #from Products.zdb import set_trace
    7575    #set_trace()
    76     info['clear_doc'].edit(mapping = {'cleared_date': current,})
     76    clear_doc.edit(mapping = {'cleared_date': current,})
    7777    wftool.doActionFor(info['student'],'clear_and_validate')
     78   
     79    if info['per_review_state'] != 'opened':
     80        wftool.doActionFor(info['per'],'open')
     81   
     82    per_doc = info['per'].getContent()
     83    per_doc.edit(mapping = {'firstname': clear_doc.firstname, 'middlename': clear_doc.middlename, 'lastname': clear_doc.lastname,})
     84   
     85   
     86   
    7887    psm = "Clearance and eligibility record is validated and student is cleared!"
    7988elif clear_and_validate_button and info['review_state'] == "cleared_and_validated":
    … …  
    103112            req_found = [scan for scan in required_scans if scan in files]
    104113            birth_found = "age_dec" in files or "birth_certificate" in files
    105             if not req_found or not birth_found:
    106                 logger.info('%s requested clearance with documents missing' % (student_id))
    107                 psm = "You have not uploaded all necessary documents to request clearance!"
     114            #if not req_found or not birth_found:
     115            #    logger.info('%s requested clearance with documents missing' % (student_id))
     116            #    psm = "You have not uploaded all necessary documents to request clearance!"
     117            if not clear_doc.firstname or not clear_doc.lastname:
     118                logger.info('%s requested clearance without confirming name' % (student_id))
     119                psm = "Please fill the name fields! First and last name are required. "           
    108120            else:
    109121                logger.info('%s requested clearance' % (student_id))
    110                 info['clear_doc'].edit(mapping = {'request_date': current,})
     122                clear_doc.edit(mapping = {'request_date': current,})
    111123                wftool.doActionFor(info['clear'],'close')
    112124                wftool.doActionFor(info['student'],'request_clearance',dest_container=1)

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

    r1871 r2670  
    5353info['clear_doc'] = student.clearance.getContent()
    5454info['clear_review_state'] = wf.getInfoFor(student.clearance,'review_state',None)
     55info['per'] = student.personal
     56info['per_review_state'] = wf.getInfoFor(student.personal,'review_state',None)
    5557if info['review_state'] in ('clearance_requested', 'cleared_and_validated',):
    5658    info['penalty'] = info['penalty'] and\

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

    r2582 r2670  
    99 <property name="validate_values_expr"></property>
    1010 <widget name="app_ac_date" meta_type="DateTime Widget">
    11   <property name="title">Application Date</property>
     11  <property name="title">Admission Checking Date</property>
    1212  <property name="fields">
    1313   <element value="app_ac_date"/>
    1414  </property>
    15   <property name="label">Application Date</property>
    16   <property name="label_edit">Application Date</property>
     15  <property name="label">Admission Checking Date</property>
     16  <property name="label_edit">Admission Checking Date</property>
    1717  <property name="readonly_layout_modes">
    1818   <element value="edit"/>
    … …  
    2626 </widget>
    2727 <widget name="app_ac_pin" meta_type="Scratchcard Pin Widget">
    28   <property name="title">Access Code</property>
     28  <property name="title">Admission Checking PIN</property>
    2929  <property name="fields">
    3030   <element value="app_ac_pin"/>
    3131  </property>
    32   <property name="label">Access Code</property>
    33   <property name="label_edit">Access Code</property>
     32  <property name="label">Admission Checking PIN</property>
     33  <property name="label_edit">Admission Checking PIN</property>
    3434  <property name="readonly_layout_modes">
    3535   <element value="edit"/>
    … …  
    237237  <property name="hidden_readonly_layout_modes"/>
    238238 </widget>
     239 <widget name="course3" meta_type="String Widget">
     240  <property name="title">Third Choice Course of Study</property>
     241  <property name="fields">
     242   <element value="course3"/>
     243  </property>
     244  <property name="label">Third Choice Course of Study</property>
     245  <property name="label_edit">Third Choice Course of Study</property>
     246  <property name="readonly_layout_modes">
     247   <element value="edit"/>
     248  </property>
     249  <property name="hidden_layout_modes">
     250   <element value="create"/>
     251  </property>
     252  <property name="hidden_readonly_layout_modes"/>
     253 </widget>
    239254
    240255 <widget name="jamb_sex" meta_type="String Widget">
    … …  
    510525   <cell name="jamb_second_cos" ncols="3"/>
    511526  </row>
     527  <row>
     528   <cell name="course3" ncols="3"/>
     529  </row>
     530 
    512531
    513532

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

    r2585 r2670  
    88 <property name="flexible_widgets"/>
    99 <property name="validate_values_expr"></property>
     10
     11 <widget name="firstname" meta_type="String Widget">
     12  <property name="title">First Name</property>
     13  <property name="fields">
     14   <element value="firstname"/>
     15  </property>
     16  <property name="is_required">False</property>
     17  <property name="label">First Name</property>
     18  <property name="label_edit">First Name</property>
     19  <property
     20     name="help"></property>
     21  <property name="readonly_layout_modes"/>
     22  <property name="hidden_layout_modes">
     23   <element value="create"/>
     24  </property>
     25  <property name="hidden_readonly_layout_modes"/>
     26 </widget>
     27 
     28 <widget name="middlename" meta_type="String Widget">
     29  <property name="title">Middle Name</property>
     30  <property name="fields">
     31   <element value="middlename"/>
     32  </property>
     33  <property name="label">Middle Name</property>
     34  <property name="label_edit">Middle Name</property>
     35  <property
     36     name="help"></property>
     37  <property name="readonly_layout_modes"/>
     38  <property name="hidden_layout_modes">
     39   <element value="create"/>
     40  </property>
     41  <property name="hidden_readonly_layout_modes"/>
     42 </widget>
     43 
     44 <widget name="lastname" meta_type="String Widget">
     45  <property name="title">Last Name (Surname)</property>
     46  <property name="fields">
     47   <element value="lastname"/>
     48  </property>
     49  <property name="is_required">False</property>
     50  <property name="label">Last Name (Surname)</property>
     51  <property name="label_edit">Last Name (Surname)</property>
     52  <property
     53     name="help"></property>
     54  <property name="readonly_layout_modes"/>
     55  <property name="hidden_layout_modes">
     56   <element value="create"/>
     57  </property>
     58  <property name="hidden_readonly_layout_modes"/>
     59 </widget>
     60
     61
     62
    1063 <widget name="acc_inst" meta_type="File Image Widget">
    1164  <property name="title">Accepted by Institution</property>
    … …  
    83136  <property name="description">Advanced Level Data</property>
    84137  <property
    85      name="help">Full name as it appears on certificate/result</property>
     138     name="help"></property>
    86139  <property name="readonly_layout_modes"/>
    87140  <property name="hidden_layout_modes">
    … …  
    221274  <property name="label_edit">Deferment of Admission</property>
    222275  <property
    223      name="help">Tick this box if you wish to defer admission till next session.</property>
     276     name="help"></property>
    224277  <property name="readonly_layout_modes"/>
    225278  <property name="hidden_layout_modes">
    … …  
    336389  <property name="description">First Sitting Data</property>
    337390  <property
    338      name="help">Full name as it appears on certificate/result</property>
     391     name="help"></property>
    339392  <property name="readonly_layout_modes"/>
    340393  <property name="hidden_layout_modes">
    … …  
    651704  <property name="description">Second Sitting Data</property>
    652705  <property
    653      name="help">Full name as it appears on certificate/result</property>
     706     name="help"></property>
    654707  <property name="readonly_layout_modes"/>
    655708  <property name="hidden_layout_modes">
    … …  
    748801 <table>
    749802  <row>
     803   <cell name="firstname"/>
     804  </row>
     805  <row>
     806   <cell name="middlename"/>
     807  </row>
     808  <row>
     809   <cell name="lastname"/>
     810  </row>     
     811  <row>
    750812   <cell name="matric_no"/>
    751813  </row>

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

    r2335 r2670  
    88 <property name="flexible_widgets"/>
    99 <property name="validate_values_expr"></property>
     10 
     11 
     12  <widget name="firstname" meta_type="String Widget">
     13  <property name="title">First Name</property>
     14  <property name="fields">
     15   <element value="firstname"/>
     16  </property>
     17  <property name="label">First Name</property>
     18  <property name="label_edit">First Name</property>
     19  <property name="is_required">False</property>
     20  <property
     21     name="help">Please confirm your first name. After clearance this name will appear on all documents.</property>
     22  <property name="readonly_layout_modes"/>
     23  <property name="hidden_layout_modes">
     24   <element value="create"/>
     25  </property>
     26  <property name="hidden_readonly_layout_modes"/>
     27 </widget>
     28 
     29 <widget name="middlename" meta_type="String Widget">
     30  <property name="title">Middle Name</property>
     31  <property name="fields">
     32   <element value="middlename"/>
     33  </property>
     34  <property name="label">Middle Name</property>
     35  <property name="label_edit">Middle Name</property>
     36  <property
     37     name="help">Please confirm your middle name. After clearance this name will appear on all documents.</property>
     38  <property name="readonly_layout_modes"/>
     39  <property name="hidden_layout_modes">
     40   <element value="create"/>
     41  </property>
     42  <property name="hidden_readonly_layout_modes"/>
     43 </widget>
     44 
     45 <widget name="lastname" meta_type="String Widget">
     46  <property name="title">Last Name (Surname)</property>
     47  <property name="fields">
     48   <element value="lastname"/>
     49  </property>
     50  <property name="is_required">False</property>
     51  <property name="label">Last Name (Surname)</property>
     52  <property name="label_edit">Last Name (Surname)</property>
     53  <property
     54     name="help">Please confirm your surname. After clearance this name will appear on all documents.</property>
     55  <property name="readonly_layout_modes"/>
     56  <property name="hidden_layout_modes">
     57   <element value="create"/>
     58  </property>
     59  <property name="hidden_readonly_layout_modes"/>
     60 </widget>
     61 
    1062 <widget name="acc_inst" meta_type="File Image Widget">
    1163  <property name="title">Accepted by Institution</property>
    … …  
    562614  <property name="hidden_layout_modes">
    563615   <element value="create"/>
     616   <element value="edit"/>   
    564617  </property>
    565618  <property name="hidden_readonly_layout_modes"/>
    … …  
    579632   <property name="hidden_layout_modes">
    580633     <element value="create"/>
     634     <element value="edit"/>
    581635   </property>
    582636   <property name="hidden_readonly_layout_modes"/>
    … …  
    753807 </widget>
    754808 <table>
     809 
     810  <row>
     811   <cell name="firstname"/>
     812  </row>
     813  <row>
     814   <cell name="middlename"/>
     815  </row>
     816  <row>
     817   <cell name="lastname"/>
     818  </row>   
    755819  <row>
    756820   <cell name="matric_no"/>

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

    r1876 r2670  
    22<?xml-stylesheet type="text/xsl" href="schema.xsl"?>
    33<object name="student_clearance" meta_type="CPS Schema">
     4
     5 <field name="firstname" meta_type="CPS String Field"/>
     6 <field name="middlename" meta_type="CPS String Field"/>
     7 <field name="lastname" meta_type="CPS String Field"/>
    48
    59 <field name="clr_ac_pin" meta_type="CPS String Field">
Note: See TracChangeset for help on using the changeset viewer.