Changeset 5374

Timestamp:

6 Aug 2010, 07:05:43 (14 years ago)

Author:

Henrik Bettermann

Message:

implement NCE-III repeater mode

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/vocabularies/verdicts.xml (modified) (1 diff)
• skins/waeup_fceokene/getNextInfo.py (modified) (1 diff)
• skins/waeup_fceokene/getSchoolFee.py (modified) (1 diff)

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

@@ -21 +21 @@
  <item key="M" msgid="">reinstatement</item>
  <item key="N" msgid="">student on transfer</item>
+ <item key="O" msgid="">NCE-III repeater</item>
  <item key="X" msgid="">new 300 level student</item>
  <item key="Y" msgid="">no previous verdict</item>

WAeUP_SRP/trunk/skins/waeup_fceokene/getNextInfo.py

@@ -48 +48 @@
         if verdict in ('A','B','G','C',):                                     #customized
             info['next_level_id'] = "%s" % (int(level_id) + 100)
-        #elif verdict == 'C':
-        #    info['next_level_id'] = "%s" % (int(level_id) + 10)
+        elif verdict == 'O':
+            info['next_level_id'] = "%s" % (int(level_id) + 10)
         else:
             info['next_level_id'] = level_id

WAeUP_SRP/trunk/skins/waeup_fceokene/getSchoolFee.py

@@ -51 +51 @@
         else:
             d['all'] = 11545
+    # NCE III repeater
+    elif str(brain.level) in ('300','310','320') and brain.verdict == 'O':
+        if brain.department in ARTS:
+            d['all'] = 5535
+        else:
+            d['all'] = 5773         
     # NCE III spillover
     elif str(brain.level) in ('300','310','320') and brain.verdict == 'B':