Changeset 3628

Timestamp:

26 Aug 2008, 07:18:47 (16 years ago)

Author:

Henrik Bettermann

Message:

implement cgpa and cascore

Location:

WAeUP_SRP

Files:

• base/skins/waeup_student/study_level_view.pt (modified) (7 diffs)
• unilorin/profiles/default/course_results.xml (modified) (2 diffs)
• unilorin/profiles/default/layouts/import_course_result.xml (modified) (1 diff)
• unilorin/profiles/default/layouts/student_course_result.xml (modified) (2 diffs)
• unilorin/profiles/default/schemas/import_course_result.xml (modified) (1 diff)
• unilorin/profiles/default/schemas/student_course_result.xml (modified) (1 diff)
• unilorin/waeup_custom/getStudyLevelInfo.py (modified) (1 diff)
• unilorin/waeup_custom/getTranscriptInfo.py (modified) (3 diffs)
• unilorin/waeup_custom/transcript_view.pt (modified) (2 diffs)

WAeUP_SRP/base/skins/waeup_student/study_level_view.pt

@@ -19 +19 @@
     is_student info/is_student;
     with_score not: info/without_score|nothing;
+    with_cascore not: info/without_cascore|nothing;
     ">       
     <div style="text-align: right" 
@@ -87 +88 @@
         <th align='center'>cr</th>
         <th tal:condition="with_score" align='center'>sc</th>
+        <th tal:condition="with_cascore" align='center'>ca</th>
         <th align='center'>gr</th>
         <th align='center'>wt</th>
@@ -111 +113 @@
           <td align="center" width="2%" tal:content="row/credits"></td>
           <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
+          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
           <td align="center" width="2%" tal:content="row/grade"></td>
           <td align="center" width="2%" tal:content="row/weight"></td>
@@ -141 +144 @@
         <th align='center'>cr</th>
         <th tal:condition="with_score" align='center'>sc</th>
+        <th tal:condition="with_cascore" align='center'>ca</th>
         <th align='center'>gr</th>
         <th align='center'>wt</th>
@@ -163 +167 @@
           <td align="center" width="2%" tal:content="row/credits"></td>
           <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
+          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
           <td align="center" width="2%" tal:content="row/grade"></td>
           <td align="center" width="2%" tal:content="row/weight"></td>
@@ -195 +200 @@
           <td align="center" width="2%" tal:content="row/credits"></td>
           <td tal:condition="with_score" align="center" width="4%" tal:content="row/score"></td>
+          <td tal:condition="with_cascore" align="center" width="4%" tal:content="row/cascore"></td>
           <td align="center" width="2%" tal:content="row/grade"></td>
           <td align="center" width="2%" tal:content="row/weight"></td>
@@ -216 +222 @@
       <tr><th>cr:</th> <td>Credits</td></tr>
       <tr tal:condition="with_score"><th>sc:</th> <td>Score</td></tr>
+      <tr tal:condition="with_cascore"><th>ca:</th> <td>CA Score</td></tr>
       <tr><th>gr: </th> <td>Grade</td></tr>
       <tr><th>wt: </th> <td>Weight</td></tr>

WAeUP_SRP/unilorin/profiles/default/course_results.xml

@@ -11 +11 @@
  <column value="session_id"/>
  <column value="score"/>
+ <column value="cascore"/>
  <column value="grade"/>
  <column value="lecturer"/>
@@ -21 +22 @@
  <index name="lecturer" meta_type="FieldIndex">
   <indexed_attr value="lecturer"/>
- </index>  
+ </index>
  <index name="student_id" meta_type="FieldIndex">
   <indexed_attr value="student_id"/>

WAeUP_SRP/unilorin/profiles/default/layouts/import_course_result.xml

@@ -153 +153 @@
   </widget>
 
+  <widget name="cascore" meta_type="Int Widget">
+    <property name="title">CA Score</property>
+    <property name="fields">
+      <element value="cascore"/>
+    </property>
+    <property name="is_required">False</property>
+    <property name="label">CA Score</property>
+    <property name="label_edit">Ca Score</property>
+    <property name="readonly_layout_modes">
+    </property>
+    <property name="hidden_layout_modes"/>
+    <property name="hidden_readonly_layout_modes"/>
+    <property name="min_value">1</property>
+    <property name="max_value">100</property>
+  </widget>  
+
   <widget name="grade" meta_type="Select Widget">
     <property name="title">Grade</property>

