From bac74236bc3572ae63346bcba05f92a72ff91830 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 13 Sep 2019 14:58:04 +0200
Subject: [PATCH 1/3] Added Auto ID Behavior for Dexterity Contents

---
 bika/lims/configure.zcml                       |  7 +++++++
 bika/lims/interfaces/__init__.py               |  5 +++++
 .../profiles/default/types/SamplingRound.xml   |  1 +
 bika/lims/subscribers/configure.zcml           |  7 +++++++
 bika/lims/subscribers/objectadded.py           | 15 +++++++++++++++
 bika/lims/subscribers/samplinground.py         | 18 ++++++++----------
 6 files changed, 43 insertions(+), 10 deletions(-)
 create mode 100644 bika/lims/subscribers/objectadded.py

diff --git a/bika/lims/configure.zcml b/bika/lims/configure.zcml
index 1eacaa6444..5cc18993eb 100644
--- a/bika/lims/configure.zcml
+++ b/bika/lims/configure.zcml
@@ -12,6 +12,13 @@
   <i18n:registerTranslations directory="locales" />
 
 
+  <!-- Plone behavior for Dexterity based contents -->
+  <plone:behavior
+      title="Auto-Generate ID Beahvior for Dexterity Contents"
+      description="Generates an ID with the IDServer"
+      provides="bika.lims.interfaces.IAutoGenerateID"
+      />
+
 <includeDependencies package="." />
 //  <include package="jarn.jsi18n" />
 //  <include package="plone.app.z3cform" />
diff --git a/bika/lims/interfaces/__init__.py b/bika/lims/interfaces/__init__.py
index 429a732aca..af08447d44 100644
--- a/bika/lims/interfaces/__init__.py
+++ b/bika/lims/interfaces/__init__.py
@@ -28,6 +28,11 @@ class IBikaLIMS(Interface):
     """
 
 
+class IAutoGenerateID(Interface):
+    """Auto-generate ID with ID server
+    """
+
+
 class IActionHandlerPool(Interface):
     """Marker interface for the ActionHandlerPool utility
     """
diff --git a/bika/lims/profiles/default/types/SamplingRound.xml b/bika/lims/profiles/default/types/SamplingRound.xml
index bf210cd049..7961863c67 100644
--- a/bika/lims/profiles/default/types/SamplingRound.xml
+++ b/bika/lims/profiles/default/types/SamplingRound.xml
@@ -87,6 +87,7 @@
     <!-- enabled behaviors -->
     <!-- This allow references between archetypes and dexterity content types. -->
     <property name="behaviors">
+        <element value="bika.lims.interfaces.IAutoGenerateID"/>
         <element value="plone.app.referenceablebehavior.referenceable.IReferenceable" />
     </property>
 </object>
diff --git a/bika/lims/subscribers/configure.zcml b/bika/lims/subscribers/configure.zcml
index 43de01edd7..5b077f6137 100644
--- a/bika/lims/subscribers/configure.zcml
+++ b/bika/lims/subscribers/configure.zcml
@@ -4,6 +4,13 @@
     xmlns:i18n="http://namespaces.zope.org/i18n"
     i18n_domain="senaite.core">
 
+  <!-- ID Server: Object Added -->
+  <subscriber
+      for="bika.lims.interfaces.IAutoGenerateID
+           zope.lifecycleevent.interfaces.IObjectAddedEvent"
+      handler=".objectadded.auto_generate_id"
+      />
+
   <!-- Audit Log: Object Created -->
   <subscriber
       for="*
diff --git a/bika/lims/subscribers/objectadded.py b/bika/lims/subscribers/objectadded.py
new file mode 100644
index 0000000000..5a73138896
--- /dev/null
+++ b/bika/lims/subscribers/objectadded.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of SENAITE.CORE
+#
+# Copyright 2018 by it's authors.
+
+from bika.lims.idserver import renameAfterCreation
+from bika.lims import logger
+
+
+def auto_generate_id(obj, event):
+    """Generate ID with the IDServer from senaite.core
+    """
+    logger.info("Auto-Generate ID for {}".format(repr(obj)))
+    renameAfterCreation(obj)
diff --git a/bika/lims/subscribers/samplinground.py b/bika/lims/subscribers/samplinground.py
index 5c2367250d..580c7e43c2 100644
--- a/bika/lims/subscribers/samplinground.py
+++ b/bika/lims/subscribers/samplinground.py
@@ -18,21 +18,19 @@
 # Copyright 2018-2019 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
-from bika.lims.idserver import renameAfterCreation
 
 def SamplingRoundAddedEventHandler(instance, event):
-    """ Event fired when BikaSetup object gets modified.
-        Since Sampling Round is a dexterity object we have to change the ID by "hand"
-        Then we have to redirect the user to the ar add form
+    """Redirect user to the sample add form
     """
     if instance.portal_type != "SamplingRound":
