Changeset 12032 for main/waeup.ikoba/trunk/src/waeup/ikoba/documents

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/documents

Files:

• document.py (modified) (3 diffs)
• interfaces.py (modified) (2 diffs)
• utils.py (modified) (2 diffs)
• workflow.py (modified) (1 diff)

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