Changeset 12210 for main/waeup.ikoba/trunk/src/waeup

Timestamp:

13 Dec 2014, 08:58:43 (10 years ago)

Author:

Henrik Bettermann

Message:

Let's take the 'last transition date' from the history. Saving the date is redundant.

Location:

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

Files:

• customers/browser.py (modified) (7 diffs)
• customers/contracts.py (modified) (1 diff)
• customers/interfaces.py (modified) (1 diff)
• customers/tests/test_export.py (modified) (8 diffs)
• customers/workflow.py (modified) (2 diffs)
• documents/document.py (modified) (1 diff)
• documents/interfaces.py (modified) (1 diff)
• documents/workflow.py (modified) (2 diffs)

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

@@ -841 +841 @@
     grok.require('waeup.viewCustomer')
     grok.template('documentpage')
-    form_fields = grok.AutoFields(ICustomerDocument).omit('last_transition_date')
+    form_fields = grok.AutoFields(ICustomerDocument)
     pnav = 4
 
@@ -856 +856 @@
     grok.require('waeup.manageCustomer')
     grok.template('documenteditpage')
-    form_fields = grok.AutoFields(ICustomerDocument).omit('last_transition_date')
+    form_fields = grok.AutoFields(ICustomerDocument)
     pnav = 4
     deletion_warning = _('Are you sure?')
@@ -1008 +1008 @@
                    'suspended_comment',)
 
-    #form_fields = grok.AutoFields(ICustomerPDFDocument).omit(
-    #    'last_transition_date')
     form_fields =()
 
@@ -1180 +1178 @@
     @property
     def form_fields(self):
-        form_fields = grok.AutoFields(self.context.form_fields_interface).omit(
-            'last_transition_date')
+        form_fields = grok.AutoFields(self.context.form_fields_interface)
         for field in form_fields:
             if field.__name__.endswith('_object'):
@@ -1204 +1201 @@
     @property
     def form_fields(self):
-        return grok.AutoFields(self.context.form_fields_interface).omit(
-            'last_transition_date')
+        return grok.AutoFields(self.context.form_fields_interface)
 
     @property
@@ -1225 +1221 @@
     @property
     def form_fields(self):
-        return grok.AutoFields(self.context.edit_form_fields_interface).omit(
-            'last_transition_date')
+        return grok.AutoFields(self.context.edit_form_fields_interface)
 
     def update(self):
@@ -1354 +1349 @@
                    'suspended_comment',)
 
-    form_fields = grok.AutoFields(ISampleContract).omit(
-        'last_transition_date')
+    form_fields = grok.AutoFields(ISampleContract)
 
     @property

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

@@ -107 +107 @@
     def formatted_transition_date(self):
         try:
-            return self.last_transition_date.strftime('%Y-%m-%d %H:%M:%S')
-        except AttributeError:
+            return self.history.messages[-1].split(' - ')[0]
+        except IndexError:
             return
 

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

@@ -286 +286 @@
         )
 
