Ignore:
Timestamp:
4 Apr 2007, 06:31:52 (18 years ago)
Author:
joachim
Message:

merged up to 1664

Location:
WAeUP_SRP/branches/joachim-event-branch/skins
Files:
13 edited
7 copied

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_academics/getCertificateInfo.py

    r913 r1669  
    1212return Info about a Certificate
    1313"""
     14def cmp_id(a,b):
     15    s1 = "%(id)s" % a
     16    s2 = "%(id)s" % b
     17    if s1 == s2:
     18        return 0
     19    if s1 > s2:
     20        return 1
     21    return -1
     22
    1423request = context.REQUEST
    1524
    … …  
    1827
    1928info = {}
    20 info['action'] = "%s" % context.campus.absolute_url()
     29info['action'] = "%s" % context.absolute_url()
    2130info['choosen_ids'] = request.get('ids',[])
    2231info['doc'] = context.getContent()
    … …  
    3342    row['url'] = l.absolute_url()
    3443    items.append(row)
     44items.sort(cmp_id)
    3545info['items'] = items
    3646return info

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_academics/getLevelInfo.py

    r1514 r1669  
    1616wf = context.portal_workflow
    1717mtool = context.portal_membership
     18academics_path = "%s/campus/academics" % context.portal_url()
    1819path_info = request.get('PATH_INFO').split('/')
    1920try:
    … …  
    4445    ro = r.getObject()
    4546    rd = ro.getContent()
    46     row['id'] = r.getId
     47    course_id = row['id'] = r.getId
    4748    row['title'] = rd.Title()
    4849    row['core'] = rd.core_or_elective
    … …  
    5051    row['url'] = ro.absolute_url()
    5152    row['review_state'] = wf.getInfoFor(ro,'review_state','None')
    52     row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
     53    editable = row['is_editable'] = mtool.checkPermission('Modify portal content', ro)
     54    if editable:
     55        course_res = context.courses_catalog(code=course_id)
     56        if course_res:
     57            rc = course_res[0]
     58            row['real_course_path'] = "%s/%s/%s/courses/%s" % (academics_path,rc.faculty,rc.department,course_id)
    5359    if rd.semester == 'first':
    5460        first.append(row)

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_academics/level_view.pt

    r1511 r1669  
    4848                    [edit]
    4949                    </a>
     50                <a tal:condition="row/real_course_path|nothing"
     51                   href="edit" tal:attributes="href string:${row/real_course_path}">
     52                    [goto course]
     53                    </a>
    5054                </td>
    5155              </tr>

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_default/mail2admin.py

    r976 r1669  
    3737     email,
    3838     'kehindesamuel@waeup.org',
    39      'henrik@waeup.org',
     39     'waeup@saoas.org',
    4040#    'js@aixtraware.de',
    4141     email,

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_epayment/payment_receipt.pt

    r1427 r1669  
    88      <span tal:condition="info">
    99     
    10         <metal:block tal:condition="python:info_doc['doc'].resp_code in ('00','AP',)">           
     10        <metal:block tal:condition="python:info_doc['doc'].resp_code in ('00','AP','IP')">           
    1111        <h3>Online Payment Receipt</h3>
    1212        <br />
    … …  
    106106        </metal:block>
    107107       
    108         <metal:block tal:condition="python:info_doc['doc'].resp_code not in ('SC','00','AP','')">           
     108        <metal:block tal:condition="python:info_doc['doc'].resp_code not in ('SC','00','AP','IP','')">           
    109109        <h3>Response from Bank: "<span tal:content="python:info_doc['doc'].resp_desc" />"</h3>
    110110        <br />       

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_epayment/payments_view.pt

    r1431 r1669  
    3434            </td>
    3535            <td>
    36             <a tal:condition="python:row['is_approvable']"
     36            <a tal:condition="row/is_approvable"
    3737               tal:attributes="href string:${context/absolute_url}/${row/id}/approve_epayment;
    3838                               onclick python:'return window.confirm(\'%s\')' %(cpsmcat('Are you sure? You will not be able to undo the approval.'), );
    3939                               ">
    4040                [approve payment]
     41            </a>             
     42            </td>
     43            <td tal:condition="nothing">
     44            <a tal:condition="row/is_requeryable"
     45               tal:attributes="href string:${context/absolute_url}/${row/id}/requery_payment;
     46                               onclick python:'return window.confirm(\'%s\')' %(cpsmcat('Are you sure? You will not be able to undo the approval.'), );
     47                               ">
     48                [requery payment]
    4149            </a>             
    4250            </td>
    … …  
    5361                value="Initiate School Fee Online Payment"
    5462                />
     63               
     64
     65
     66               
    5567        </form> 
    5668

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/change_password.py

    r1596 r1669  
    44
    55"""
     6
     7return
     8
     9
     10
     11
     12
     13
     14
     15
    616request = context.REQUEST
    717import DateTime,logging

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/clearance_edit.py

    r1596 r1669  
    120120        wftool.doActionFor(info['clear'],'open')
    121121        wftool.doActionFor(info['student'],'reject_clearance')
    122         action = "/contact_student_form"
     122        action = "/external_contact_student_form"
    123123        psm = "Student's clearance request has been rejected! Please fill and submit the form below!"
    124124        subject = "Clearance request rejected"

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/getSessionResults.py

    r1596 r1669  
    101101#set_trace()
    102102verdict_voc = context.portal_vocabularies.verdicts
    103 verdict_code = student_from_cat.get('verdict',None)
     103verdict_code = student_from_cat.verdict
    104104if verdict_code:
    105105    info['verdict'] = verdict = verdict_voc.get(verdict_code,'N/A').upper()

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/getStudyLevelInfo.py

    r1596 r1669  
    4040    return 0.0
    4141
    42 def cmp_semester(a,b):
    43     if a['semester'] == b['semester']:
     42def cmp_semester_id(a,b):
     43    s1 = "%(semester)s%(id)s" % a
     44    s2 = "%(semester)s%(id)s" % b
     45    if s1 == s2:
    4446        return 0
    45     if a['semester'] > b['semester']:
     47    if s1 > s2:
    4648        return 1
    4749    return -1
    … …  
    104106        normal.append(d)
    105107info['credits_total'] = credits_total
    106 carry_overs.sort(cmp_semester)
     108carry_overs.sort(cmp_semester_id)
    107109info['carry_overs'] = carry_overs
    108 normal.sort(cmp_semester)
     110normal.sort(cmp_semester_id)
    109111info['normal'] = normal
    110112

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/layout_personal_view.pt

    r1201 r1669  
    99      <td><span class="dlabel">Student ID</span>:
    1010      </td>
    11       <td tal:condition="nothing">
     11      <td>
    1212         <span tal:replace="context/getStudentId" />
    1313      </td>     

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/statistics_new_view.pt

    r1532 r1669  
    3333            <th align="right">CR</th>
    3434            <th align="right">VC</th>
    35             <th align="right">SFP</th>
     35            <th align="right">SFP+</th>
    3636          </tr>
    3737          <tr tal:repeat="d departments"
    … …  
    7474        <tr><td>CR: </td> <td>Clearance requested</td></tr>
    7575        <tr><td>VC: </td> <td>Validated and cleared</td></tr>
    76         <tr><td>SFP: </td> <td>School fee paid</td></tr>
     76        <tr><td>SFP+: </td> <td>School fee paid and further</td></tr>
    7777        </table>
    7878      </span>

  • WAeUP_SRP/branches/joachim-event-branch/skins/waeup_student/study_course_view.pt

    r1518 r1669  
    5858        </table>       
    5959     
    60       <form action="" method="post" class="group"
     60      <form action="" method="post" class="group" onsubmit="return submit_once()"
    6161            tal:attributes="action info/action"
    6262            tal:define="rows python: info['items'];"
    … …  
    6666            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    6767            <td align="left" valign="middle" style="width: 5px;"
    68                 tal:condition="python: 0 and is_so">
     68                tal:condition="python:is_so">
    6969              <input type="checkbox" name="ids:list" value="" id="" class="noborder"
    7070                     tal:condition="is_so"
    … …  
    8484               summary="contents of the folder"
    8585               class="folderButtons">
    86           <tr>
     86          <tr tal:condition="python: is_so and info['items']">
    8787            <td align="left" valign="top" rowspan="3"></td>
    8888            <td align="left" valign="top">
    89               <span tal:condition="python:0 and is_so">
    90                 <input type="button" value="button_select_all" class="context"
     89              <input type="button" value="button_select_all" class="context"
    9190                       onclick="someJavaScriptFunctionThatWillBeReplaced"
    9291                       i18n:attributes="value"
    … …  
    9493                       % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
    9594                       />
    96                 <input type="submit" name="folder_delete:method" value="button_delete"
    97                        class="destructive" i18n:attributes="value"
    98                        tal:attributes="onclick python:'return window.confirm(\'%s\')' %
    99                        (cpsmcat('description_confirm_delete'), )"
    100                        />
    101               </span>
     95              <input type="submit" name="folder_delete:method" value="button_delete"
     96                     class="destructive" i18n:attributes="value"
     97                     tal:attributes="onclick python:'return window.confirm(\'%s\')' %
     98                     (cpsmcat('description_confirm_delete'), )"
     99                     />
    102100            </td>
    103101          </tr>
    104102        </table>
    105103      </form>
    106       <form action="" method="post" class="group"
     104      <form action="" method="post" class="group" onsubmit="return submit_once()"
    107105            tal:attributes="action string:${context/absolute_url}/create_level"
    108106            tal:define="rows python: info['items'];"
Note: See TracChangeset for help on using the changeset viewer.