Changeset 1174 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

2 Jan 2007, 11:03:16 (18 years ago)

Author:

Henrik Bettermann

Message:

sessional result view and slip added
names imported into application object

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getSessionResults.py (added)
• portlet_student_workflow_display.pt (modified) (1 diff)
• session_results_anon_view.pt (modified) (1 diff)
• session_results_slip.pt (added)
• session_results_view.pt (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_student/portlet_student_workflow_display.pt

@@ -120 +120 @@
   <span tal:condition="python:info['review_state']=='returning'">
   <tr><td class="active">
-    <a href="" tal:attributes="href string:${info/url}/personal_edit_form">
+    <a href="" tal:attributes="href string:${info/url}/session_results_view">
     Returning
     </a>

WAeUP_SRP/trunk/skins/waeup_student/session_results_anon_view.pt

@@ -4 +4 @@
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
-      <div tal:condition="nothing" style="text-align: right">
-        <a href="" target="slip" tal:attributes="href string:session_results_anon_slip?nr=${student/matric_no}"
-           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')">
-          <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
-          Session Result Slip
-        </a>
-      </div>
       <h3>Session Results of <span tal:content="student/Firstname" />
         <span tal:content="student/Middlename" />

WAeUP_SRP/trunk/skins/waeup_student/session_results_view.pt

@@ -1 @@
-<metal:html>
+<metal:html tal:define="info context/getSessionResults">
   <metal:body use-macro="here/main_template/macros/master">
     <metal:main fill-slot="main">
-      <div tal:condition="nothing" style="text-align: right">
-        <a href="" target="slip" tal:attributes="href string:session_results_anon_slip?nr=${student/matric_no}"
+      <div style="text-align: right">
+        <a href="" target="slip" tal:attributes="href string:session_results_slip"
            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')">
           <img tal:attributes="src string:${here/portal_url}/actionicon_print.png" />
-          Session Result Slip
+          Sessional Result Slip
         </a>
       </div>
-      <h3>Session Results of <span tal:content="student/Firstname" />
-        <span tal:content="student/Middlename" />
-        <span tal:content="student/Lastname" />
+      <h3>Session Results of <span tal:content="info/student/Firstname" />
+        <span tal:content="info/student/Middlename" />
+        <span tal:content="info/student/Lastname" />
       </h3>
       <br />
       <table>
         <tr>
-          <td width="180px"><span class="dlabel">Student ID</span>:
-          </td>
+          <th width="180px">Student ID:</th>
           <td> 
-            <span tal:replace="python:here.aq_parent.aq_parent.id" />
+            <span tal:replace="info/s_id" />
           </td>      
         </tr>      
      
         <tr>
-          <th width="150px">Matriculation Number:</th><td tal:content="student/matric_no" />                     
+          <th width="150px">Matriculation Number:</th><td tal:content="info/student/matric_no" />                     
         </tr>
         <tr>
-          <th>Sex:</th><td tal:content="student/Sex" />                     
+          <th>Sex:</th><td tal:content="info/student/Sex" />                     
         </tr>
         <tr>
-          <th>Course of Study:</th><td tal:content="student/Coursemajor" />                     
+          <th>Course of Study:</th><td tal:content="info/student/Coursemajor" />                     
         </tr>
         <tr>
-          <th>Level:</th><td tal:content="student/Level" />                     
+          <th>Level:</th><td tal:content="info/student/Level" />                     
         </tr>
       </table>
@@ -39 +38 @@
        <table>
           <tr>
-            <th width="150px">Verdict:</th><td tal:content="python:results[0][0]['Verdict']" /> 
+            <th width="180px">Verdict:</th><td tal:content="python:info['results'][0][0]['Verdict']" /> 
           </tr>
           <tr>  
-            <th>Session:</th><td tal:content="python:results[0][0]['Session']" /> 
+            <th>Session:</th><td tal:content="python:info['results'][0][0]['Session']" /> 
           </tr>        
        </table>
@@ -49 +48 @@
                      
        <table>
-         <span tal:repeat="semester results">
+         <span tal:repeat="semester info/results">
             <span tal:repeat="result semester">
              <tr tal:condition="repeat/result/start">