Changeset 9267

Timestamp:

2 Oct 2012, 07:34:48 (12 years ago)

Author:

Henrik Bettermann

Message:

Check counters (used_num and disabled_num) in test.

Display disabled_num on batchcontainer page.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes

Files:

• batching.py (modified) (2 diffs)
• browser.txt (modified) (1 diff)
• browser_templates/batchcontainer.pt (modified) (2 diffs)
• tests/test_batching.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/batching.py

@@ -187 +187 @@
         items_changed = ''
         # Update state
+        # Attention: When importing states the counters remain unchanged.
         if row.has_key('state'):
             state = row.get('state', IGNORE_MARKER)
@@ -196 +197 @@
                 IObjectHistory(obj).addMessage(msg)
             row.pop('state')
-        # Fire transition
+        # Trigger transition. Counters are properly changed.
         if row.has_key('transition'):
             transition = row.get('transition', IGNORE_MARKER)

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

@@ -114 +114 @@
     ...
     ...5
-    .../
+    ...
     ...0
     ...

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser_templates/batchcontainer.pt

@@ -8 +8 @@
         <th>&nbsp;</th>
         <th i18n:translate="">Prefix</th>
-        <th i18n:translate="">Entries/(invalidated)</th>
+        <th i18n:translate="">Entries</th>
+        <th i18n:translate="">Used</th>
+        <th i18n:translate="">Disabled</th>
         <th i18n:translate="">Cost</th>
         <th i18n:translate="">Date of Creation</th>
@@ -28 +30 @@
   <td>
     <span tal:replace="batch/entry_num">1012</span>
-    /
+  </td>
+  <td>
     <span tal:replace="batch/used_num">512</span>
+  </td>
+  <td>
+    <span tal:replace="batch/disabled_num">112</span>
   </td>
   <td tal:content="batch/cost">12.12</td>

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_batching.py

@@ -180 +180 @@
             self.csv_file, AC_HEADER_FIELDS)
 
+        self.assertEqual(self.app['accesscodes']['HOS-1'].used_num, 1)
+        self.assertEqual(self.app['accesscodes']['HOS-1'].disabled_num, 0)
+        self.assertEqual(self.app['accesscodes']['CLR-1'].used_num, 1)
+        self.assertEqual(self.app['accesscodes']['CLR-1'].disabled_num, 0)
+
         self.csv_file = os.path.join(self.workdir, 'sample_ac_data_update.csv')
         open(self.csv_file, 'wb').write(AC_SAMPLE_DATA_UPDATE)
@@ -200 +205 @@
             "|<YYYY-MM-DD hh:mm:ss> UTC - used by system|"
             "|<YYYY-MM-DD hh:mm:ss> UTC - disabled by system")
+        # When importing transitions the counters are properly set.
+        self.assertEqual(self.app['accesscodes']['HOS-1'].used_num, 0)
+        self.assertEqual(self.app['accesscodes']['HOS-1'].disabled_num, 1)
+        # When importing states the counters remain unchanged.
+        self.assertEqual(self.app['accesscodes']['CLR-1'].used_num, 1)
+        self.assertEqual(self.app['accesscodes']['CLR-1'].disabled_num, 0)
         return