Changeset 2761 for WAeUP_SRP/base/skins

Timestamp:

26 Nov 2007, 09:45:58 (17 years ago)

Author:

Henrik Bettermann

Message:

don't show score 0

show carry-over courses on slip properly

Location:

WAeUP_SRP/base/skins

Files:

• waeup_epayment/getPaymentsFolderInfo.py (modified) (1 diff)
• waeup_student/study_level_view.pt (modified) (6 diffs)

WAeUP_SRP/base/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -1 @@
-z## Script (Python) "getPaymentsFolderInfo"
+## Script (Python) "getPaymentsFolderInfo"
 ##bind container=container
 ##bind context=context

WAeUP_SRP/base/skins/waeup_student/study_level_view.pt

@@ -77 +77 @@
       <br />
       <table tal:condition="python: 1" class="contentListing" width="100%" summary="content layout" id="folder_content">
+
+        <tr>
+        <th tal:attributes="colspan python: test(show_check_boxes,'2','1')">Both Semesters</th>
+        <th align='center'></th> 
+        <th align='center'>sm</th>
+        <th align='center'>cr</th>
+        <th align='center'>sc</th>
+        <th align='center'>gr</th>
+        <th align='center'>wt</th>
+        <th align='center'></th>
+        <th tal:condition="submission_allowed" align='center'></th>   
+            
+        </tr>          
         <tr tal:repeat="row info/carry_overs"
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
@@ -128 +141 @@
         <th align='center'>wt</th>
         <th align='center'></th>
-        <th align='center'></th>   
+        <th tal:condition="submission_allowed" align='center'></th>   
             
         </tr>                
@@ -206 +219 @@
       <br />
       
-      <table tal:condition="python: is_student and submission_allowed and show_check_boxes" width="100%" cellspacing="0" cellpadding="2"
+      <table tal:condition="python: is_student and show_check_boxes" width="100%" cellspacing="0" cellpadding="2"
              class="folderButtons">
         <tr>
@@ -283 +296 @@
         </tr>
       </table>
-      <table tal:condition="python:is_ca and is_current_level" width="100%" cellspacing="0" cellpadding="2"
+      <table tal:condition="python:is_ca and is_current_level and not has_verdict" width="100%" cellspacing="0" cellpadding="2"
              class="folderButtons">
         <tr>
           <td align="left" valign="top" rowspan="3"></td>
           <td align="left" valign="top">
-              <input tal:condition="submission_allowed"
+              <input tal:condition="show_check_boxes"
                      type="button" value="Select all" class="context"
                      onclick="someJavaScriptFunctionThatWillBeReplaced"
@@ -295 +308 @@
                      % (cpsmcat('button_select_all'), cpsmcat('button_deselect_all'))"
                      />
-              <input tal:condition="submission_allowed"
+              <input tal:condition="show_check_boxes"
                      type="submit" name="delete_course_result:method" value="Delete selected"
                      class="destructive" i18n:attributes="value"
@@ -301 +314 @@
                      ('Do you really want to delete the courses selected?', )" 
                      />
-              <input tal:condition="submission_allowed"
+              <input tal:condition="show_check_boxes"
                      type="submit" name="refresh_level:method"
                      class="context" value="Update"