Ignore:
Timestamp:
5 Jul 2007, 11:14:12 (18 years ago)
Author:
joachim
Message:

merged r1979:r1987 from trunk

Location:
WAeUP_SRP/branches/joachim-azax-branch/skins
Files:
14 edited
1 copied

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/academicsParent.py

    r486 r1988  
    1212    obj=context
    1313
     14
    1415parent=obj.aq_parent
    1516

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/academics_index.py

    r937 r1988  
    1212return the appropriate page in the academics section
    1313"""
     14try:
     15    from Products.zdb import set_trace
     16except:
     17    def set_trace():
     18        pass
    1419
    1520request = context.REQUEST

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getCertificatesInfo.py

    r913 r1988  
    1212return Info about the Faculties
    1313"""
     14try:
     15    from Products.zdb import set_trace
     16except:
     17    def set_trace():
     18        pass
    1419request = context.REQUEST
    1520
    … …  
    1924
    2025info = {}
    21 #dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
    22 dep_id = context.aq_parent.getId()
     26dep_id = path_info[-2]
     27#set_trace()
    2328info['action'] = "%s" % context.absolute_url()
    2429info['choosen_ids'] = request.get('ids',[])
    2530info['doc'] = context.getContent()
    26 res = context.portal_catalog(meta_type="Department",id = dep_id)
     31#res = context.portal_catalog(meta_type="Department",id = dep_id)
    2732info['courses'] = []
    28 if not res:
    29     return info
    30 brain = res[-1]
    31 cp = brain.getPath()
     33# if not res:
     34#     return info
     35# brain = res[-1]
     36# cp = brain.getPath()
     37cp = '/'.join(path_info[:-2])
    3238info['container_path'] = cp
    3339info['dep_id'] = dep_id

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getCoursesCertificatesInfo.py

    r1434 r1988  
    1515
    1616wf = context.portal_workflow
    17 path_info = request.get('PATH_INFO').split('/')
    1817
    1918info = {}
    … …  
    2120info['choosen_ids'] = request.get('ids',[])
    2221info['doc'] = context.getContent()
    23 brain = context.portal_catalog(meta_type="Department", id = context.getId())[-1]
    24 cp = brain.getPath()
     22# brain = context.portal_catalog(meta_type="Department", id = context.getId())[-1]
     23# cp = brain.getPath()
     24cp = request.get('PATH_INFO')
    2525info['container_path'] = cp
    26 #res = context.portal_catalog(container_path="%s/courses" % cp)
    27 #items = []
    28 #for r in res:
    29 #    row = {}
    30 #    ro = r.getObject()
    31 #    rd = ro.getContent()
    32 #    row['id'] = r.getId
    33 #    row['title'] = rd.Title()
    34 #    row['url'] = ro.absolute_url()
    35 #    items.append(row)
    36 #info['courses'] = items
    3726res = context.portal_catalog(container_path="%s/certificates" % cp)
    3827items = []

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getCoursesInfo.py

    r1366 r1988  
    2828
    2929info = {}
    30 #dep_id = request.get('PATH_TRANSLATED').split('/')[-2]
    31 dep_id = context.aq_parent.getId()
     30dep_id = path_info[-2]
     31#dep_id = context.aq_parent.getId()
    3232info['action'] = "%s" % context.absolute_url()
    3333info['choosen_ids'] = request.get('ids',[])
    3434info['doc'] = context.getContent()
    35 res = context.portal_catalog(meta_type="Department",id = dep_id)
    36 info['courses'] = []
    37 if not res:
    38     return info
    39 brain = res[-1]
    40 cp = brain.getPath()
     35# res = context.portal_catalog(meta_type="Department",id = dep_id)
     36# info['courses'] = []
     37# if not res:
     38#     return info
     39# brain = res[-1]
     40# cp = brain.getPath()
     41cp = '/'.join(path_info[:-2])
    4142info['container_path'] = cp
    4243info['dep_id'] = dep_id

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getDepartmentsInfo.py

    r913 r1988  
    1212return Info about the Faculties
    1313"""
     14try:
     15    from Products.zdb import set_trace
     16except:
     17    def set_trace():
     18        pass
    1419request = context.REQUEST
    1520
    … …  
    1722mtool = context.portal_membership
    1823member = mtool.getAuthenticatedMember()
    19 path_info = request.get('PATH_INFO').split('/')
     24#path_info = request.get('PATH_INFO').split('/')
    2025
    2126info = {}
    … …  
    2631items = []
    2732info['doc'] = context.getContent()
    28 brain = context.portal_catalog(meta_type="Faculty", id = context.getId())[-1]
    29 cp = brain.getPath()
     33# set_trace()
     34# brain = context.portal_catalog(portal_type="Faculty", id = context.getId())[-1]
     35# cp = brain.getPath()
     36cp = request.get('PATH_INFO')
    3037info['container_path'] = cp
    3138res = context.portal_catalog(container_path=cp)

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_academics/getDocumentInfo.py

    r1783 r1988  
    1010# $Id:getDocumentInfo.py 486 2006-09-06 10:09:39Z joachim $
    1111"""
    12 return Info about the Faculties
     12return Info about the Documents
    1313"""
    14 request = context.REQUEST
    15 
    16 wf = context.portal_workflow
    17 path_info = request.get('PATH_INFO').split('/')
    1814
    1915info = {}

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_default/sessions_voc.py

    r1758 r1988  
    66"""
    77if key is None:
    8     l = [('xx','unknown')]
     8    # not used for WAeUPSessionWidget, only for SelectWidget
     9    l = [('-1','N/A')]
    910    for y in range(1998,2008):
    1011        l.append( ('%s' % str(y)[-2:],'%4d/%4d' % (y,y+1)))
    … …  
    1415    y = int(key)
    1516except:
    16     return 'unknown'
     17    return 'N/A'
     18if y == -1:
     19    return 'N/A'
    1720if y < 90:
    1821    cent = 2000

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_default/waeup_edit.py

    r1855 r1988  
    1919import logging
    2020logger = logging.getLogger('Skins.waeup_edit')
     21try:
     22    from Products.zdb import set_trace
     23except:
     24    def set_trace():
     25        pass
    2126
    2227mtool = context.portal_membership

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_design/main_template.pt

    r1922 r1988  
    33  emptybody emptybody|request/emptybody|nothing;
    44  mtool here/portal_membership;
    5  
    65  utool nocall:here/portal_url;
    76  atool here/portal_actions;
    … …  
    3938          <metal:block define-slot="base">
    4039            <base href=""
    41                   tal:attributes="href string:${here_url}/" />
     40                  tal:attributes="href string:${context/get_proxy_url}" />
    4241          </metal:block>
    4342        </metal:block>

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/create_level.py

    r1856 r1988  
    3434current_level = student.level
    3535in_progress =  request.get('in_progress','not started')
    36 level_created =  request.get('level_created','xxx')
     36#level_created =  request.get('level_created','xxx')
    3737create_level =  request.get('create_level',None)
    3838
    … …  
    7171    l = []
    7272    carry_overs = results
    73    
     73
    7474    # carry_overs for probation students: yes or not, that is the question
    7575    #if student.verdict == "C": # on probation

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/external_study_level_view.pt

    r1737 r1988  
    1 <metal:html>
    2   <metal:body use-macro="here/slip_template/macros/master">
    3     <metal:block fill-slot="header"
    4                  tal:define="global info context/getStudyLevelInfo;
    5                  global is_so context/isSectionOfficer;
    6                  global is_ca info/is_ca;
    7                  global show_check_boxes info/show_check_boxes;
    8                              global is_student info/is_student;
    9                              global status_info info/status_info;
    10                              global review_state info/review_state;
    11                              global view_only info/view_only">
    12               <div style="text-align: right"
    13              tal:condition="python:review_state == 'courses_validated'">
    14         <a href="" target="slip" tal:attributes="href string:course_registration_slip"
    15             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')">
    16             <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
    17             Course Registration Slip
    18         </a>
    19        
    20         </div>
     1<metal:body use-macro="here/slip_template/macros/master">
     2  <metal:main fill-slot="main"
     3          tal:define="info context/getStudyLevelInfo;">
     4             
     5    <span tal:condition="not: info">
     6      <span tal:content="here/illegal_view" />
     7    </span>
     8    <span tal:condition="info">
     9    <span tal:define= "is_so context/isSectionOfficer;
     10                       is_ca info/is_ca;
     11                       show_check_boxes info/show_check_boxes;
     12                       is_student info/is_student;
     13                       status_info info/status_info;
     14                       review_state info/review_state;
     15                       view_only info/view_only">       
     16
     17    <div style="text-align: right"
     18         tal:condition="python:review_state in ('courses_registered','courses_validated',)">
     19    <a href="" target="slip" tal:attributes="href string:course_registration_slip"
     20        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')">
     21        <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
     22        Course Registration Slip
     23    </a>
     24    </div>
     25
    2126
    2227      <h3>
    … …  
    2732      </h3>
    2833
    29     </metal:block>
    30     <metal:main fill-slot="main" tal:condition="python:1">
    3134      <form action="." method="post" class="group">
    3235        <span tal:condition="info/carry_overs" tal:omit-tag="">
    … …  
    4649            </td>
    4750            <td width="78%" tal:content="row/title"></td>
    48             <td align="center" width="10%" tal:content="row/code"></td>
    49             <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    50             <td align="center" width="2%" tal:content="row/credits"></td>
    51             <td align="center" width="8%" tal:content="row/grade|string:"></td>
     51            <td width="10%" tal:content="row/code"></td>
     52            <td width="2%">S<span tal:content="row/semester" /></td>
     53            <td width="2%" tal:content="row/credits"></td>
     54            <td width="8%" tal:content="row/grade|string:"></td>
    5255          </tr>
    5356        </table>
    … …  
    7376            </td>
    7477            <td width="78%" tal:content="row/title"></td>
    75             <td align="center" width="10%" tal:content="row/code"></td>
    76             <td align="center" width="2%">S<span tal:content="row/semester" /></td>
    77             <td align="center" width="2%" tal:content="row/credits"></td>
    78             <td align="center" width="8%" tal:content="row/coe|nothing"></td>
     78            <td width="10%" tal:content="row/code"></td>
     79            <td width="2%">S<span tal:content="row/semester" /></td>
     80            <td width="2%" tal:content="row/credits"></td>
     81            <td width="8%" tal:content="row/coe|nothing"></td>
    7982          </tr>
    8083          <tr>
    … …  
    196199        </table>
    197200        </form>         
    198     </metal:main>
    199   </metal:body>
    200 </metal:html>
     201  </span>
     202  </span>         
     203  </metal:main>
     204</metal:body>
    201205 

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/layout_clearance_view.pt

    r1837 r1988  
    2222            <tr>                         
    2323            <tal:block condition="widget/label">
    24             <td width="180px">
     24            <td width="180px" valign="top">
    2525              <span i18n:translate="" tal:condition="widget/is_i18n">
    2626                  <span tal:content="widget/label" />:</span>

  • WAeUP_SRP/branches/joachim-azax-branch/skins/waeup_student/student_view.pt

    r1795 r1988  
    11<metal:body use-macro="here/main_template/macros/master">
    22    <metal:main fill-slot="main"
    3            tal:define="info context/getStudentFolderInfo;">
     3           tal:define="info context/getStudentFolderInfo;
     4                       baseinfo context/getStudentBaseInfo">
    45      <metal:block tal:condition="not: info">
    56        <span tal:content="here/illegal_view" />
    … …  
    1920        <h3 tal:content="info/name" />
    2021        <br />
    21 
    22         <table tal:condition="is_staff" class="contentListing" width="100%" summary="content layout" id="folder_content">     
    23           <tr tal:repeat="row rows"
    24             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
    25             <td><a href="view" tal:attributes="href string:${row/url}">
    26               <strong tal:content="row/title" /></a> </td>
    27             <td>
    28             <a tal:condition="python: row['is_editable'] and not row['type'] in ('StudentClearance','StudentAccommodation',)"
    29                 href="edit" tal:attributes="href string:${row/url}/external_edit_form"
    30                 target="edit"
    31                 onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
    32                 [edit]
    33             </a>
    34             <a tal:condition="python: row['is_editable'] and row['type']=='StudentClearance'"
    35                 href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
    36                 target="edit"
    37                 onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
    38                 [edit and change state]
    39             </a> 
    40             <a tal:condition="python: context.isClearanceOfficer() and row['type']=='StudentClearance'"
    41                 href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
    42                 target="edit"
    43                 onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
    44                 [change state]
    45             </a>                           
    46             </td>
    47            
    48           </tr>
    49           <tr tal:condition="info/session">
    50             <td>
    51                 <a href="edit" tal:attributes="href string:session_results_view">
    52                 <strong>Session Results</strong>
    53             </a>             
    54             </td>
    55             <td>
    56                &nbsp;
    57             </td>
    58           </tr>
    59         </table>
    6022       
    61                  
    62          <span tal:condition="python:info['member'].id in
    63                              ('admin','joachim','kehindesamuel','med','isouaba','obadejo',
    64                               'ehioaiks','despej','shinakale','igadoghe','benamechi','edafeohwo')">
    65          <br />
    66          <form action="mail_password_form" method="post" class="group">
    67             <input type="submit" class="context" value="Send Email with Authentication Data" />
    68          </form>
    69          </span>
     23       
     24       
     25      <table>
     26        <tr>
     27          <td width="220px">Registration Number:</td>
     28          <td><span tal:content="baseinfo/student/jamb_reg_no" /></td>
     29        </tr>
     30        <tr>
     31          <td>Matriculation Number:</td>
     32          <td><span tal:content="baseinfo/student/matric_no" /></td>
     33        </tr>     
     34        <tr>
     35          <td>Certificate Code:</td>
     36          <td><span tal:content="baseinfo/student/course" /></td>
     37        </tr>
     38        <tr>
     39          <td>Faculty Id:</td>
     40          <td tal:content="baseinfo/student/faculty" />
     41        </tr>
     42        <tr>
     43          <td>Department Id:</td>
     44          <td><span tal:content="baseinfo/student/department" /></td>
     45        </tr>
     46        <tr>
     47          <td>Current Session:</td>
     48          <td><span tal:content="python:context.portal_vocabularies.sessions.get(baseinfo['student']['session'])" /></td>
     49        </tr>
     50        <tr>
     51          <td>Current Study Level:</td>
     52          <td><span tal:content="python:context.portal_vocabularies.courselevel.get(baseinfo['student']['level'])" /></td>
     53        </tr>
     54        <tr>
     55          <td>Current Study Mode:</td>
     56          <td><span tal:content="python:context.portal_vocabularies.entry_modes.get(baseinfo['student']['mode'])" /></td>
     57        </tr>       
     58        <tr tal:define="verdict python:context.portal_vocabularies.verdicts.get(baseinfo['student']['verdict'])">
     59          <td>Current Verdict:</td>
     60          <td><span tal:condition="verdict" tal:content="python:verdict.upper()" /></td>
     61        </tr>
     62      </table>           
     63       
     64      <br />
     65     
     66      <table tal:condition="is_staff" class="contentListing" width="100%" summary="content layout" id="folder_content">     
     67        <tr tal:repeat="row rows"
     68          tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
     69          <td><a href="view" tal:attributes="href string:${row/url}">
     70            <strong tal:content="row/title" /></a> </td>
     71          <td>
     72          <a tal:condition="python: row['is_editable'] and not row['type'] in ('StudentClearance','StudentAccommodation','PaymentsFolder')"
     73              href="edit" tal:attributes="href string:${row/url}/external_edit_form"
     74              target="edit"
     75              onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
     76              [edit]
     77          </a>
     78          <a tal:condition="python: row['is_editable'] and row['type']=='StudentClearance'"
     79              href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
     80              target="edit"
     81              onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
     82              [edit and change state]
     83          </a> 
     84          <a tal:condition="python: context.isClearanceOfficer() and row['type']=='StudentClearance'"
     85              href="edit" tal:attributes="href string:${row/url}/external_clearance_edit_form"
     86              target="edit"
     87              onclick="javascript:window.open('','edit','width=600, height=700, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
     88              [change state]
     89          </a>                           
     90          </td>
     91         
     92        </tr>
     93        <tr tal:condition="info/session">
     94          <td>
     95              <a href="edit" tal:attributes="href string:session_results_view">
     96              <strong>Session Results</strong>
     97          </a>             
     98          </td>
     99          <td>
     100             &nbsp;
     101          </td>
     102        </tr>
     103      </table>
     104     
     105               
     106      <span tal:condition="python:info['member'].id in
     107                         ('admin','joachim','kehindesamuel','med','isouaba','obadejo',
     108                          'ehioaiks','despej','shinakale','igadoghe','benamechi','edafeohwo')">
     109      <br />
     110      <form action="mail_password_form" method="post" class="group">
     111         <input type="submit" class="context" value="Send Email with Authentication Data" />
     112      </form>
     113      </span>
    70114
    71115
    72        
     116     
    73117
    74     <table tal:condition="is_student" class="contentListing" width="" summary="content layout" id="folder_content">     
    75       <span tal:repeat="row rows">
    76         <tr tal:condition="row/display">
    77           <td><a href="view" tal:condition="row/s_view_link"
    78                  tal:attributes="href string:${row/s_view_link}">
    79               <strong tal:content="row/title" /></a>
    80            <strong tal:condition="not:row/s_view_link" tal:content="row/title" />
     118      <table tal:condition="is_student" class="contentListing" width="" summary="content layout" id="folder_content">     
     119        <span tal:repeat="row rows">
     120          <tr tal:condition="row/display">
     121            <td width="220px"><a href="view" tal:condition="row/s_view_link"
     122                   tal:attributes="href string:${row/s_view_link}">
     123                <strong tal:content="row/title" /></a>
     124             <strong tal:condition="not:row/s_view_link" tal:content="row/title" />
     125            </td>
     126 
     127            <td align="left">
     128                <span tal:content="row/review_state" />
     129            </td>         
     130           
     131            <td width="40px" align="center">
     132              <a tal:condition="python: row['s_edit_link'] and row['is_editable']"
     133                 href="edit" tal:attributes="href string:${row/s_edit_link}">
     134                [edit]
     135              </a>     
     136            </td>                 
     137           
     138 
     139          </tr>
     140        </span>
     141        <tr tal:condition="info/session">
     142          <td>
     143              <a href="edit" tal:attributes="href string:session_results_view">
     144              <strong>Session Results</strong>
     145          </a>             
    81146          </td>
    82 
    83           <td width="80px" align="center">
    84             <a tal:condition="python: row['s_edit_link'] and row['is_editable']"
    85                href="edit" tal:attributes="href string:${row/s_edit_link}">
    86               [edit]
    87             </a>     
    88           </td>                 
    89          
    90           <td width="100px" align="left">
    91               <span tal:content="row/review_state" />
     147          <td>
     148             &nbsp;
    92149          </td>
    93150        </tr>
    94       </span>
    95       <tr tal:condition="info/session">
    96         <td>
    97             <a href="edit" tal:attributes="href string:session_results_view">
    98             <strong>Session Results</strong>
    99         </a>             
    100         </td>
    101         <td>
    102            &nbsp;
    103         </td>
    104       </tr>
    105     </table>
     151      </table>
    106152       
    107153    </metal:block>
Note: See TracChangeset for help on using the changeset viewer.