Fix mixed sorted PoC groups depending on the sample analyses (senaite…

…#124) * Fix mixed PoC sorting depending on analyses set * Changelog updated
nepaliemr · Jul 25, 2022 · fc40ca3 · fc40ca3
1 parent 5bb3988
commit fc40ca3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/docs/Changelog.rst b/docs/Changelog.rst
@@ -1,7 +1,7 @@
 2.3.0 (unreleased)
 ------------------
 
-- no changes yet
+- #124 Fix mixed sorted PoC groups depending on the sample analyses
 
 
 2.2.0 (2022-06-10)

diff --git a/src/senaite/impress/analysisrequest/reportview.py b/src/senaite/impress/analysisrequest/reportview.py
@@ -185,7 +185,12 @@ def get_analyses_by_poc(self, model_or_collection):
         """Groups the given analyses by their point of capture
         """
         analyses = self.get_analyses(model_or_collection)
-        return self.group_items_by("PointOfCapture", analyses)
+        groups = self.group_items_by("PointOfCapture", analyses)
+        # Ensure always alphabetic sorting of PoC
+        by_poc = OrderedDict()
+        for key in sorted(groups):
+            by_poc[key] = groups[key]
+        return by_poc
 
     def get_analyses_by_category(self, model_or_collection):
         """Groups the Analyses by their Category