Changeset 6932 for main/waeup.sirp

Timestamp:

24 Oct 2011, 05:33:59 (13 years ago)

Author:

Henrik Bettermann

Message:

Create empty school fee, clearance and hostel application AC batches during initialization of university instance. These batches start with 0.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• accesscodes/accesscode.py (modified) (2 diffs)
• accesscodes/browser.txt (modified) (2 diffs)
• accesscodes/tests/test_accesscode.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.py

@@ -295 +295 @@
         """Get next unused num for given prefix.
         """
-        num = 1
+        # School fee, clearance and hostel application batches start with 0.
+        # These batches are being emptily created during initialization of the
+        # university instance.
+        if prefix in ('CLR', 'SFE', 'HOS'):
+            num = 0
+        else:
+            num = 1
         while self.get('%s-%s' % (prefix, num), None) is not None:
             num += 1
@@ -379 +385 @@
 
     def setup(self, site, name, logger):
-        site['accesscodes'] = AccessCodeBatchContainer()
+        basecontainer = AccessCodeBatchContainer()
+        site['accesscodes'] = basecontainer
         logger.info('Installed container for access code batches.')
+        cost = 0.0
+        creator = 'system'
+        entry_num = 0
+        creation_date = datetime.now()
+        basecontainer.createBatch(creation_date, creator,
+            'SFE', cost,entry_num)
+        basecontainer.createBatch(creation_date, creator,
+            'CLR', cost,entry_num)
+        basecontainer.createBatch(creation_date, creator,
+            'HOS', cost,entry_num)
         return
 

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/browser.txt

@@ -50 +50 @@
 For users that have the right to manage access-code related stuff, the
 home page of a `University` instance provides a link to the
-access-code management screen. In the beginning, there are naturally
-no batches available:
+access-code management screen. In the beginning, there are already
+three empty batches available which will be filled by online payments:
 
     >>> browser.open('http://localhost/myuniversity')
@@ -61 +61 @@
     ...
     ... The following batches are available:
-    ...No batches yet...
+    ...CLR...
+    ...HOS...
+    ...SFE...
     ...
 

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_accesscode.py

@@ -288 +288 @@
         assert verifyClass(IAccessCodeBatch, AccessCodeBatch)
 
+    def test_container_contents(self):
+        assert 'SFE-0' in self.app['accesscodes']
+        assert 'HOS-0' in self.app['accesscodes']
+        assert 'CLR-0' in self.app['accesscodes']
+
     def test_csv_export(self):
         # Make sure CSV export of accesscodes works

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

@@ -115 +115 @@
         pin_container.createBatch(
             datetime.now(), 'some_userid', 'PWD', 9.99, 5)
-        pins = pin_container[pin_container.keys()[0]].values()
+        pins = pin_container['PWD-1'].values()
         self.pwdpins = [x.representation for x in pins]
         self.existing_pwdpin = self.pwdpins[0]
@@ -123 +123 @@
         pin_container.createBatch(
             datetime.now(), 'some_userid', 'CLR', 9.99, 5)
-        pins = pin_container[pin_container.keys()[0]].values()
+        pins = pin_container['CLR-1'].values()
         pins[0].owner = u'Hans Wurst'
         self.existing_clrac = pins[0]