Changeset 4395

Timestamp:

11 Jul 2009, 19:03:56 (15 years ago)

Author:

Henrik Bettermann

Message:

customize ois student_study_level schema and add position parameters to academic_report_slip

Location:

WAeUP_SRP/trunk

Files:

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

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

@@ -8 +8 @@
  <field name="session" meta_type="CPS String Field"/>
  <field name="verdict" meta_type="CPS String Field"/>
- <field name="validated_by" meta_type="CPS String Field"/>
- <field name="validation_date" meta_type="CPS DateTime Field"/>
 </object>

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

@@ -7 +7 @@
  <field name="validation_date" meta_type="CPS DateTime Field"/>
  <field name="verdict" meta_type="CPS String Field"/>
- <field name="no_stud_year" meta_type="CPS String Field"/>
- <field name="over_pos_year" meta_type="CPS String Field"/>
 </object>

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','yga1','counter1','date1'),
-                                                          ('Term Two','normal2','complete2','score_calc_average_2','yga2','counter2','date2'),
-                                                          ('Term Three','normal3','complete3','score_calc_average_3','yga3','counter3','date3'));
+                                       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'));
                                        sem python:sem_series[int(term)-1];
                                        ">
@@ -37 +37 @@
                 <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>
+                <td>Overall Position in Year:</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>                             
         </table>
         <br />   <br />                 

WAeUP_SRP/trunk/skins/waeup_ois/getStudyLevelInfo.py

@@ -198 +198 @@
     info['date3'] = 'n/a'
 
+info['over_pos_term1'] = getattr(level_doc, 'over_pos_term1','n/a')
+info['no_stud_term1'] = getattr(level_doc, 'no_stud_term1','n/a')
 
 return info