Changeset 4487

Timestamp:

30 Jul 2009, 19:37:50 (15 years ago)

Author:

Henrik Bettermann

Message:

resolve email of Issoufou from 30/07/09

Location:

WAeUP_SRP/trunk/skins/waeup_ois

Files:

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

WAeUP_SRP/trunk/skins/waeup_ois/academic_report_slip.pt

@@ -14 +14 @@
                                        sem_series python:(('Term One','normal1','complete1','score_calc_average_1','yga1','counter1','date1','over_pos_term1','no_stud_term1'),
                                                           ('Term Two','normal2','complete2','score_calc_average_2','yga2','counter2','date2','over_pos_term2','no_stud_term2'),
-                                                          ('Term Three','normal3','complete3','score_calc_average_3','yga3','counter3','date3','over_pos_term3','no_stud_term3','over_pos_cum','no_stud_cum'));
+                                                          ('Term Three','normal3','complete3','score_calc_average_3','yga3','counter3','date3','over_pos_term3','no_stud_term3','over_pos_cum','no_stud_cum','score_calc_average_cum'));
                                        sem python:sem_series[int(term)-1];
                                        ">
@@ -32 +32 @@
             </tr>        
             <tr>
-                <td>Student's Average:</td><td tal:content="python:info[sem[3]]"></td> 
+                <td>Student's Average in Term:</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]]" /> overall marks)</td> 
+                <td>Year Group Average in Term:</td><td> <span tal:content="python:info[sem[4]]" /> (<span tal:content="python:info[sem[5]]" /> overall marks)</td> 
             </tr>      
             <tr>
-                <td>Overall Position (in Term):</td><td> <span tal:content="python:info[sem[7]]" /> </td> 
+                <td>Overall Position in Term:</td><td> <span tal:content="python:info[sem[7]]" /> of <span tal:content="python:info[sem[8]]" /></td> 
             </tr>     
-            <tr>
-                <td>Number of Students (in Term):</td><td> <span tal:content="python:info[sem[8]]" /> </td> 
-            </tr>     
+         
             <tr tal:condition="python:int(term)==3">
                 <td>Overall Position in Year:</td><td> <span tal:content="python:info[sem[9]]" /> </td> 
-            </tr>     
+            </tr>
+            <tr tal:condition="python:int(term)==3">
+                <td>Student's Average in Year:</td><td> <span tal:content="python:info[sem[11]]" /> </td> 
+            </tr>                        
                                 
         </table>
@@ -59 +60 @@
                         <th style='text-align:center'>Overall <br />Marks</th>
                         <th style='text-align:center'>Grade</th>
-                        <th style='text-align:center'>PiS</th>
+                        <th style='text-align:center'>Pos. in <br /> Subject</th>
                         <th tal:condition="is_so" style='text-align:center'>
                         </th>
@@ -77 +78 @@
                     </tr>
             </table>
-
+            
 
         <span tal:condition="python:True">      <br /><br />

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -144 +144 @@
 info['score_calc_average_3'] =  '%.2f' % score_calc_average_3  
 
+score_calc_average_cum = (score_calc_average_1 + score_calc_average_2 + score_calc_average_3)/3 
+
+info['score_calc_average_cum'] = '%.2f' % score_calc_average_cum
+
 session_id = level_doc.session
 yga1,yga2,yga3,counter1,counter2,counter3,yg1,yg2,yg3 = course_results.getYearGroupAverage(session_id,level_id)