Changeset 1463

Timestamp:

21 Feb 2007, 21:02:25 (18 years ago)

Author:

Henrik Bettermann

Message:

verdicts according to Maryannes's email

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/vocabularies/verdicts.xml (modified) (1 diff)
• skins/waeup_student/getLevelFromResultsCosCode.py (modified) (1 diff)
• skins/waeup_student/getVerdict.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/default/vocabularies/verdicts.xml

@@ -8 +8 @@
  <item key="A" msgid="">successful student</item>
  <item key="B" msgid="">student with carryover courses</item>
- <item key="C" msgid="">student on probation</item>
  <item key="C" msgid="">student on probation/transfer</item>
  <item key="D" msgid="">student who is to withdraw from the faculty</item>

WAeUP_SRP/trunk/skins/waeup_student/getLevelFromResultsCosCode.py

@@ -11 +11 @@
 lnr = 0
 for e in list:
-    if e.CosCode == "na":
+    if e.CosCode == "N/A":
         return 2
     try:

WAeUP_SRP/trunk/skins/waeup_student/getVerdict.py

@@ -14 +14 @@
             'STUDENT ON PROBATION': ('C',False),
             'WITHDRAWAL STUDENT': ('D',False),
-            'FIRST CLASS HONOURS': ('first_class',False),
-            'SECOND CLASS HONOURS (UPPER DIVISION)': ('second_class_upper',False),
-            'SECOND CLASS HONOURS (LOWER DIVISION)': ('second_class_lower',False),
-            'THIRD CLASS': ('third_class',False),
+            'FIRST CLASS HONOURS': ('A',True),
+            'SECOND CLASS HONOURS (UPPER DIVISION)': ('A',True),
+            'SECOND CLASS HONOURS (LOWER DIVISION)': ('A',True),
+            'THIRD CLASS': ('A',True),
+            'PASS': ('A',True),
 #            '': ('',False),
             }