Changeset 5101

Timestamp:

31 Mar 2010, 13:16:04 (15 years ago)

Author:

Henrik Bettermann

Message:

see ticket #651

Location:

WAeUP_SRP/trunk

Files:

• profiles/uniben/vocabularies/pin_prefixes.xml (modified) (2 diffs)
• skins/waeup_epayment/getSchoolFeePrefix.py (modified) (1 diff)

WAeUP_SRP/trunk/profiles/uniben/vocabularies/pin_prefixes.xml

@@ -41 +41 @@
   <item key="MGS" msgid="">Management Sciences</item>
   <item key="BSC" msgid="">Bachelor in Computer Science</item>
-  <item key="FRN" msgid="">Foreign Returning Students</item>
+  <item key="FRNART" msgid="">Art related programmes (Foreign Students)</item>
+  <item key="FRNSCI" msgid="">Science related programmes (Foreign Students)</item>
 
   <item key="AGRNEW" msgid="">Agriculture (New Students)</item>
@@ -57 +58 @@
   <item key="MGSNEW" msgid="">Management Sciences (New Students)</item>
   <item key="BSCNEW" msgid="">Bachelor in Computer Science (New Students)</item>
-  <item key="FRNNEW" msgid="">Foreign New Students</item>
+  <item key="FRNARTNEW" msgid="">Art related programmes (New Foreign Students)</item>
+  <item key="FRNSCINEW" msgid="">Science related programmes (New Foreign Students)</item>
   
 

WAeUP_SRP/trunk/skins/waeup_epayment/getSchoolFeePrefix.py

@@ -90 +90 @@
             "DHT",
             )
+            
+FRNART_FACULTY = (
+            "ART",
+            "LAW", 
+            "SSC",
+            "MGS",
+            )            
+
+FRNSCI_FACULTY = (
+            "ENG",
+            "LSC", 
+            "PSC",
+            "BMS",
+            "MED",
+            "DEN",
+            "PHA",
+            "AGR",
+            )            
+
 
 if student_record.lga == 'foreigner':
     if student_record.course in FRNART:
-         prefix == 'FRNART'
+         prefix = 'FRNART'
     elif student_record.course in FRNSCI:
-         prefix == 'FRNSCI'
+         prefix = 'FRNSCI'
+    elif student_record.faculty in FRNART_FACULTY:        
+         prefix = 'FRNART'
+    elif student_record.faculty in FRNSCI_FACULTY:
+         prefix = 'FRNSCI'
     else: 
         logger.info('%s, foreign student course %s not categorized' % (student_id,student_record.faculty))