Changeset 1429 for WAeUP_SRP

Timestamp:

17 Feb 2007, 10:48:28 (18 years ago)

Author:

Henrik Bettermann

Message:

• Name, Level, MatricNo? and Sex are taken from the students_catalog
• Course from returning_import
• Verdict, GPA and Session from results_import

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• getSessionResults.py (modified) (1 diff)
• session_results_slip.pt (modified) (2 diffs)
• session_results_view.pt (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py

@@ -95 +95 @@
     gpa = float(gpa) / course_count
     gpa = "%4.2f" % gpa
-    
-# not available at the beginning    
-#if student_from_cat.sex:
-#    info['sex'] = 'F'
-#else:
-#    info['sex'] = 'M'
-#info['level'] = int(student_from_cat.level)-100
+
+if student_from_cat.level:
+    if student_from_cat.sex:
+        info['sex'] = 'F'
+    else:
+        info['sex'] = 'M'
+    info['level'] = int(student_from_cat.level)-100
+else: 
+    info['sex'] = 'na'
+    info['level'] = 'na'
 
 info['verdict'] = verdict

WAeUP_SRP/trunk/skins/waeup_student/session_results_slip.pt

@@ -24 +24 @@
         </tr>
         <tr>
-          <th>Sex:</th><td tal:content="info/student_from_returning/Sex" />                     
+          <th>Sex:</th><td tal:content="info/sex" />                     
         </tr>
         <tr>
@@ -30 +30 @@
         </tr>
         <tr>
-          <th>Level:</th><td tal:content="info/student_from_returning/Level" />                     
+          <th>Level:</th><td tal:content="info/level" />                     
         </tr>
       </table>

WAeUP_SRP/trunk/skins/waeup_student/session_results_view.pt

@@ -24 +24 @@
         </tr>
         <tr>
-          <th>Sex:</th><td tal:content="info/student_from_returning/Sex" />                     
+          <th>Sex:</th><td tal:content="info/sex" />                     
         </tr>
         <tr>
@@ -30 +30 @@
         </tr>
         <tr>
-          <th>Level:</th><td tal:content="info/student_from_returning/Level" />                     
+          <th>Level:</th><td tal:content="info/level" />                     
         </tr>
       </table>