Changeset 3675

Timestamp:

18 Sep 2008, 10:00:04 (16 years ago)

Author:

Henrik Bettermann

Message:

• Start customization of the course_results catalog and using different layouts for course result editing by lecturers and section officers. Dont't forget to add symbolic links in all product folders, for example:

cd /zope/instances/WAeUP_OIS/WAeUP_SRP/profiles/default/
ln -s ../../profiles_custom/default/course_results.xml .
cd layouts/
ln -s ../../../profiles_custom/default/layouts/student_course_result.xml .

Location:

WAeUP_SRP

Files:

• base/CHANGES.txt (modified) (1 diff)
• base/WAeUPTables.py (modified) (1 diff)
• base/profiles/default/course_results.xml (deleted)
• base/profiles/default/layouts/student_course_result.xml (deleted)
• base/skins/waeup_student/academic_report_view.pt (modified) (4 diffs)
• ois/profiles_custom/default/course_results.xml (added)
• ois/profiles_custom/default/layouts/student_course_result.xml (added)
• ois/waeup_custom/slip_template.pt (modified) (1 diff)

WAeUP_SRP/base/CHANGES.txt

@@ -5 +5 @@
 ----------------
 
-- Product initialization: Now creating a "faster" session data container 
+- Product initialization: Now creating a "faster" session data container
   in the ZODB /temp_folder upon Zope startup. Moved from "faster" product
   itself.
 
 
-1.0 (XXXX-XX-XX)
+1.2 (2008-09-18)
 -----------------
 
-- New backend module to edit and check university infrastructure and course 
-  data. 
+- Start customization of the course_results catalog and using different
+  layouts for course result editing by lecturers and section officers.
+  Dont't forget to add symbolic links in all product folders, for example:
+
+  cd /zope/instances/WAeUP_OIS/WAeUP_SRP/profiles/default/
+  ln -s ../../profiles_custom/default/course_results.xml .
+  cd layouts/
+  ln -s ../../../profiles_custom/default/layouts/student_course_result.xml .

WAeUP_SRP/base/WAeUPTables.py

@@ -1574 +1574 @@
                     d['grade'] = grade
                     d['score'] = score
+
+            if str(brain.ca1).isdigit() and str(brain.ca2).isdigit() and str(brain.exam).isdigit():
+                d['score_calc'] = int(brain.ca1) + int(brain.ca2) + int(brain.exam)
+            else:
+                d['score_calc'] = ''
+
             d['coe'] = ''
             if brain.core_or_elective:

WAeUP_SRP/base/skins/waeup_student/academic_report_view.pt

@@ -63 +63 @@
         <table>
           <tr>
-            <th  width="220px">Session:</th> 
+            <th>Session:</th> 
             <td><span tal:content="info/session" /></td>
           </tr>
@@ -95 +95 @@
         <th align='center'>om</th>
         <th tal:condition="submission_allowed" align='center'></th>   
+        <th tal:condition="is_so" align='center'></th> 
             
         </tr>                
@@ -114 +115 @@
           <td align="center" tal:content="row/ca2"></td>
           <td align="center" tal:content="row/exam"></td>
-          <td align="center" tal:content="row/score"></td>
+          <td align="center" tal:content="row/score_calc"></td>
           
-          <td tal:condition="submission_allowed" width="5%" align="center">
+          <td tal:condition="python:submission_allowed and is_student" align="center">
             <a href="edit" tal:attributes="href string:course_edit/${row/code}"
             target="edit_course_result"
@@ -122 +123 @@
             [edit]
             </a> 
-          </td>          
+          </td>       
+          <td tal:condition="is_so" align="center">
+            <a href="edit" tal:attributes="href string:lecturer_course_edit/${row/code}"
+            target="edit_course_result"
+            onclick="javascript:window.open('','edit_course_result','width=600, height=500, directories=no, toolbar=no, location=no, menubar=no, scrollbars=yes, status=no, resizable=no, dependent=no')">
+            [edit]
+            </a> 
+          </td>                   
         </tr>
         <tr><td>&nbsp;</td></tr>

WAeUP_SRP/ois/waeup_custom/slip_template.pt

@@ -83 +83 @@
           </td>
           <td style="padding: 1em 0em 0em 0em; text-align: left;" valign="top">
-             <h2>UOlashore International School <br /> Iloko-Ijesa, Nigeria</h2>
+             <h2>Olashore International School <br /> Iloko-Ijesa, Nigeria</h2>
           
           </td>