Changeset 1338 for WAeUP_SRP/trunk


Ignore:
Timestamp:
21 Jan 2007, 13:52:05 (18 years ago)
Author:
Henrik Bettermann
Message:

payed -> paid
action added
action icon added

Location:
WAeUP_SRP/trunk
Files:
1 added
12 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/actionicons.xml

    r1236 r1338  
    244244              action_id="payments"
    245245              title="My Payments" priority="3"
    246               icon_expr="blank.gif"/>             
     246              icon_expr="blank.gif"/>
    247247 <action-icon category="student_navigation"
    248248              action_id="prospectus" title="Prospectus"
    … …  
    275275              title="Register Courses" priority="5"
    276276              icon_expr="bell.png"/>
     277 <action-icon category="student" action_id="request_transfer"
     278              title="Request Transfer" priority="6"
     279              icon_expr="arrow_switch.png"/>
     280
    277281 <action-icon category="global" action_id="members"
    278282              title="Portal Members" priority="5"

  • WAeUP_SRP/trunk/profiles/default/actions.xml

    r1275 r1338  
    4343     condition_expr="member" url_expr="string:${portal_url}/logout"
    4444     visible="True"/>
     45  <action title="Request Transfer" action_id="request_transfer" category="student"
     46     condition_expr="python: here.getStudentWorkflowInfo()['cr']" url_expr="string:${portal_url}/request_transfer"
     47     visible="True"/>     
    4548 </action-provider>
    4649 <action-provider name="portal_actions">
    … …  
    195198  <action title="My Payments" action_id="payments"
    196199     category="student_navigation" condition_expr="member"
    197      url_expr="string:${portal_url}/campus/students/${here/getStudentId}/payments" visible="True"/>
     200     url_expr="string:${portal_url}/campus/students/${member}/payments" visible="True"/>
    198201  <action title="Register Courses" action_id="register_courses"
    199202     category="student" condition_expr="member"

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

    r1283 r1338  
    2222    return context.REQUEST.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
    2323#student = getattr(students,student_id)
    24 s_brain = context.students_catalog(id = student_id)[0] 
     24s_brain = context.students_catalog(id = student_id)[0]
    2525payments = []
    2626#from Products.zdb import set_trace;set_trace()
    … …  
    3131    if res:
    3232        title = res[0].Title
    33         d['title'] = title or o_id 
     33        d['title'] = title or o_id
    3434    else:
    3535        d['title'] = "no Title"

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

    r1333 r1338  
    1313"""
    1414import logging
    15 logger = logging.getLogger('Student.Clearance.Info')
     15logger = logging.getLogger('Student.Transfer.Info')
    1616from DateTime import DateTime
    1717
    … …  
    4242student = getattr(students_object,student_id)
    4343payments = getattr(student,'payments').objectIds()
    44 info['payed'] = False
     44info['paid'] = False
    4545for payment in payments:
    4646    if payment.startswith('transfer'):
    47         info['payed'] = True
     47        info['paid'] = True
    4848        payments_obj = getattr(student,'payments')
    4949        payment_obj = getattr(payments_obj,payment)
    5050        info['pin'] = payment_obj.getContent().order_id
    5151        break
    52        
     52
    5353
    5454#student = getattr(students_object, student_id)
    … …  
    6464if len(results) > 0:
    6565    for r in results:
    66         taken.append(r) 
     66        taken.append(r)
    6767info['taken'] = taken
    6868
    6969# for testing of transfer forms
    70 info['payed'] = True
    71 info['pin'] = 'CLR-1-0123456789'     
     70info['paid'] = True
     71info['pin'] = 'CLR-1-0123456789'
    7272
    7373

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

    r1336 r1338  
    44
    55             
    6     <span tal:condition="python: not info or not info['payed']">
     6    <span tal:condition="python: not info or not info['paid']">
    77        <metal:block use-macro="here/error_not_found/macros/not_found" />
    88    </span>       
    9     <span tal:condition="python: info['payed']">   
     9    <span tal:condition="python: info['paid']">   
    1010    <h3><center>INTER-FACULTY TRANSFER, 2006/2007 SESSION</center></h3>
    1111    <h3><center>- APPLICATION FORM -</center></h3>

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

    r1333 r1338  
    33              tal:define="info context/getTransferInfo">
    44
    5     <span tal:condition="python: not info or not info['payed']">
     5    <span tal:condition="python: not info or not info['paid']">
    66        <metal:block use-macro="here/error_not_found/macros/not_found" />
    77    </span>               
    8     <span tal:condition="python: info['payed']">                 
     8    <span tal:condition="python: info['paid']">                 
    99
    1010    <center><font color="red"><span tal:content="info/pin"/></font></center>

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

    r1333 r1338  
    33              tal:define="info context/getTransferInfo">
    44
    5     <span tal:condition="python: not info or not info['payed']">
     5    <span tal:condition="python: not info or not info['paid']">
    66        <metal:block use-macro="here/error_not_found/macros/not_found" />
    77    </span>               
    8     <span tal:condition="python: info['payed']">                 
     8    <span tal:condition="python: info['paid']">                 
    99
    1010    <center><font color="red"><span tal:content="info/pin"/></font></center>

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

    r1336 r1338  
    44
    55             
    6     <span tal:condition="python: not info or not info['payed']">
     6    <span tal:condition="python: not info or not info['paid']">
    77        <metal:block use-macro="here/error_not_found/macros/not_found" />
    88    </span>       
    9     <span tal:condition="python: info['payed']">   
     9    <span tal:condition="python: info['paid']">   
    1010    <h3><center>INTER DEPARTMENTAL TRANSFER, 2006/2007 SESSION</center></h3>
    1111    <h3><center>- APPLICATION FORM -</center></h3>

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

    r1336 r1338  
    33              tal:define="info context/getTransferInfo">
    44
    5     <span tal:condition="python: not info or not info['payed']">
     5    <span tal:condition="python: not info or not info['paid']">
    66        <metal:block use-macro="here/error_not_found/macros/not_found" />
    77    </span>               
    8     <span tal:condition="python: info['payed']">                 
     8    <span tal:condition="python: info['paid']">                 
    99
    1010    <center><font color="red"><span tal:content="info/pin"/></font></center>

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

    r1336 r1338  
    33              tal:define="info context/getTransferInfo">
    44
    5     <span tal:condition="python: not info or not info['payed']">
     5    <span tal:condition="python: not info or not info['paid']">
    66        <metal:block use-macro="here/error_not_found/macros/not_found" />
    77    </span>               
    8     <span tal:condition="python: info['payed']">                 
     8    <span tal:condition="python: info['paid']">                 
    99
    1010    <center><font color="red"><span tal:content="info/pin"/></font></center>

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

    r1332 r1338  
    1414import logging
    1515from urllib import urlencode
    16 logger = logging.getLogger('EPayment.')
     16logger = logging.getLogger('Student.Transfer.Request')
    1717import DateTime
    1818lt = context.portal_layouts
    … …  
    2020students = context.portal_url.getPortalObject().campus.students
    2121
    22 student_id = context.getStudentId()
     22mtool = context.portal_membership
     23member = mtool.getAuthenticatedMember()
     24member_id = str(member)
     25requested_id = context.getStudentId()
     26if requested_id and not context.isStaff() and member_id != requested_id:
     27    logger.info('"%s", "accessed application object of", "%s"' % (member_id,requested_id))
     28    student_id = requested_id
     29elif context.isStaff():
     30    student_id = requested_id
     31else:
     32    student_id = member_id
    2333if student_id is None:
    2434    return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
    … …  
    2737sbrain = context.students_catalog(id=student_id)[0]
    2838payments = getattr(student,'payments').objectIds()
    29 payed = False
     39paid = False
    3040for payment in payments:
    3141    if payment.startswith('transfer'):
    32         payed = True
     42        paid = True
    3343        break
    3444
    3545# for testing of transfer forms
    36 payed = True     
    37        
    38 if payed:
     46paid = True
     47
     48if paid:
     49    logger.info('"%s", "opened (paid) request transfer form of", "%s"' % (member_id,student_id))
    3950    return context.request_transfer_form(rendered = None,
    4051                                 psm = None,
    41                                  payed = True,
     52                                 paid = True,
    4253                                 )
    4354
    … …  
    94105return context.request_transfer_form(rendered = None,
    95106                                 psm = None,
    96                                  payed = True,
     107                                 paid = True,
    97108                                 )
    98109

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

    r1332 r1338  
    33                    tal:define="rendered_main options/rendered;
    44                            portal_status_message options/psm;
    5                             payed options/payed|nothing;">
     5                            paid options/paid|nothing;">
    66
    77
    … …  
    1212        </span>         
    1313
    14         <span tal:condition="payed">
     14        <span tal:condition="paid">
    1515          <h3>Print Your Transfer Form!</h3>
    1616          <br />
Note: See TracChangeset for help on using the changeset viewer.