Changeset 9568

Timestamp:

7 Nov 2012, 14:06:39 (12 years ago)

Author:

Henrik Bettermann

Message:

New fees.

Location:

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students

Files:

• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (2 diffs)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/tests/test_browser.py

@@ -240 +240 @@
         self.assertEqual(payment.p_level, 200)
         self.assertEqual(payment.p_session, 2005)
-        self.assertEqual(payment.amount_auth, 31090.0)
+        self.assertEqual(payment.amount_auth, 38850.0)
         self.assertEqual(payment.p_item, u'CERT1')
         self.assertEqual(error, None)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py

@@ -40 +40 @@
           (
             (34400.0, 36600.0, 29500.0, 28800.0, 0.0, 38700.0, 30700.0, 29900.0, 0.0, 47250.0), # science
-            (32900.0, 35100.0, 28000.0, 27300.0, 0.0, 37200.0, 29200.0, 28400.0, 0.0, 47250.0)  # arts
+            (34400.0, 35100.0, 28000.0, 27300.0, 0.0, 37200.0, 29200.0, 28400.0, 0.0, 47250.0)  # arts
           ), # local
           (
-            (49500.0, 52100.0, 31090.0, 35900.0, 0.0, 55600.0, 33900.0, 38600.0, 0.0, 71880.0), # science
-            (48000.0, 50600.0, 29590.0, 34400.0, 0.0, 54100.0, 32400.0, 37100.0, 0.0, 71880.0)  # arts
+            (49500.0, 52100.0, 38850.0, 35900.0, 0.0, 55600.0, 40850.0, 38600.0, 0.0, 71880.0), # science
+            (49500.0, 50600.0, 37350.0, 34400.0, 0.0, 54100.0, 39350.0, 37100.0, 0.0, 71880.0)  # arts
           ), # non-local
         ), # ft
         (
           (
-            (0.0, 39400.0, 30900.0, 0.0, 30900.0, 38900.0, 31050.0, 0.0, 31050.0, 0.0), # science
-            (0.0, 37900.0, 29400.0, 0.0, 29400.0, 37400.0, 29550.0, 0.0, 29550.0, 0.0)  # arts
+            (0.0, 39400.0, 30900.0, 0.0, 30900.0, 39900.0, 31050.0, 0.0, 31050.0, 0.0), # science
+            (0.0, 37900.0, 29400.0, 0.0, 29400.0, 38400.0, 29550.0, 0.0, 29550.0, 0.0)  # arts
           ), # local
           (
@@ -63 +63 @@
 def local_nonlocal(student):
     lga = getattr(student, 'lga')
-    if lga and student.lga.startswith('kwara'):
+    if lga and lga.startswith('kwara'):
         return 'local'
     else: