Changeset 3667 for WAeUP_SRP/base/skins

Timestamp:

8 Sep 2008, 19:35:03 (16 years ago)

Author:

Henrik Bettermann

Message:

first implementations for academic reports of secondary schools

call the URL: [path to level]/academic_report_view

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• academic_report_view.pt (added)
• study_level_view.pt (modified) (5 diffs)

WAeUP_SRP/base/skins/waeup_student/study_level_view.pt

@@ -113 +113 @@
           <td align="center" width="2%" tal:content="row/credits"></td>
           <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
-          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
+          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/ca1"></td>
           <td align="center" width="2%" tal:content="row/grade"></td>
           <td align="center" width="2%" tal:content="row/weight"></td>
@@ -135 +135 @@
       <table class="contentListing" width="100%" id="folder_content">
         
-        <span tal:repeat="sem python:('1','2')">       
+        <span tal:repeat="sem python:(('1','First Semester Courses','normal1'),('2','Second Semester Courses','normal2'),('3','Level Courses','normal3'))">       
                     
-        <tr>
+        <tr tal:condition="python:info[sem[2]]">
         <th tal:attributes="colspan python: test(show_check_boxes,'2','1')" 
-            tal:content="python: test(sem == '1','First Semester', 'Second Semester')" />
+            tal:content="python:sem[1]" />
         <th align='center'></th> 
         <th align='center'>sm</th>
@@ -151 +151 @@
             
         </tr>                
-        <tr tal:repeat="row python: test(sem == '1',info['normal1'],info['normal2'])"
+        <tr tal:repeat="row python:info[sem[2]]"
+            
             tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-          <td align="left" valign="middle" style="width: 5%         ;"
+          <td align="left" valign="middle" style="width: 5%;"
              tal:condition="show_check_boxes">
             <input type="checkbox" name="ids:list" value="" id="" class="noborder"
@@ -167 +168 @@
           <td align="center" width="2%" tal:content="row/credits"></td>
           <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
-          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
+          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/ca1"></td>
           <td align="center" width="2%" tal:content="row/grade"></td>
           <td align="center" width="2%" tal:content="row/weight"></td>
@@ -180 +181 @@
           </td>          
         </tr>
-
+        <tr><td>&nbsp;</td></tr>
         </span>        
-        
-        <tr><th colspan="3" tal:condition="info/normal3"> Combined</th></tr>                
-        <tr tal:condition="info/normal3" tal:repeat="row info/normal3"
-            tal:attributes="class python:test(repeat['row'].even(), 'even ajaxtd', 'odd ajaxtd')">
-          <td align="left" valign="middle" style="width: 5%;"
-             tal:condition="show_check_boxes">
-            <input type="checkbox" name="ids:list" value="" id="" class="noborder"
-                   tal:define="id row/id"
-                   tal:attributes="value id;
-                   id python:'cb_' + id;
-                   checked python:id in info['choosen_ids'];" 
-                   />
-          </td>
-          <td width="58%" tal:content="row/title"></td>
-          <td align="center" width="10%" tal:content="row/code"></td>
-          <td align="center" width="2%"><span tal:content="row/semester" /></td>
-          <td align="center" width="2%" tal:content="row/credits"></td>
-          <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
-          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
-          <td align="center" width="2%" tal:content="row/grade"></td>
-          <td align="center" width="2%" tal:content="row/weight"></td>
-          <td align="center" width="10%" tal:content="row/coe|nothing"></td>
-          
-          <td tal:condition="submission_allowed" width="5%" align="center">
-          <a href="edit" tal:attributes="href string:course_edit/${row/code}"
-          target="edit_course_result"
-          onclick="javascript:window.open('','edit_course_result','width=600, height=350, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
-          [edit]
-          </a> 
-          </td>          
-        </tr>        
         
       </table>