Changeset 1575 for WAeUP_SRP/trunk


Ignore:
Timestamp:
18 Mar 2007, 12:53:54 (18 years ago)
Author:
Henrik Bettermann
Message:

ticket 106 and 124

Location:
WAeUP_SRP/trunk/skins/waeup_student
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed

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

    r1571 r1575  
    122122        action = "/contact_student_form"
    123123        psm = "Student's clearance request has been rejected! Please fill and submit the form below!"
     124        subject = "Clearance request rejected"
     125        args['subject'] = subject
     126        args['continue'] = 'external_clearance_edit_form'
    124127else:
    125128    psm = "Please correct your errors!"
    … …  
    128131args['portal_status_message'] = psm
    129132url = clear.absolute_url() + action + '?' + urlencode(args)
    130 REQUEST.RESPONSE.redirect(url)
     133return REQUEST.RESPONSE.redirect(url)
    131134

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

    r1156 r1575  
    1 <metal:html tal:define="info context/getClearanceInfo">
    2   <metal:body use-macro="here/main_template/macros/master">
    3     <metal:main fill-slot="main">
     1<metal:body use-macro="here/main_template/macros/master">
     2    <metal:main fill-slot="main"
     3                 tal:define="info context/getClearanceInfo">
    44      <span tal:condition="not: info">
    55        <span tal:content="here/illegal_view" />
    … …  
    6666      </span>
    6767    </metal:main>
    68   </metal:body>
    69 </metal:html>
     68</metal:body>

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

    r1455 r1575  
     1<metal:block define-macro="contact_student_form">
    12<metal:body use-macro="here/main_template/macros/master">
    23    <metal:main fill-slot="main"
    34                tal:define="member python:context.portal_membership.getAuthenticatedMember();
    45                        info context/getStudentBaseInfo;
     6                        subject python:context.REQUEST.get('subject');
     7                        continue python:context.REQUEST.get('continue')
    58                        ">
    69      <span tal:condition="not: info">
    … …  
    811      </span>                       
    912   
    10       <span tal:condition="info">
     13      <span tal:condition="python: info and subject">
    1114      <h3>Contact Student</h3>
    1215      <br />
    … …  
    2326      <input type="hidden" name="student_email" type="text" id="student_email"
    2427             tal:attributes="value info/student/email"/>                   
    25 
     28      <input type="hidden" name="probtype" type="text" id="probtype"
     29             tal:attributes="value subject"/>     
     30             
    2631      <table width="100%" border="0" cellspacing="5" cellpadding="0">
    2732        <tr>
    … …  
    4247        </tr>
    4348        <tr>
    44           <td>
    45              <strong>Type of Rejection: </strong>
     49          <td valign="top">
     50             <strong>Reason of Notification: </strong>
    4651          </td>
    47           <td>
    48               <select name="probtype" class="boxgreen" id="probtype">
    49                 <option>Clearance request rejected</option>
    50               </select>       
     52          <td valign="bottom">
     53             <span tal:content="subject" />
    5154          </td>
    5255        </tr>       
    … …  
    6770      </span>
    6871      <form action="." method="post" class="group">
    69             <input type="submit" name="external_clearance_edit_form:method"
     72            <input type="submit" name="."
     73                       tal:attributes="name string:${continue}:method"
    7074                       class="context" value="Continue" />
    7175      </form>     
    … …  
    7377    </metal:main>
    7478</metal:body>
     79</metal:block>

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

    r1516 r1575  
    1 <metal:html tal:define="info context/getStudyLevelInfo;
     1<metal:body use-macro="here/main_template/macros/master">
     2    <metal:main fill-slot="main"
     3                tal:define="info context/getStudyLevelInfo;
    24                  is_so context/isSectionOfficer;
    35                  is_ca info/is_ca;
    46                  show_check_boxes info/show_check_boxes;
    5                   is_student info/is_student;
    6                   status_info info/status_info;
    7                   review_state info/review_state;
    8                   view_only info/view_only">
    9   <metal:body use-macro="here/main_template/macros/master">
    10     <metal:main fill-slot="main">
     7                  validated python:context.getStudentReviewState() in ('courses_validated',);
     8                              is_student info/is_student;
     9                          status_info info/status_info;
     10                          review_state info/review_state;
     11                          view_only info/view_only">
    1112      <span tal:condition="not: info">
    1213        <span tal:content="here/illegal_view" />
    … …  
    1415      <span tal:condition="info">
    1516      <h3>Course Registration Slip</h3>
     17     
    1618      <br />
    17       <table width="" cellpadding="2" cellspacing="0">
     19     
     20      <div tal:condition="validated">
     21        - validated by Course Adviser -
     22      </div>
     23      <div tal:condition="not: validated">
     24        - not yet validated by Course Adviser -
     25      </div>
     26     
     27      <br />
     28      <span tal:omit-tag=""
     29            tal:content="structure python: info['app_doc'].render(proxy=info['app_doc'],
     30            layout_mode='view_info',
     31            layout_id='student_application_fe')"
     32            />           
     33
     34      <table  cellpadding="2" cellspacing="0">
    1835          <tr>
    19             <td valign="top"><span class="dlabel">Name</span>:
    20             </td>
    21             <td>
    22               <span tal:content="info/student/name" />
    23             </td>     
    24           </tr>
    25           <tr>
    26             <td valign="top"><span class="dlabel">Student Id</span>:
    27             </td>
    28             <td>
    29               <span tal:content="info/student/id" />
    30             </td>     
    31           </tr>
    32           <tr>
    33             <td valign="top"><span class="dlabel">Matriculation No</span>:
     36            <td valign="top" width="180px"><span class="dlabel">Matriculation No</span>:
    3437            </td>
    3538            <td>
    … …  
    111114       </span>             
    112115    </metal:main>
    113   </metal:body>
    114 </metal:html>
     116</metal:body>
    115117 

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

    r1515 r1575  
    108108normal.sort(cmp_semester)
    109109info['normal'] = normal
     110
     111students_object = context.portal_url.getPortalObject().campus.students
     112student = getattr(students_object, student_id)
     113info['app'] = student.application
     114info['app_doc'] = student.application.getContent()
     115
    110116return info

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

    r909 r1575  
    3737     co_name,
    3838     co_email,
    39      student_email, 
     39     student_email,
    4040     co_email,
    4141     'henrik@waeup.org',

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

    r1571 r1575  
    55##bind script=script
    66##bind subpath=traverse_subpath
    7 ##parameters=student=None
     7##parameters=REQUEST, student=None
    88##title=
    99##
    … …  
    1717    def set_trace():
    1818        pass
    19 
     19from urllib import urlencode
    2020request = context.REQUEST
    2121mtool = context.portal_membership
    … …  
    3232wftool.doActionFor(student,'reject_courses')
    3333logger.info('%s rejected course list of %s' % (member,student.getId()))
    34 return request.RESPONSE.redirect("%s" % context.absolute_url())
     34
     35args = {}
     36action = "/contact_student_form_2"
     37psm = "Student's course list has been rejected! Please fill and submit the form below!"
     38subject = "Course list rejected"
     39args['subject'] = subject
     40args['continue'] = 'study_level_view'
     41args['portal_status_message'] = psm
     42url = context.absolute_url() + action + '?' + urlencode(args)
     43return REQUEST.RESPONSE.redirect(url)
     44
     45#return request.RESPONSE.redirect("%s" % context.absolute_url())

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

    r1571 r1575  
    2929student = getattr(students_folder,context.getStudentId())
    3030wftool.doActionFor(student,'validate_courses')
    31 logger.info('%s validated course list for %s' % (member,student.getId()))
    32 return request.RESPONSE.redirect("%s" % context.absolute_url())
     31logger.info('%s validated course list of %s' % (member,student.getId()))       
     32
     33psm = 'portal_status_message=Course list validated!'
     34url = context.absolute_url() +  '?' + psm
     35return request.RESPONSE.redirect(url)
     36
     37
Note: See TracChangeset for help on using the changeset viewer.