WAeUP_SRP/unilorin/profiles/default/layouts/student_course_result.xml

@@ -81 +81 @@
   <property name="hidden_readonly_layout_modes"/>
  </widget>
+ <widget name="cascore" meta_type="Int Widget">
+  <property name="title">Continuous Assessment Score</property>
+  <property name="fields">
+   <element value="cascore"/>
+  </property>
+  <property name="label">Continuous Assessment Score</property>
+  <property name="label_edit">Continuous Assessment Score</property>
+  <property name="readonly_layout_modes">
+  </property>
+  <property name="hidden_layout_modes"/>
+  <property name="hidden_readonly_layout_modes"/>
+ </widget>
  <widget name="title" meta_type="String Widget">
   <property name="title">Original Course Title</property>
@@ -106 +118 @@
   </row>
   <row>
+   <cell name="cascore"/>
+  </row>  
+  <row>
    <cell name="core_or_elective "/>
   </row>

WAeUP_SRP/unilorin/profiles/default/schemas/import_course_result.xml

@@ -10 +10 @@
  <field name="credits" meta_type="CPS Int Field"/>
  <field name="score" meta_type="CPS String Field"/>
+ <field name="cascore" meta_type="CPS String Field"/>
  <field name="grade" meta_type="CPS String Field"/>
  <field name="carry_over" meta_type="CPS Boolean Field"/>

WAeUP_SRP/unilorin/profiles/default/schemas/student_course_result.xml

@@ -11 +11 @@
  <field name="status" meta_type="CPS String Field"/>
  <field name="passmark" meta_type="CPS Int Field"/>
+ <field name="cascore" meta_type="CPS Int Field"/>
 </object>

WAeUP_SRP/unilorin/waeup_custom/getStudyLevelInfo.py

@@ -85 +85 @@
 
 max_credits = 58
-info['without_score'] = without_score = False
-
+info['without_score'] = False
+info['without_cascore'] = False
 
 

WAeUP_SRP/unilorin/waeup_custom/getTranscriptInfo.py

@@ -54 +54 @@
 
 year_counter = 0
+cgpa = 0
+c_total_credits = 0
 for year in year_courses:
     gpa = 0
@@ -61 +63 @@
             gpa += int(course['weight']) * int(course['credits'])
             total_credits += int(course['credits'])
+    cgpa += gpa
+    c_total_credits += total_credits
     if gpa and total_credits:
         year_details[year_counter]['total_credits'] = total_credits
@@ -66 +70 @@
     else:
         year_details[year_counter]['total_credits'] = 0
-        year_details[year_counter]['gpa'] = 0    
+        year_details[year_counter]['gpa'] = 0
+
+    if cgpa and c_total_credits:
+        year_details[year_counter]['c_total_credits'] = c_total_credits
+        year_details[year_counter]['cgpa'] = "%4.2f" % (float(cgpa)/int(c_total_credits))
+    else:
+        year_details[year_counter]['c_total_credits'] = 0
+        year_details[year_counter]['cgpa'] = 0
+
     year.sort(cmp=lambda x,y: cmp("%(semester)s%(code)s" % x,
                                          "%(semester)s%(code)s" % y))

WAeUP_SRP/unilorin/waeup_custom/transcript_view.pt

@@ -73 +73 @@
         <table>
           <tr tal:condition="details/total_credits" >
-            <th>Total Credits:</th>
+            <th width='200pt'>Total Credits:</th>
             <td tal:content="details/total_credits" />
           </tr>
@@ -80 +80 @@
             <td><span tal:content="details/gpa" /></td>
           </tr>
+          <tr>
+            <th>Cumulative Total Credits:</th>
+            <td tal:content="details/c_total_credits" />
+          </tr>
+          <tr tal:condition="details/cgpa">
+            <th>CGPA:</th> 
+            <td><span tal:content="details/cgpa" /></td>
+          </tr>          
         </table>