-        print("How does this happen: type is %s should be SamplingRound" % instance.portal_type)
-        return
-    renameAfterCreation(instance)
+        raise TypeError("Expected portal type 'SamplingRound', got '{}'"
+                        .format(instance.portal_type))
+
+    # renameAfterCreation(instance)
     num_art = len(instance.ar_templates)
     destination_url = instance.aq_parent.absolute_url() + \
-                    "/portal_factory/" + \
-                    "AnalysisRequest/Request new analyses/ar_add?samplinground=" + \
-                    instance.UID() + "&ar_count=" + str(num_art)
+        "/portal_factory/" + \
+        "AnalysisRequest/Request new analyses/ar_add?samplinground=" + \
+        instance.UID() + "&ar_count=" + str(num_art)
     request = getattr(instance, 'REQUEST', None)
     request.response.redirect(destination_url)

From 0b1c5728cc5bb8a53aa86f377124c7a8cf4733eb Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 13 Sep 2019 15:04:42 +0200
Subject: [PATCH 2/3] Changelog updated

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d3671c90fe..fb772cb26b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,7 @@ Changelog
 
 **Added**
 
+- #1441 Added Auto ID Behavior for Dexterity Contents
 - #1431 Added Submitter column in Sample's analyses listing
 - #1422 Notify user with failing addresses when emailing of results reports
 - #1420 Allow to detach a partition from its primary sample

From a96f89f54af4cbe99c06dcc3d7421d7cffaaca12 Mon Sep 17 00:00:00 2001
From: Ramon Bartl <rb@ridingbytes.com>
Date: Fri, 13 Sep 2019 15:09:52 +0200
Subject: [PATCH 3/3] Cleanup

---
 bika/lims/configure.zcml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/bika/lims/configure.zcml b/bika/lims/configure.zcml
index 5cc18993eb..f389427663 100644
--- a/bika/lims/configure.zcml
+++ b/bika/lims/configure.zcml
@@ -11,14 +11,6 @@
 
   <i18n:registerTranslations directory="locales" />
 
-
-  <!-- Plone behavior for Dexterity based contents -->
-  <plone:behavior
-      title="Auto-Generate ID Beahvior for Dexterity Contents"
-      description="Generates an ID with the IDServer"
-      provides="bika.lims.interfaces.IAutoGenerateID"
-      />
-
 <includeDependencies package="." />
 //  <include package="jarn.jsi18n" />
 //  <include package="plone.app.z3cform" />
@@ -51,6 +43,13 @@
 
   <cmf:registerDirectory name="skins" directory="skins" recursive="True" />
 
+  <!-- Plone behavior for Dexterity based contents -->
+  <plone:behavior
+      title="Auto-Generate ID Beahvior for Dexterity Contents"
+      description="Generates an ID with the IDServer"
+      provides="bika.lims.interfaces.IAutoGenerateID"
+      />
+
   <!-- jquery redirects here when values are entered into 'document' context (barcodes) -->
   <browser:page
     for="*"
@@ -97,13 +96,4 @@
       provides="bika.lims.interfaces.INumberGenerator"
       factory=".numbergenerator.NumberGenerator"
   />
-
-
-   <!-- Bika Auto generate ID behavior for Dexterity types -->
-   <plone:behavior
-        title="Auto generate ID Behavior for Dexterity contents"
-        description="Generates an ID with the IDServer"
-        provides="bika.lims.interfaces.IGenerateID"
-        />
-
 </configure>