Changeset 12032

Timestamp:

21 Nov 2014, 18:52:43 (10 years ago)

Author:

Henrik Bettermann

Message:

Implement translated_state property correctly so that we can more easily customized customer registration and document verification state names.

Location:

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

Files:

• customers/customer.py (modified) (2 diffs)
• customers/export.py (modified) (2 diffs)
• customers/utils.py (modified) (2 diffs)
• documents/document.py (modified) (3 diffs)
• documents/interfaces.py (modified) (2 diffs)
• documents/utils.py (modified) (2 diffs)
• documents/workflow.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)

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

@@ -36 +36 @@
 from waeup.ikoba.interfaces import (
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler,
-    IIkobaUtils, registration_states_vocab, IExtFileStore,
+    IIkobaUtils, IExtFileStore,
     CREATED, REQUESTED, APPROVED)
 from waeup.ikoba.customers.export import EXPORTER_NAMES
 from waeup.ikoba.customers.interfaces import (
-    ICustomer, ICustomerNavigation, ICSVCustomerExporter)
+    ICustomer, ICustomerNavigation, ICSVCustomerExporter,
+    ICustomersUtils)
 from waeup.ikoba.customers.utils import generate_customer_id
 from waeup.ikoba.customers.documents import CustomerDocumentsContainer
@@ -126 +127 @@
     @property
     def translated_state(self):
-        state = registration_states_vocab.getTermByToken(
-            self.state).title
-        return state
+        try:
+            TRANSLATED_STATES = getUtility(ICustomersUtils).TRANSLATED_STATES
+            ts = TRANSLATED_STATES[self.state]
+            return ts
+        except KeyError:
+            return
 
     @property

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

@@ -23 +23 @@
 from zope.component import getUtility
 from waeup.ikoba.interfaces import (
-    IExtFileStore, IFileStoreNameChooser, IIkobaUtils)
+    IExtFileStore, IFileStoreNameChooser)
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.customers.catalog import CustomersQuery
@@ -147 +147 @@
             ICustomerDocument,
             exclude_attribs=False,
-            omit=['is_editable']))) + (
+            omit=['is_editable', 'translated_state']))) + (
             'customer_id',)
 

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

@@ -19 +19 @@
 """
 import grok
-from waeup.ikoba.interfaces import STARTED, APPROVED
+from waeup.ikoba.interfaces import MessageFactory as _
+from waeup.ikoba.interfaces import CREATED, STARTED, REQUESTED, APPROVED
 from waeup.ikoba.customers.interfaces import ICustomersUtils
 
@@ -41 +42 @@
 
     DOCMANAGE_STATES = (APPROVED,)
+
+    TRANSLATED_STATES = {
+        CREATED: _('created'),
+        STARTED: _('started'),
+        REQUESTED: _('requested'),
+        APPROVED: _('approved'),
+        }

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/document.py

@@ -32 +32 @@
 from waeup.ikoba.utils.helpers import attrs_to_fields, get_current_principal
 from waeup.ikoba.utils.logger import Logger
-from waeup.ikoba.documents.interfaces import IDocument, IDocument
+from waeup.ikoba.documents.interfaces import (
+    IDocument, IDocument, IDocumentsUtils)
 from waeup.ikoba.documents.utils import generate_document_id
 
@@ -52 +53 @@
         return
 
-    #def __init__(self):
-    #    super(Document, self).__init__()
-    #    timestamp = ("%d" % int(time()*10000))[1:]
-    #    self.document_id = "d%s" % timestamp
-     #   return
-
     def __init__(self):
         super(Document, self).__init__()
@@ -76 +71 @@
         state = IWorkflowState(self).getState()
         return state
+
+    @property
+    def translated_state(self):
+        try:
+            TRANSLATED_STATES = getUtility(IDocumentsUtils).TRANSLATED_STATES
+            ts = TRANSLATED_STATES[self.state]
+            return ts
+        except KeyError:
+            return
 
 Document = attrs_to_fields(Document)

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/interfaces.py

@@ -19 +19 @@
 from zope import schema
 from waeup.ikoba.interfaces import (
-    IIkobaObject, SimpleIkobaVocabulary, 
+    IIkobaObject,
     ContextualDictSourceFactoryBase)
 from waeup.ikoba.interfaces import MessageFactory as _
+
 
 class DocumentTypeSource(ContextualDictSourceFactoryBase):
@@ -46 +47 @@
     history = Attribute('Object history, a list of messages')
     state = Attribute('Returns the verification state of a document')
+    translated_state = Attribute(
+        'Returns a translated, more verbose verification state of a document')
 
     title = schema.TextLine(

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

@@ -19 +19 @@
 """
 import grok
+from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.documents.workflow import CREATED
 from waeup.ikoba.documents.interfaces import IDocumentsUtils
+from waeup.ikoba.documents.workflow import (
+    CREATED, SUBMITTED,
+    VERIFIED, REJECTED, OUTDATED)
 
 
@@ -34 +38 @@
 
     DOCMANAGE_STATES = (CREATED,)
+
+    TRANSLATED_STATES = {
+        CREATED: _('document created'),
+        SUBMITTED: _('document submitted'),
+        VERIFIED: _('document verified'),
+        REJECTED: _('document rejected'),
+        OUTDATED:_('document outdated')
+        }

main/waeup.ikoba/trunk/src/waeup/ikoba/documents/workflow.py

@@ -24 +24 @@
 from hurry.workflow.interfaces import IWorkflowState, IWorkflowTransitionEvent
 from waeup.ikoba.interfaces import (
-    IObjectHistory, IIkobaWorkflowInfo, IIkobaUtils)
+    IObjectHistory, IIkobaWorkflowInfo,
+    SimpleIkobaVocabulary)
 from waeup.ikoba.interfaces import MessageFactory as _
 from waeup.ikoba.workflow import IkobaWorkflow, IkobaWorkflowInfo

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

@@ -83 +83 @@
 application_sessions_vocab = SimpleIkobaVocabulary(*application_sessions())
 
-registration_states_vocab = SimpleIkobaVocabulary(
-    (_('created'), CREATED),
-    (_('started'), STARTED),
-    (_('requested'), REQUESTED),
-    (_('approved'), APPROVED),
-    )
-
 class ContextualDictSourceFactoryBase(SmartBasicContextualSourceFactory):
     """A base for contextual sources based on IkobaUtils dicts.