Changeset 1286 for WAeUP_SRP/trunk/skins


Ignore:
Timestamp:
12 Jan 2007, 22:27:43 (18 years ago)
Author:
Henrik Bettermann
Message:

new student statistics
sc payment beautified
student workflow state and transition renamed

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

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/skins/waeup_epayment/pay_by_sc.py

    r1283 r1286  
    3232    logger.info('"%s","certificate not found", "%s"' % (student_id,course))
    3333    prefix = ""
    34 else:   
     34else:
    3535    prefix = res[0].getObject().getContent().school_fee_code
    3636    if not prefix or prefix == 'none':
    … …  
    7777now = DateTime.DateTime()
    7878info['date'] = now
    79 info['amount'] = "n/a" 
     79info['amount'] = "n/a"
    8080pin = info['order_id'] = ds.get('pin')
    81 info['type_code'] = "schoolfee_%s" % pin
    82 info['type_description'] = 'Schoolfee SC %s' % pin
     81info['type_code'] = "%s" % pin
     82info['type_description'] = 'School Fee SC %s' % pin
    8383payments.invokeFactory('Payment', p_id)
    8484payment = getattr(payments,p_id)
    … …  
    8787payment.getContent().edit(mapping=info)
    8888wftool.doActionFor(payment,'close')
    89 wftool.doActionFor(student,'enter_school_fee_pin')
     89wftool.doActionFor(student,'pay_school_fee')
    9090url = "%s/payments" % (student.absolute_url())
    9191request.RESPONSE.redirect(url)

  • WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

    r1257 r1286  
    11<metal:html tal:define="info context/getPaymentsFolderInfo;
    2              is_so info/is_so;
     2             is_student context/isStudent;
    33             rows info/payments"
    44             >
    … …  
    1515        </a>
    1616        <h3>
    17           <span tal:condition="python:is_so">
     17          <span tal:condition="not:is_student">
    1818            <span tal:content="info/student_name" />:
    1919          </span>
     20          <span tal:condition="is_student">
     21            My
     22          </span>         
    2023          <span tal:content="here/title_or_id" />
    2124        </h3>

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

    r1274 r1286  
    1818if not res:
    1919    logger.info('"%s","certificate not found", "%s"' % (student_id,course))
    20     prefix = ""
    21 else:   
     20    prefix = "--"
     21else:
    2222    prefix = res[0].getObject().getContent().school_fee_code
    2323    if not prefix or prefix == 'none':

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

    r1179 r1286  
    150150    row['review_state'] = so.review_state
    151151    if info['review_state'] in ('returning',
    152                                 'school_fee_pin_entered',
     152                                'school_fee_paid',
    153153                                'courses_registered',
    154154                                'courses_validated',):
    … …  
    163163                           so.portal_type not in ('StudentPume',) or\
    164164                           so.portal_type == 'StudentStudyCourse'
    165    
     165
    166166    items.append(row)
    167167info['items'] = items

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

    r1184 r1286  
    2929review_state = info['review_state'] = wf.getInfoFor(student,'review_state',None)
    3030info['returning'] = review_state in  ('returning',
    31                                            'school_fee_pin_entered',
     31                                           'school_fee_paid',
    3232                                           'courses_registered',
    3333                                           'courses_validated',

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

    r1274 r1286  
    1313      </metal:block>
    1414      <metal:block fill-slot="main">
    15         <h3>Pay Your 2005/2006 Schoolfee with Scratchcart!</h3>
     15        <h3>Pay Your 2006/2007 School Fee by Scratch Card!</h3>
    1616        <br />
    1717        <div tal:replace="structure rendered_main" />

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

    r1184 r1286  
    115115  </td></tr>
    116116  </span>
    117   <span tal:condition="python:info['review_state']=='school_fee_pin_entered'">
     117  <span tal:condition="python:info['review_state']=='school_fee_paid'">
    118118  <tr><td class="active">
    119119    <a href="" tal:attributes="href string:${info/url}/student_view">
    … …  
    122122  </td></tr>
    123123  </span>
    124   <span tal:condition="python:info['review_state']!='school_fee_pin_entered'">
     124  <span tal:condition="python:info['review_state']!='school_fee_paid'">
    125125  <tr><td>
    126126    School fee paid

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

    r1259 r1286  
    1818      </span>
    1919      <span tal:condition="allowed" tal:omit-tag="">
    20         <a href="statistics_view"><strong>Student Statistics</strong></a>
     20        <a href="statistics_new_view"><strong>New Student Statistics</strong></a>
     21        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
     22        <a href="statistics_ret_view"><strong>Returning Student Statistics</strong></a>
    2123        <h3> Search Student Section</h3><br />
    2224          You are logged in as member <span tal:replace="info/member|nothing" />
Note: See TracChangeset for help on using the changeset viewer.