Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR 2269 - Show the Unit in Manage Analyses View #281

Merged
merged 10 commits into from
Oct 24, 2017
Merged

PR 2269 - Show the Unit in Manage Analyses View #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7b88328
Added Unit column
Oct 23, 2017
225be86
Refactored view's getResultsRange
Oct 23, 2017
8b36d78
Refactored folderitems
Oct 23, 2017
884dc0e
PEP8
Oct 23, 2017
803b679
Merge branch 'senaite-integration' of https://github.com/senaite/bika…
Oct 24, 2017
16f005a
Remove priority column from manage analyses
Oct 24, 2017
ac5403c
Access service attribute directly from the analysis
Oct 24, 2017
19eee88
PEP8
Oct 24, 2017
afa93d3
Update CHANGES.rst
Oct 24, 2017
2e358d1
Avoid object wake up in getResultsRange
Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ LIMS-1504: Calculation formula test widgets
**Fixed**

- #280 Integration of PR-2271.Setting 2 or more CCContacts in AR view produces a Traceback on Save
- #281 Integration of PR-2269. Show the Unit in Manage Analyses View
**Security**


Expand Down
165 changes: 99 additions & 66 deletions bika/lims/browser/analysisrequest/manage_analyses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@
# Some rights reserved. See LICENSE.txt, AUTHORS.txt.

from AccessControl import getSecurityManager
from bika.lims import bikaMessageFactory as _
from bika.lims.utils import t, dicts_to_dict
from bika.lims.browser.bika_listing import BikaListingView
from bika.lims.browser.sample import SamplePartitionsView
from bika.lims.content.analysisrequest import schema as AnalysisRequestSchema
from bika.lims.permissions import *
from bika.lims.utils import logged_in_client
from bika.lims.utils import to_utf8
from bika.lims.workflow import doActionFor
from DateTime import DateTime
Expand All @@ -19,6 +14,14 @@
from plone.app.layout.globals.interfaces import IViewView
from Products.CMFCore.utils import getToolByName
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from bika.lims import api
from bika.lims import logger
from bika.lims.utils import t
from bika.lims.utils import dicts_to_dict
from bika.lims.utils import logged_in_client
from bika.lims import bikaMessageFactory as _
from bika.lims.browser.bika_listing import BikaListingView
from bika.lims.browser.sample import SamplePartitionsView
from zope.i18n.locales import locales
from zope.interface import implements

Expand Down Expand Up @@ -55,21 +58,39 @@ def __init__(self, context, request):
self.columns = {
'Title': {'title': _('Service'),
'index': 'title',
'sortable': False, },
'Hidden': {'title': _('Hidden'),
'sortable': False,
'type': 'boolean', },
'Price': {'title': _('Price'),
'sortable': False, },
'Partition': {'title': _('Partition'),
'sortable': False,
'type': 'choices'},
'min': {'title': _('Min')},
'max': {'title': _('Max')},
'error': {'title': _('Permitted Error %')},
'sortable': False,
},
'Unit': {
'title': _('Unit'),
'sortable': False,

},
'Hidden': {
'title': _('Hidden'),
'sortable': False,
'type': 'boolean',
},
'Price': {
'title': _('Price'),
'sortable': False,
},
'Partition': {
'title': _('Partition'),
'sortable': False,
'type': 'choices'
},
'min': {
'title': _('Min')
},
'max': {
'title': _('Max')
},
'error': {
'title': _('Permitted Error %')
},
}

columns = ['Title', 'Hidden', ]
columns = ['Title', 'Unit', 'Hidden', ]
ShowPrices = self.context.bika_setup.getShowPrices()
if ShowPrices:
columns.append('Price')
Expand All @@ -83,13 +104,14 @@ def __init__(self, context, request):
columns.append('error')

