Changeset 12283 for main

Timestamp:

21 Dec 2014, 11:26:41 (10 years ago)

Author:

Henrik Bettermann

Message:

Make selection of processors and exporters customizable.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba

Files:

• browser/pages.py (modified) (3 diffs)
• customers/batching.py (modified) (1 diff)
• customers/export.py (modified) (1 diff)
• customers/tests/test_batching.py (modified) (1 diff)
• utils/utils.py (modified) (2 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/browser/pages.py

@@ -964 +964 @@
     def getImporters(self):
         importers = getAllUtilitiesRegisteredFor(IBatchProcessor)
+        ikoba_utils = getUtility(IIkobaUtils)
         importer_props = []
         for x in importers:
+            if not x.util_name in ikoba_utils.BATCH_PROCESSOR_NAMES:
+                continue
             iface_fields = schema.getFields(x.iface)
             available_fields = []
@@ -1085 +1088 @@
     def getImporters(self):
         importers = getAllUtilitiesRegisteredFor(IBatchProcessor)
+        ikoba_utils = getUtility(IIkobaUtils)
         importers = sorted(
-            [dict(title=x.name, name=x.util_name) for x in importers])
+            [dict(title=x.name, name=x.util_name) for x in importers
+            if x.util_name in ikoba_utils.BATCH_PROCESSOR_NAMES])
         return importers
 
@@ -1439 +1444 @@
 
     def getExporters(self):
-        utils = getUtilitiesFor(ICSVExporter)
+        exporter_utils = getUtilitiesFor(ICSVExporter)
+        ikoba_utils = getUtility(IIkobaUtils)
         title_name_tuples = [
-            (util.title, name) for name, util in utils]
+            (util.title, name) for name, util in exporter_utils
+            if name in ikoba_utils.EXPORTER_NAMES]
         return sorted(title_name_tuples)
 

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/batching.py

@@ -560 +560 @@
     grok.name(util_name)
 
-    name = _('Sample Contract Processor')
+    name = _('Customer Sample Contract Processor')
     iface = ISampleContract
     factory_name = 'waeup.SampleContract'

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/export.py

@@ -247 +247 @@
     iface = ISampleContract
     class_name = 'SampleContract'
-    title = _(u'Sample Contracts')
+    title = _(u'Customer Sample Contracts')

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_batching.py

@@ -502 +502 @@
             if len(i) > 10][0]
         self.assertTrue(
-            'INFO - system - Sample Contract Processor - sample_contract_data - '
+            'INFO - system - Customer Sample Contract Processor - sample_contract_data - '
             'X666666 - %s - updated: title=My 4th contract, '
             'product_object=SAM, document_object=DOC1' % conid

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/utils.py

@@ -29 +29 @@
 from waeup.ikoba.smtp import send_mail as send_mail_internally
 from waeup.ikoba.utils.helpers import get_sorted_preferred
+from waeup.ikoba.customers.export import EXPORTER_NAMES as CUSTOMER_EXPORTER_NAMES
 
 
@@ -137 +138 @@
         'cpu-load': 100.0,
         }
+
+    EXPORTER_NAMES = CUSTOMER_EXPORTER_NAMES + (
+        'pdfdocuments',
+        'htmldocuments',
+        'users',
+        'products')
+
+    BATCH_PROCESSOR_NAMES = (
+        'customerprocessor',
+        'customersampledocumentprocessor',
+        'samplecontractprocessor',
+        'productprocessor',
+        'pdfdocumentprocessor',
+        'htmldocumentprocessor',
+        'userprocessor')
 
     def sendContactForm(self, from_name, from_addr, rcpt_name, rcpt_addr,