Changeset 9874 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

12 Jan 2013, 08:51:37 (12 years ago)

Author:

Henrik Bettermann

Message:

Balance must not be negative or zero.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

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

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -791 +791 @@
     balance_amount = schema.Float(
         title = _(u'Balance Amount'),
-        default = 0.0,
+        default = None,
         required = True,
         readonly = False,

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

@@ -2399 +2399 @@
         self.browser.getControl(name="form.balance_session").value = ['2004']
         self.browser.getControl(name="form.balance_level").value = ['300']
+        self.browser.getControl(name="form.balance_amount").value = '-567.8'
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Amount must be greater than 0...',
+                           self.browser.contents)
+        self.browser.getControl(name="form.balance_amount").value = '0'
+        self.browser.getControl("Create ticket").click()
+        self.assertMatches('...Amount must be greater than 0...',
+                           self.browser.contents)
         self.browser.getControl(name="form.balance_amount").value = '567.8'
         self.browser.getControl("Create ticket").click()

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

@@ -434 +434 @@
         if academic_session == None:
             return _(u'Session configuration object is not available.'), None
-        if amount in (0.0, None):
-            return _('Amount could not be determined.'), None
+        if amount in (0.0, None) or amount < 0:
+            return _('Amount must be greater than 0.'), None
         for key in student['payments'].keys():
             ticket = student['payments'][key]