Changeset 1448

Timestamp:

20 Feb 2007, 19:51:55 (18 years ago)

Author:

Henrik Bettermann

Message:

prepared for import of dummy results

Location:

WAeUP_SRP/trunk

Files:

• Students.py (modified) (1 diff)
• skins/waeup_student/display_session_results.py (modified) (1 diff)
• skins/waeup_student/getMemberInfo.py (modified) (2 diffs)
• skins/waeup_student/getSessionResults.py (modified) (3 diffs)
• skins/waeup_student/mail_password_form.pt (modified) (1 diff)

WAeUP_SRP/trunk/Students.py

@@ -1156 +1156 @@
                 no_certificate = "no certificate %s" % format
             course_id = result.get('CosCode')
+            if not course_id:
+                course_id = 'N/A'
+                result['CosCode'] = course_id
             matric_no = result.get('matric_no').upper()
             result['matric_no'] = matric_no

WAeUP_SRP/trunk/skins/waeup_student/display_session_results.py

@@ -63 +63 @@
     if with_courses_cat:
         res = context.courses_catalog(code = r.CosCode)
-    if with_courses_cat and res:
+    if r.CosCode == 'N/A':
+        result['title'] = 'N/A'
+    elif with_courses_cat and res:
         result['title'] = res[0].title
     else:

WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py

@@ -87 +87 @@
     info['review_state'] = wf.getInfoFor(student,'review_state',None)
     info['password'] = context.waeup_tool.getCredential(student_id)
-    info['email'] = 'na'
+    info['email'] = 'N/A'
 
     msg="""
@@ -100 +100 @@
 
     info['message'] = msg % (
-        'na',
+        'N/A',
         student_id,
         info['password']

WAeUP_SRP/trunk/skins/waeup_student/getSessionResults.py

@@ -43 +43 @@
 res = scatalog(id = student_id)
 matric_no = res[0].matric_no
-student_from_cat = res[0] 
+student_from_cat = res[0]
 
 res = returning(matric_no = matric_no)
@@ -83 +83 @@
             result['gpa'] = 'ok'
         except:
-            result['gpa'] = 'na'
+            result['gpa'] = 'N/A'
     else:
-        result['title'] = "na"
-        result['credits'] = "na"
-        result['gpa'] = 'na'
+        result['title'] = ""
+        result['credits'] = "N/A"
+        result['gpa'] = 'N/A'
+        result['WEIGHT'] = 'N/A'
+        result['GRADE'] = 'N/A'
     if r.Semester == '2':
         sem2.append(result)
@@ -102 +104 @@
         info['sex'] = 'M'
     info['level'] = int(student_from_cat.level)-100
-else: 
-    info['sex'] = 'na'
-    info['level'] = 'na'
+else:
+    info['sex'] = 'N/A'
+    info['level'] = 'N/A'
 
 info['verdict'] = verdict

WAeUP_SRP/trunk/skins/waeup_student/mail_password_form.pt

@@ -61 +61 @@
           </td>
         </tr>
-        <tr tal:condition="python: info['email'] and info['email']!='na'">
+        <tr tal:condition="python: info['email'] and info['email']!='N/A'">
           <td>&nbsp;</td>
           <td><input name="Submit" type="submit" class="standalone" value="Submit" /><br /><br /></td>