Compliance of Analyses from Samples with Specification

CHANGES.rst

@@ -7,6 +7,9 @@ Changelog
 
 **Added**
 
+- #1506 Specification non-compliant viewlet in Sample
+- #1506 Sample results ranges out-of-date viewlet in Sample
+- #1506 Warn icon in analyses when range is not compliant with Specification
 - #1492 Dynamic Analysis Specifications
 - #1507 Support for semi-colon character separator in CCEmails field
 - #1499 Moved navigation portlet into core 
@@ -36,6 +39,9 @@ Changelog
 
 **Fixed**
 
+- #1506 Changes via manage results don't get applied to partitions
+- #1506 Fix recursion error when getting dependencies through Calculation
+- #1506 setter from ARAnalysisField does no longer return values
 - #1512 QC Analyses listing appears empty in Sample view
 - #1510 Error when viewing a Sample w/o Batch as client contact
 - #1511 Links to partitions for Internal Use are displayed in partitions viewlet

bika/lims/api/analysis.py

@@ -27,6 +27,8 @@
     IResultOutOfRange
 from zope.component._api import getAdapters
 
+from bika.lims.interfaces.analysis import IRequestAnalysis
+
 
 def is_out_of_range(brain_or_object, result=_marker):
     """Checks if the result for the analysis passed in is out of range and/or
@@ -148,3 +150,33 @@ def get_formatted_interval(results_range, default=_marker):
     max_bracket = max_operator == 'leq' and ']' or ')'
 
     return "{}{};{}{}".format(min_bracket, min_str, max_str, max_bracket)
+
+
+def is_result_range_compliant(analysis):
+    """Returns whether the result range from the analysis matches with the
+    result range for the service counterpart defined in the Sample
+    """
+    if not IRequestAnalysis.providedBy(analysis):
+        return True
+
+    rr = analysis.getResultsRange()
+    service_uid = rr.get("uid", None)
+    if not api.is_uid(service_uid):
+        return True
+
+    # Compare with Sample
+    sample = analysis.getRequest()
+
+    # If no Specification is set, assume is compliant
+    specification = sample.getRawSpecification()
+    if not specification:
+        return True
+
+    # Compare with the Specification that was initially set to the Sample
+    sample_rr = sample.getResultsRange(search_by=service_uid)
+    if not sample_rr:
+        # This service is not defined in Sample's ResultsRange, we
+        # assume this *does not* break the compliance
+        return True
+
+    return rr == sample_rr

bika/lims/browser/analyses/view.py

@@ -25,11 +25,15 @@
 from DateTime import DateTime
 from Products.Archetypes.config import REFERENCE_CATALOG
 from Products.CMFPlone.utils import safe_unicode
+from plone.memoize import view as viewcache
+from zope.component import getAdapters
+
 from bika.lims import api
 from bika.lims import bikaMessageFactory as _
 from bika.lims import logger
 from bika.lims.api.analysis import get_formatted_interval
 from bika.lims.api.analysis import is_out_of_range
+from bika.lims.api.analysis import is_result_range_compliant
 from bika.lims.browser.bika_listing import BikaListingView
 from bika.lims.catalog import CATALOG_ANALYSIS_LISTING
 from bika.lims.config import LDL
@@ -51,8 +55,6 @@
 from bika.lims.utils import get_link
 from bika.lims.utils import t
 from bika.lims.utils.analysis import format_uncertainty
-from plone.memoize import view as viewcache
-from zope.component import getAdapters
 
 
 class AnalysesView(BikaListingView):
@@ -1033,13 +1035,25 @@ def _folder_item_specifications(self, analysis_brain, item):
 
         # Show an icon if out of range
         out_range, out_shoulders = is_out_of_range(analysis_brain)
-        if not out_range:
-            return
-        # At least is out of range
-        img = get_image("exclamation.png", title=_("Result out of range"))
-        if not out_shoulders:
-            img = get_image("warning.png", title=_("Result in shoulder range"))
-        self._append_html_element(item, "Result", img)
+        if out_range:
+            msg = _("Result out of range")
+            img = get_image("exclamation.png", title=msg)
+            if not out_shoulders:
+                msg = _("Result in shoulder range")
+                img = get_image("warning.png", title=msg)
+            self._append_html_element(item, "Result", img)
+
+        # Show an icon if the analysis range is different from the Sample spec
+        if IAnalysisRequest.providedBy(self.context):
+            analysis = self.get_object(analysis_brain)
+            if not is_result_range_compliant(analysis):
+                service_uid = analysis_brain.getServiceUID
+                original = self.context.getResultsRange(search_by=service_uid)
+                original = get_formatted_interval(original, "")
+                msg = _("Result range is different from Specification: {}"
+                        .format(original))
+                img = get_image("warning.png", title=msg)
+                self._append_html_element(item, "Specification", img)
 
     def _folder_item_verify_icons(self, analysis_brain, item):
         """Set the analysis' verification icons to the item passed in.

bika/lims/browser/analysisrequest/add2.py

@@ -1670,7 +1670,7 @@ def ajax_submit(self):
                     client,
                     self.request,
                     record,
-                    specifications=specifications
+                    results_ranges=specifications
                 )
             except (KeyError, RuntimeError) as e:
                 actions.resume()

bika/lims/browser/analysisrequest/manage_analyses.py

@@ -142,12 +142,24 @@ def show_ar_specs(self):
 
     @view.memoize
     def get_results_range(self):
-        """Get the results Range from the AR
+        """Get the results Range from the Sample, but gives priority to the
+        result ranges set in analyses. This guarantees that result ranges for
+        already present analyses are not overriden after form submission
         """
-        spec = self.context.getResultsRange()
-        if spec:
-            return dicts_to_dict(spec, "keyword")
-        return ResultsRangeDict()
+        # Extract the result ranges from Sample analyses
+        analyses = self.analyses.values()
+        analyses_rrs = map(lambda an: an.getResultsRange(), analyses)
+        analyses_rrs = filter(None, analyses_rrs)
+        rrs = dicts_to_dict(analyses_rrs, "keyword")
+
+        # Bail out ranges from Sample that are already present in analyses
+        sample_rrs = self.context.getResultsRange()
+        sample_rrs = filter(lambda rr: rr["keyword"] not in rrs, sample_rrs)
+        sample_rrs = dicts_to_dict(sample_rrs, "keyword")
+
+        # Extend result ranges with those from Sample
+        rrs.update(sample_rrs)
+        return rrs
 
     @view.memoize
     def get_currency_symbol(self):

bika/lims/browser/configure.zcml

@@ -11,7 +11,6 @@
   <include file="analysisprofile.zcml"/>
   <include file="analysisreport.zcml"/>
   <include file="analysisservice.zcml"/>
-  <include file="analysisspec.zcml"/>
   <include file="arimports.zcml"/>
   <include file="artemplate.zcml"/>
   <include file="attachment.zcml"/>

bika/lims/browser/fields/__init__.py

@@ -30,3 +30,5 @@
 from .proxyfield import ProxyField
 from .uidreferencefield import UIDReferenceField
 from .emailsfield import EmailsField
+from .resultrangefield import ResultRangeField
+from .resultsrangesfield import ResultsRangesField