Changeset 4303 for WAeUP_SRP/trunk/skins/waeup_ois

Timestamp:

17 Jun 2009, 13:54:33 (16 years ago)

Author:

Henrik Bettermann

Message:

calculate and show position in course (see also previous revision)

Location:

WAeUP_SRP/trunk/skins/waeup_ois

Files:

• academic_report_slip.pt (modified) (3 diffs)
• academic_report_view.pt (modified) (4 diffs)
• getStudyLevelInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip.pt

@@ -36 +36 @@
             <tr>
                 <td>Year Group Average:</td><td> <span tal:content="python:info[sem[4]]" /> (<span tal:content="python:info[sem[5]]" /> overall marks)</td> 
-            </tr>            
+            </tr>      
         </table>
         <br />   <br />                 
@@ -49 +49 @@
                         <th align='center'>Overall <br />Marks</th>
                         <th align='center'>Grade</th>
+                        <th align='center'>PiS</th>
                         <th tal:condition="is_so" align='center'>
                         </th>
@@ -61 +62 @@
                         <td align="center" tal:content="row/score_calc"></td>
                         <td align="center" tal:content="row/grade"></td>
+                        <td align="center" tal:content="row/pic"></td>
                     </tr>
                     <tr><td>&nbsp;</td>

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_view.pt

@@ -89 +89 @@
         <th tal:attributes="colspan python: test(show_check_boxes,'2','1')" 
             tal:content="python:sem[1]" />
+        <th align='center'>Code</th>    
         <th align='center'>Attitude To Learning</th>    
         <th align='center'>CA 1 <br />Marks</th>
@@ -95 +96 @@
         <th align='center'>Overall <br />Marks</th>
         <th align='center'>Grade</th>
+        <th align='center'>PiS</th>
         <th tal:condition="submission_allowed" align='center'></th>   
         <th tal:condition="is_so" align='center'></th> 
@@ -111 +113 @@
           </td>
           <td tal:content="row/title"></td>
+          <td align="center" tal:content="row/code"></td>
           <td align="center" tal:content="python:context.portal_vocabularies.pastoral_grade.get(row['atl'])"></td>
           <td align="center" tal:content="row/ca1"></td>
@@ -117 +120 @@
           <td align="center" tal:content="row/score_calc"></td>
           <td align="center" tal:content="row/grade"></td>
+          <td align="center" tal:content="row/pic"></td>
           
           <td tal:condition="python:submission_allowed and is_student and False" align="center">

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -145 +145 @@
 
 session_id = level_doc.session
-yga1,yga2,yga3,counter1,counter2,counter3 = course_results.getYearGroupAverage(session_id,level_id)
+yga1,yga2,yga3,counter1,counter2,counter3,yg1,yg2,yg3 = course_results.getYearGroupAverage(session_id,level_id)
 info['yga1'] = yga1
 info['yga2'] = yga2
@@ -153 +153 @@
 info['counter3'] = counter3
 
+
+#yg1.sort(reverse=True)
+#if not len(yg1):
+#    pos1 = 'no result'
+#for pos1 in range(len(yg1)):
+#    if yg1[pos1] <= float(score_calc_average_1):
+#        break
+#info['pos1'] = '%d of %d' % (pos1+1,len(yg1))
+
 #end customization