Allow to edit Profiles in Samples for pre verified/published states

CHANGES.rst

@@ -4,6 +4,7 @@ Changelog
 2.0.0rc2 (unreleased)
 ---------------------
 
+- #1657 Allow to edit Profiles in Samples for pre verified/published states
 - #1655 Rename service's "Result Options" and "Additional Values"
 - #1655 Move service's "Additional values" to "Result Options" tab
 - #1654 Fix Text of interim choices is not displayed correctly on readonly mode

src/bika/lims/content/analysisrequest.py

@@ -1465,6 +1465,34 @@ def setResultsRange(self, value, recursive=True):
                 if check_permission(permission, descendant):
                     descendant.setResultsRange(value)
 
+    def setProfiles(self, value):
+        """Set Analysis Profiles to the Sample
+        """
+        if not isinstance(value, (list, tuple)):
+            value = [value]
+        # filter out empties
+        value = filter(None, value)
+        # ensure we have UIDs
+        uids = map(api.get_uid, value)
+        # get the current set profiles
+        current_profiles = self.getRawProfiles()
+        # return immediately if nothing changed
+        if current_profiles == uids:
+            return
+        # get the profiles
+        profiles = map(api.get_object_by_uid, uids)
+        # get the current set of analyses/services
+        analyses = self.getAnalyses(full_objects=True)
+        services = map(lambda an: an.getAnalysisService(), analyses)
+        # determine all the services to add
+        services_to_add = set(services)
+        for profile in profiles:
+            services_to_add.update(profile.getService())
+        # set all analyses
+        self.setAnalyses(list(services_to_add))
+        # set the profiles value
+        self.getField("Profiles").set(self, value)
+
     def getClient(self):
         """Returns the client this object is bound to. We override getClient
         from ClientAwareMixin because the "Client" schema field is only used to

src/bika/lims/profiles/default/workflows/bika_ar_workflow/definition.xml

@@ -242,8 +242,7 @@
     <permission-map name="senaite.core: Field: Edit Preservation" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Preserver" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Priority" acquired="True"/>
-    <!-- Make the field 'Profiles' readonly -->
-    <permission-map name="senaite.core: Field: Edit Profiles" acquired="False"/>
+    <permission-map name="senaite.core: Field: Edit Profiles" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Publication Specification" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Rejection Reasons" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Remarks" acquired="True"/>
@@ -340,8 +339,7 @@
     <permission-map name="senaite.core: Field: Edit Preservation" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Preserver" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Priority" acquired="True"/>
-    <!-- Make the field 'Profiles' readonly -->
-    <permission-map name="senaite.core: Field: Edit Profiles" acquired="False"/>
+    <permission-map name="senaite.core: Field: Edit Profiles" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Publication Specification" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Rejection Reasons" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Remarks" acquired="True"/>
@@ -428,8 +426,7 @@
     <permission-map name="senaite.core: Field: Edit Preservation" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Preserver" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Priority" acquired="True"/>
-    <!-- Make the field 'Profiles' readonly -->
-    <permission-map name="senaite.core: Field: Edit Profiles" acquired="False"/>
+    <permission-map name="senaite.core: Field: Edit Profiles" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Publication Specification" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Rejection Reasons" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Remarks" acquired="True"/>
@@ -515,8 +512,7 @@
     <permission-map name="senaite.core: Field: Edit Preservation" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Preserver" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Priority" acquired="True"/>
-    <!-- Make the field 'Profiles' readonly -->
-    <permission-map name="senaite.core: Field: Edit Profiles" acquired="False"/>
+    <permission-map name="senaite.core: Field: Edit Profiles" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Publication Specification" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Rejection Reasons" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Remarks" acquired="True"/>
@@ -598,8 +594,7 @@
     <permission-map name="senaite.core: Field: Edit Preservation" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Preserver" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Priority" acquired="True"/>
-    <!-- Make the field 'Profiles' readonly -->
-    <permission-map name="senaite.core: Field: Edit Profiles" acquired="False"/>
+    <permission-map name="senaite.core: Field: Edit Profiles" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Publication Specification" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Rejection Reasons" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Remarks" acquired="True"/>
@@ -691,8 +686,7 @@
     <permission-map name="senaite.core: Field: Edit Preservation" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Preserver" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Priority" acquired="True"/>
-    <!-- Make the field 'Profiles' readonly -->
-    <permission-map name="senaite.core: Field: Edit Profiles" acquired="False"/>
+    <permission-map name="senaite.core: Field: Edit Profiles" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Publication Specification" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Rejection Reasons" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Remarks" acquired="True"/>
@@ -776,8 +770,7 @@
     <permission-map name="senaite.core: Field: Edit Preservation" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Preserver" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Priority" acquired="True"/>
-    <!-- Make the field 'Profiles' readonly -->
-    <permission-map name="senaite.core: Field: Edit Profiles" acquired="False"/>
+    <permission-map name="senaite.core: Field: Edit Profiles" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Publication Specification" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Rejection Reasons" acquired="True"/>
     <permission-map name="senaite.core: Field: Edit Remarks" acquired="True"/>

src/senaite/core/upgrade/v02_00_000.py

@@ -19,10 +19,12 @@
 # Some rights reserved, see README and LICENSE.
 
 from bika.lims import api
+from bika.lims.catalog import CATALOG_ANALYSIS_REQUEST_LISTING
 from bika.lims.catalog import SETUP_CATALOG
 from bika.lims.setuphandlers import add_dexterity_setup_items
 from senaite.core import logger
 from senaite.core.config import PROJECTNAME as product
+from senaite.core.setuphandlers import _run_import_step
 from senaite.core.upgrade import upgradestep
 from senaite.core.upgrade.utils import UpgradeUtils
 
@@ -68,15 +70,21 @@ def upgrade(tool):
     # Install the new SENAITE CORE package
     install_senaite_core(portal)
 
-    # Add Interpretation Template(s) content type
     setup.runImportStepFromProfile(profile, "typeinfo")
-    setup.runImportStepFromProfile(profile, "workflow")
+    # N.B.: We use `_run_import_step` to run profiles which are still located
+    # in the `bika.lims` profile!
+    _run_import_step(portal, "typeinfo", profile="profile-bika.lims:default")
+    _run_import_step(portal, "workflow", profile="profile-bika.lims:default")
+
     add_dexterity_setup_items(portal)
 
     # Published results tab is not displayed to client contacts
     # https://github.com/senaite/senaite.core/pull/1638
     fix_published_results_permission(portal)
 
+    # Update workflow mappings for samples to allow profile editing
+    update_workflow_mappings_samples(portal)
+
     logger.info("{0} upgraded to version {1}".format(product, version))
     return True
 
@@ -140,3 +148,36 @@ def fix_published_results_permission(portal):
         if action.id == "published_results":
             action.permissions = ("View", )
             break
+
+
+def update_workflow_mappings_samples(portal):
+    """Allow to edit analysis profiles
+    """
+    logger.info("Updating role mappings for Samples ...")
+    wf_id = "bika_ar_workflow"
+    query = {"portal_type": "AnalysisRequest",
+             "review_state": [
+                 "sample_due",
+                 "sample_registered",
+                 "scheduled_sampling",
+                 "to_be_sampled",
+                 "sample_received",
+                 "attachment_due",
+                 "to_be_verified"
+                 "to_be_preserved",
+             ]}
+    brains = api.search(query, CATALOG_ANALYSIS_REQUEST_LISTING)
+    update_workflow_mappings_for(portal, wf_id, brains)
+    logger.info("Updating role mappings for Samples [DONE]")
+
+
+def update_workflow_mappings_for(portal, wf_id, brains):
+    wf_tool = api.get_tool("portal_workflow")
+    workflow = wf_tool.getWorkflowById(wf_id)
+    total = len(brains)
+    for num, brain in enumerate(brains):
+        if num and num % 100 == 0:
+            logger.info("Updating role mappings: {0}/{1}".format(num, total))
+        obj = api.get_object(brain)
+        workflow.updateRoleMappingsFor(obj)
+        obj.reindexObject(idxs=["allowedRolesAndUsers"])