Apply category sort order on analysis specifications #2191
Conversation
| """Sort by Categories | ||
| """ | ||
|
|
||
| bsc = getToolByName(self.context, "senaite_catalog_setup") |
There was a problem hiding this comment.
Please use simply catalog as variable, because this catalog is no longer named bika_setup_catalog. You might also consider to use api.get_tool instead of getToolByName
|
|
||
| if self.show_categories_enabled(): | ||
| self.categories = map(lambda x: x[0], | ||
| sorted(self.categories, key=lambda x: x[1])) |
There was a problem hiding this comment.
Ok, above you have already all categories in the right order. It would make more sense to simply filter out those that are not found instead of sorting the found ones afterwards.
Use therefore the built in filter function of Python, e.g. like this:
from bika.lims import api
from senaite.core.catalog import SETUP_CATALOG
catalog = api.get_tool(SETUP_CATALOG)
all_categories = catalog({"portal_type": "AnalysisCategory", "sort_on: "sortable_title"})
sorted_categories = filter(lambda cat: api.get_title(cat) in self.found_categories, all_categories)
self.categories = map(api.get_object, sorted_categories)Note: This code is not tested;)
| if category not in self.categories: | ||
| self.categories.append(category) | ||
| if (category,cat_order) not in self.categories: | ||
| self.categories.append((category,cat_order)) |
There was a problem hiding this comment.
Please simply collect here the category title in a instance variable, e.g.:
if category not in self.found_categories:
self.found_categories.append(category)
This one is used later to filter out the already sorted categories.
|
Hi @anneline, what is the status of this PR? |
anneline
force-pushed
the
sort-cats-analysisspec
branch
from
e24f862
to
425244d
Compare
|
Updated as requested. Thanks Ramon. |
|
Hi @anneline, did you commit the changes? I do not see any difference to the last time... |
|
Please also ensure that the tests are passing, thanks! |
anneline
force-pushed
the
sort-cats-analysisspec
branch
from
0e7e4f0
to
1541f72
Compare
|
Done. Lint error removed. |
|
Hi @anneline, the requested changes are not here: https://github.com/senaite/senaite.core/pull/2191/files Please change the code as requested in the comments above and commit/push the changes to this repository again. |
Description of the issue/feature this PR addresses
Linked issue: https://github.com/senaite/senaite.core/issues/
Current behavior before PR
In analysis specification edit, analysis service categories were sorted alphabetically
Desired behavior after PR is merged
In analysis specification edit, analysis service categories sorted by sort key
I confirm I have tested this PR thoroughly and coded it according to PEP8
and Plone's Python styleguide standards.