Changeset 4036 for WAeUP_SRP/trunk/skins

Timestamp:

1 Apr 2009, 08:40:55 (16 years ago)

Author:

Henrik Bettermann

Message:

implement year group average

Location:

WAeUP_SRP/trunk/skins/waeup_ois

Files:

• academic_report_slip.pt (modified) (2 diffs)
• getStudyLevelInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip.pt

@@ -12 +12 @@
                                        term_complete info/complete1;
                                        term options/term;
-                                       sem_series python:(('Term One','normal1','complete1','score_calc_average_1'),('Term Two','normal2','complete2','score_calc_average_2'),('Term Three','normal3','complete3','score_calc_average_3'));
+                                       sem_series python:(('Term One','normal1','complete1','score_calc_average_1','yga1','counter1'),('Term Two','normal2','complete2','score_calc_average_2','yga2','counter2'),('Term Three','normal3','complete3','score_calc_average_3','yga3','counter3'));
                                        sem python:sem_series[int(term)-1];
                                        ">
@@ -32 +32 @@
                 <td>Student's Average:</td><td tal:content="python:info[sem[3]]"></td> 
             </tr>
+            <tr>
+                <td>Year Group Average:</td><td> <span tal:content="python:info[sem[4]]" /> (<span tal:content="python:info[sem[5]]" /> students)</td> 
+            </tr>            
         </table>
         <br />   <br />                 

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -141 +141 @@
 info['score_calc_average_3'] =  '%.2f' % score_calc_average_3  
 
+session_id = level_doc.session
+yga1,yga2,yga3,counter1,counter2,counter3 = course_results.getYearGroupAverage(session_id,level_id)
+info['yga1'] = yga1
+info['yga2'] = yga2
+info['yga3'] = yga3
+info['counter1'] = counter1
+info['counter2'] = counter2
+info['counter3'] = counter3
 
 #end customization