-    last_transition_date = schema.Datetime(
-        title = _(u'Last Transition Date'),
-        required = False,
-        readonly = False,
-        )
-
     product_object = schema.Choice(
         title = _(u'Product'),

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

@@ -161 +161 @@
         self.assertEqual(
             result,
-            'class_name,document_id,history,last_transition_date,state,title,user_id\r\n'
-            'CustomerSampleDocument,d101,[],,,,\r\n'
+            'class_name,document_id,history,state,title,user_id\r\n'
+            'CustomerSampleDocument,d101,[],,,\r\n'
             )
         return
@@ -175 +175 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'class_name,document_id,history,last_transition_date,state,title,user_id\r\n'
+            'class_name,document_id,history,state,title,user_id\r\n'
             in result
             )
         self.assertMatches(
             '...CustomerSampleDocument,d101,[u\'2014-11-25 06:57:24 UTC - '
-            'Document created by system\'],2014-11-25 06:57:24.990308#,'
+            'Document created by system\'],'
             'verified,My Document,A111111...',
             result
@@ -194 +194 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'class_name,document_id,history,last_transition_date,state,title,user_id\r\n'
+            'class_name,document_id,history,state,title,user_id\r\n'
             in result)
         self.assertMatches(
             '...CustomerSampleDocument,d101,[u\'2014-11-25 06:57:24 UTC - '
-            'Document created by system\'],2014-11-25 06:57:24.990308#,'
+            'Document created by system\'],'
             'verified,My Document,A111111...',
             result
@@ -212 +212 @@
         result = open(self.outfile, 'rb').read()
         self.assertTrue(
-            'class_name,document_id,history,last_transition_date,state,title,user_id\r\n'
+            'class_name,document_id,history,state,title,user_id\r\n'
             in result)
         self.assertMatches(
             '...CustomerSampleDocument,d101,[u\'2014-11-25 06:57:24 UTC - '
-            'Document created by system\'],2014-11-25 06:57:24.990308#,'
+            'Document created by system\'],'
             'verified,My Document,A111111...',
             result
@@ -254 +254 @@
             result,
             'class_name,contract_category,contract_id,document_object,'
-            'history,last_product_id,last_transition_date,'
+            'history,last_product_id,'
             'product_object,state,title\r\n'
 
-            'SampleContract,sample,c101,,[],,,,,\r\n'
+            'SampleContract,sample,c101,,[],,,,\r\n'
             )
         return
@@ -270 +270 @@
         self.assertMatches(
             'class_name,contract_category,contract_id,document_object,'
-            'history,last_product_id,last_transition_date,'
+            'history,last_product_id,'
             'product_object,state,title\r\n'
 
             'SampleContract,sample,c101,d101,[u\'2014-12-04 12:10:46 UTC - '
             'Contract record created by system\'],,'
-            '2014-12-04 12:10:46.333445#,SAM,created,My Contract\r\n',
+            'SAM,created,My Contract\r\n',
             result
             )
@@ -289 +289 @@
         self.assertMatches(
             'class_name,contract_category,contract_id,document_object,'
-            'history,last_product_id,last_transition_date,'
+            'history,last_product_id,'
             'product_object,state,title\r\n'
 
             'SampleContract,sample,c101,d101,[u\'2014-12-04 12:10:46 UTC - '
             'Contract record created by system\'],,'
-            '2014-12-04 12:10:46.333445#,SAM,created,My Contract\r\n',
+            'SAM,created,My Contract\r\n',
             result
             )
@@ -308 +308 @@
         self.assertMatches(
             'class_name,contract_category,contract_id,document_object,'
-            'history,last_product_id,last_transition_date,'
+            'history,last_product_id,'
             'product_object,state,title\r\n'
 
             'SampleContract,sample,c101,d101,[u\'2014-12-04 12:10:46 UTC - '
             'Contract record created by system\'],,'
-            '2014-12-04 12:10:46.333445#,SAM,created,My Contract\r\n',
-            result
-            )
-        return
-
+            'SAM,created,My Contract\r\n',
+            result
+            )
+        return
+

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

@@ -241 +241 @@
 @grok.subscribe(IContract, IWorkflowTransitionEvent)
 def handle_contract_transition_event(obj, event):
-    """Append message to contract history and log file, also update
-    last_transition_date when transition happened.
+    """Append message to contract history and log file.
 
     Undo the approval of contract and raise an exception if contract
@@ -256 +255 @@
     history = IObjectHistory(obj)
     history.addMessage(msg)
-    obj.last_transition_date = datetime.utcnow()
     try:
         customers_container = grok.getSite()['customers']

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

@@ -86 +86 @@
     def formatted_transition_date(self):
         try:
-            return self.last_transition_date.strftime('%Y-%m-%d %H:%M:%S')
-        except AttributeError:
+            return self.history.messages[-1].split(' - ')[0]
+        except IndexError:
             return
 

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

@@ -54 +54 @@
         )
 
-    last_transition_date = schema.Datetime(
-        title = _(u'Last Transition Date'),
-        required = False,
-        readonly = False,
-        )
-
     def setMD5():
         """Determine md5 checksum of selected files and store checksums as

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

@@ -134 +134 @@
 @grok.subscribe(IDocument, IWorkflowTransitionEvent)
 def handle_document_transition_event(obj, event):
-    """Append message to document history and log file and update
-    last_transition_date when transition happened.
+    """Append message to document history and log file.
 
     Undo the verification of document and raise an exception if document
@@ -151 +150 @@
     history = IObjectHistory(obj)
     history.addMessage(msg)
-    obj.last_transition_date = datetime.utcnow()
     try:
         customers_container = grok.getSite()['customers']