self.review_states = [
{'id': 'default',
'title': _('All'),
'contentFilter': {},
'columns': columns,
'transitions': [{'id': 'empty'}, ], # none
'custom_actions': [{'id': 'save_analyses_button',
'title': _('Save')}, ],
{
'id': 'default',
'title': _('All'),
'contentFilter': {},
'columns': columns,
'transitions': [{'id': 'empty'}, ], # none
'custom_actions': [{'id': 'save_analyses_button',
'title': _('Save')}, ],
},
]

Expand All @@ -110,6 +132,26 @@ def __init__(self, context, request):

self.parts = p.contents_table()

def get_service_by_keyword(self, keyword, default=None):
"""Get a service by keyword
"""
logger.info("Get service by keyword={}".format(keyword))
bsc = api.get_tool("bika_setup_catalog")
results = bsc(portal_type='AnalysisService',
getKeyword=keyword)
if not results:
logger.exception("No Analysis Service found for Keyword '{}'. "
"Related: LIMS-1614".format(keyword))

return default
elif len(results) > 1:
logger.exception("More than one Analysis Service found for Keyword '{}'. "
.format(keyword))

return default
else:
return api.get_object(results[0])

def getResultsRange(self):
"""Return the AR Specs sorted by Service UID, so that the JS can
work easily with the values.
Expand All @@ -125,14 +167,13 @@ def getResultsRange(self):
rr_dict_by_service_uid[service_uid] = r
except IndexError:
from bika.lims import logger
error = "No Analysis Service found for Keyword '%s'. "\
error = "No Analysis Service found for Keyword '%s'. " \
"Related: LIMS-1614"
logger.exception(error, keyword)

return json.dumps(rr_dict_by_service_uid)

def get_spec_from_ar(self, ar, keyword):
empty = {'min': '', 'max': '', 'error': '', 'keyword':keyword}
empty = {'min': '', 'max': '', 'error': '', 'keyword': keyword}
spec = ar.getResultsRange()
if spec:
return dicts_to_dict(spec, 'keyword').get(keyword, empty)
Expand Down Expand Up @@ -179,66 +220,58 @@ def folderitems(self):
'ResultText': o.getId()}
for o in parts
if wf.getInfoFor(o, 'cancellation_state', '') == 'active']
for x in range(len(items)):
if not 'obj' in items[x]:

for item in items:
if 'obj' not in item:
continue
obj = items[x]['obj']
obj = item['obj']

cat = obj.getCategoryTitle()
items[x]['category'] = cat
item['category'] = cat
if cat not in self.categories:
self.categories.append(cat)

items[x]['selected'] = items[x]['uid'] in self.selected

items[x]['class']['Title'] = 'service_title'
item['selected'] = item['uid'] in self.selected
item['class']['Title'] = 'service_title'

# js checks in row_data if an analysis may be removed.
row_data = {}
# keyword = obj.getKeyword()
# if keyword in review_states.keys() \
# and review_states[keyword] not in ['sample_due',
# 'to_be_sampled',
# 'to_be_preserved',
# 'sample_received',
# ]:
# row_data['disabled'] = True
items[x]['row_data'] = json.dumps(row_data)
item['row_data'] = json.dumps(row_data)

calculation = obj.getCalculation()
items[x]['Calculation'] = calculation and calculation.Title()
item['Calculation'] = calculation and calculation.Title()

locale = locales.getLocale('en')
currency = self.context.bika_setup.getCurrency()
symbol = locale.numbers.currencies[currency].symbol
items[x]['before']['Price'] = symbol
items[x]['Price'] = obj.getPrice()
items[x]['class']['Price'] = 'nowrap'
item['before']['Price'] = symbol
item['Price'] = obj.getPrice()
item['class']['Price'] = 'nowrap'

if items[x]['selected']:
items[x]['allow_edit'] = ['Partition', 'min', 'max', 'error']
if item['selected']:
item['allow_edit'] = ['Partition', 'min', 'max', 'error']
if not logged_in_client(self.context):
items[x]['allow_edit'].append('Price')
item['allow_edit'].append('Price')

items[x]['required'].append('Partition')
items[x]['choices']['Partition'] = partitions
item['required'].append('Partition')
item['choices']['Partition'] = partitions

if obj.UID() in self.analyses:
analysis = self.analyses[obj.UID()]
part = analysis.getSamplePartition()
part = part and part or obj
items[x]['Partition'] = part.Title()
item['Partition'] = part.Title()
spec = self.get_spec_from_ar(self.context,
analysis.getKeyword())
items[x]["min"] = spec.get("min",'')
items[x]["max"] = spec.get("max",'')
items[x]["error"] = spec.get("error",'')
items[x]['Price'] = analysis.getPrice()
item["min"] = spec.get("min", '')
item["max"] = spec.get("max", '')
item["error"] = spec.get("error", '')
item['Price'] = analysis.getPrice()
else:
items[x]['Partition'] = ''
items[x]["min"] = ''
items[x]["max"] = ''
items[x]["error"] = ''
item['Partition'] = ''
item["min"] = ''
item["max"] = ''
item["error"] = ''

after_icons = ''
if obj.getAccredited():
Expand Down Expand Up @@ -270,13 +303,13 @@ def folderitems(self):
t(_('Attachment not permitted'))
)
if after_icons:
items[x]['after']['Title'] = after_icons

item['after']['Title'] = after_icons

# Display analyses for this Analysis Service in results?
ser = self.context.getAnalysisServiceSettings(obj.UID())
items[x]['allow_edit'].append('Hidden')
items[x]['Hidden'] = ser.get('hidden', obj.getHidden())
item['allow_edit'] = ['Hidden', ]
item['Hidden'] = ser.get('hidden', obj.getHidden())
item['Unit'] = obj.getUnit()

self.categories.sort()
return items