Changeset 4438

Timestamp:

27 Jul 2009, 10:25:37 (15 years ago)

Author:

Henrik Bettermann

Message:

add cumulative overall position in year

Location:

WAeUP_SRP/trunk

Files:

• profiles/ois/schemas/import_student_study_level.xml (modified) (1 diff)
• profiles/ois/schemas/student_study_level.xml (modified) (1 diff)
• skins/waeup_ois/academic_report_slip.pt (modified) (2 diffs)
• skins/waeup_ois/getStudyLevelInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/ois/schemas/import_student_study_level.xml

@@ -16 +16 @@
  <field name="no_stud_term3" meta_type="CPS String Field"/>
  <field name="over_pos_term3" meta_type="CPS String Field"/>
+ <field name="no_stud_cum" meta_type="CPS String Field"/>
+ <field name="over_pos_cum" meta_type="CPS String Field"/>  
 </object>

WAeUP_SRP/trunk/profiles/ois/schemas/student_study_level.xml

@@ -13 +13 @@
  <field name="no_stud_term3" meta_type="CPS String Field"/>
  <field name="over_pos_term3" meta_type="CPS String Field"/>
+ <field name="no_stud_cum" meta_type="CPS String Field"/>
+ <field name="over_pos_cum" meta_type="CPS String Field"/> 
 </object>

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'));
+                                                          ('Term Three','normal3','complete3','score_calc_average_3','yga3','counter3','date3','over_pos_term3','no_stud_term3','over_pos_cum','no_stud_cum'));
                                        sem python:sem_series[int(term)-1];
                                        ">
@@ -38 +38 @@
             </tr>      
             <tr>
-                <td>Overall Position in Year:</td><td> <span tal:content="python:info[sem[7]]" /> </td> 
+                <td>Overall Position (in Term):</td><td> <span tal:content="python:info[sem[7]]" /> </td> 
             </tr>     
             <tr>
-                <td>Number of Students in Year:</td><td> <span tal:content="python:info[sem[8]]" /> </td> 
-            </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>     
+                                
         </table>
         <br />   <br />                 

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -204 +204 @@
 info['over_pos_term3'] = getattr(level_doc, 'over_pos_term3','n/a')
 info['no_stud_term3'] = getattr(level_doc, 'no_stud_term3','n/a')
+info['over_pos_cum'] = getattr(level_doc, 'over_pos_cum','n/a')
+info['no_stud_cum'] = getattr(level_doc, 'no_stud_cum','n/a')
 
 return info