Changeset 1861 for WAeUP_SRP/trunk/skins/waeup_student

Timestamp:

7 Jun 2007, 20:33:13 (17 years ago)

Author:

Henrik Bettermann

Message:

ticket #200
ticket #243

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• course_edit.py (added)
• course_edit_form.pt (added)
• course_registration_slip.pt (modified) (3 diffs)
• getCourseResultInfo.py (added)
• layout_application_edit.pt (modified) (1 diff)
• layout_application_view_info.pt (modified) (3 diffs)
• layout_application_view_slip.pt (modified) (1 diff)
• layout_personal_edit.pt (modified) (1 diff)
• study_level_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/course_registration_slip.pt

@@ -51 +51 @@
           </tr>
           <tr>
-            <td valign="top"><span class="dlabel">Course Id</span>:
+            <td valign="top"><span class="dlabel">Study Course Id</span>:
             </td>
             <td> 
@@ -67 +67 @@
               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td width="78%" tal:content="row/title"></td>
-            <td align="center" width="10%" tal:content="row/code"></td>
-            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
-            <td align="center" width="2%" tal:content="row/credits"></td>
-            <td align="center" width="8%" tal:content="row/grade|string:"></td>
+            <td width="10%" tal:content="row/code"></td>
+            <td width="2%">S<span tal:content="row/semester" /></td>
+            <td width="2%" tal:content="row/credits"></td>
+            <td width="8%" tal:content="row/grade|string:"></td>
           </tr>
         </table>
@@ -80 +80 @@
               tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
             <td width="78%" tal:content="row/title"></td>
-            <td align="center" width="10%" tal:content="row/code"></td>
-            <td align="center" width="2%">S<span tal:content="row/semester" /></td>
-            <td align="center" width="2%" tal:content="row/credits"></td>
-            <td align="center" width="8%" tal:content="row/coe|nothing"></td>
+            <td width="10%" tal:content="row/code"></td>
+            <td width="2%">S<span tal:content="row/semester" /></td>
+            <td width="2%" tal:content="row/credits"></td>
+            <td width="8%" tal:content="row/coe|nothing"></td>
           </tr>
           <tr>
+            <th colspan="2" align="right">Total Credits:</th>
             <td></td>
-            <th colspan="2">Total Credits:</th>
-            <td align="center" width="2%" tal:content="info/credits_total"></td>
+            <td width="2%" tal:content="info/credits_total"></td>
           </tr>
         </table>

WAeUP_SRP/trunk/skins/waeup_student/layout_application_edit.pt

@@ -1 @@
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
-
 <metal:block define-macro="default_edit"
   tal:define="layout options/layout;

WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_info.pt

@@ -1 @@
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
 <metal:block define-macro="default_view"
   tal:define="layout options/layout;
@@ -45 +43 @@
         </tr>        
         <tr valign="top">
-          <td><span class="dlabel">JAMB Registration No</span>:
+          <td><span class="dlabel">Registration No</span>:
           </td>
           <td> 
@@ -66 +64 @@
         </tr>         
         <tr valign="top">
-          <td><span class="dlabel">Level</span>:
+          <td><span class="dlabel">Current Session</span>:
           </td>
           <td> 
-            <span tal:content="info/student/level" />
+            <span tal:content="python:context.portal_vocabularies.sessions.get(info['student']['session'])" />  
           </td>      
         </tr>           
+        <tr valign="top">
+          <td><span class="dlabel">Current Level</span>:
+          </td>
+          <td> 
+            <span tal:content="python:context.portal_vocabularies.courselevel.get(info['student']['level'])" />  
+          </td>      
+        </tr>             
       </table>
         

WAeUP_SRP/trunk/skins/waeup_student/layout_application_view_slip.pt

@@ -1 @@
-<!-- a layout_lib macro -->
-<!-- $Id$ -->
 <metal:block define-macro="default_view"
   tal:define="layout options/layout;

WAeUP_SRP/trunk/skins/waeup_student/layout_personal_edit.pt

@@ -1 @@
-<!-- a layout_lib macro -->
-<!-- $Id: layout_application_edit.pt 1071 2006-12-16 15:53:13Z joachim $ -->
-
 <metal:block define-macro="default_edit"
   tal:define="layout options/layout;

WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

@@ -16 +16 @@
                        view_only info/view_only">       
           
+
+    <div style="text-align: right" 
+         tal:condition="python:review_state in ('courses_registered','courses_validated',)">
+    <a href="" target="slip" tal:attributes="href string:course_registration_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" />
+        Course Registration Slip
+    </a>
+    </div>
+
           
     <a href=""
@@ -90 +100 @@
           <td align="center" width="2%" tal:content="row/credits"></td>
           <td align="center" width="8%" tal:content="row/coe|nothing"></td>
+          
+          
+
+
+          <td>
+          <a tal:condition="python:review_state == 'school_fee_paid'" href="edit" tal:attributes="href string:${row/code}/course_edit_form"
+          target="edit"
+          onclick="javascript:window.open('','edit','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+          [edit]
+          </a> 
+          </td>          
+          
+          
         </tr>
         <tr>