Changeset 14941 for main/kofacustom.coewarri/trunk/src/kofacustom

Timestamp:

22 Jan 2018, 11:57:06 (7 years ago)

Author:

Henrik Bettermann

Message:

Change all fees according to ticket comments 8 AND 4 and only according to comment 9.

Location:

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students

Files:

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

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/tests/test_browser.py

@@ -105 +105 @@
         self.assertEqual(self.student.current_session, 2005)
         # 63100 / 2 + 250
-        self.assertEqual(self.student['payments'].values()[2].amount_auth, 31800.0)
-        self.assertEqual(self.student['payments'].values()[3].amount_auth, 31800.0)
+        self.assertEqual(self.student['payments'].values()[2].amount_auth, 37600.0)
+        self.assertEqual(self.student['payments'].values()[3].amount_auth, 37600.0)
         # The last two payments belong to the same session and level.
         self.assertEqual(self.student['payments'].values()[2].p_session, 2005)

main/kofacustom.coewarri/trunk/src/kofacustom/coewarri/students/utils.py

@@ -43 +43 @@
 FEES_VALUES = (
       ( # 100      110      200      210      300      310      400      410     500  999
-        (42000.0, 42000.0, 20600.0, 20600.0, 18100.0, 18100.0,     0.0,     0.0, 0.0, 0.0), # nce_ft
-        (55200.0, 55200.0, 42200.0, 42200.0, 44700.0, 44700.0, 42200.0, 42200.0, 0.0, 0.0), # nce_pt
-        (69200.0, 69200.0, 63100.0, 63100.0, 63100.0, 63100.0, 62100.0, 62100.0, 0.0, 0.0), # ug_ft
+        (42200.0, 42200.0, 39700.0, 39700.0, 18300.0, 18300.0, 0.0, 0.0, 0.0, 0.0), # nce_ft
+        (55200.0, 55200.0, 49200.0, 49200.0, 44700.0, 44700.0, 42200.0, 42200.0, 0.0, 0.0), # nce_pt
+        (69200.0, 69200.0, 64700.0, 64700.0, 67100.0, 67100.0, 62100.0, 62100.0, 0.0, 0.0), # ug_ft
         (33200.0, 33200.0, 20000.0, 20000.0, 20000.0, 20000.0, 20000.0, 20000.0, 0.0, 0.0), # nce_we_pt
       ), # local
       ( #
-        (54600.0, 54600.0, 22600.0, 22600.0, 20100.0, 20100.0,     0.0,     0.0, 0.0, 0.0), # nce_ft
-        (55200.0, 55200.0, 42200.0, 42200.0, 44700.0, 44700.0, 42200.0, 42200.0, 0.0, 0.0), # nce_pt
-        (79200.0, 79200.0, 63100.0, 63100.0, 63100.0, 63100.0, 62100.0, 62100.0, 0.0, 0.0), # ug_ft
+        (54800.0, 54800.0, 52300.0, 52300.0, 20300.0, 20300.0, 0.0, 0.0, 0.0, 0.0), # nce_ft
+        (55200.0, 55200.0, 49200.0, 49200.0, 44700.0, 44700.0, 42200.0, 42200.0, 0.0, 0.0), # nce_pt
+        (79200.0, 79200.0, 74700.0, 74700.0, 67100.0, 67100.0, 62100.0, 62100.0, 0.0, 0.0), # ug_ft
         (33200.0, 33200.0, 20000.0, 20000.0, 20000.0, 20000.0, 20000.0, 20000.0, 0.0, 0.0), # nce_we_pt
       ), # non-local