diff --git a/bika/lims/browser/analyses.py b/bika/lims/browser/analyses.py index a7c7afa94c..c77253907b 100644 --- a/bika/lims/browser/analyses.py +++ b/bika/lims/browser/analyses.py @@ -64,6 +64,7 @@ def __init__(self, context, request, **kwargs): self.rc = getToolByName(context, REFERENCE_CATALOG) # Initializing the deximal mark variable self.dmk = '' + self.scinot = '' request.set('disable_plone.rightcolumn', 1) # each editable item needs it's own allow_edit @@ -666,15 +667,15 @@ def folderitem(self, obj, item, index): if can_view_result: full_obj = full_obj if full_obj else obj.getObject() item['Result'] = result - scinot = self.context.bika_setup.getScientificNotationResults() item['formatted_result'] = \ full_obj.getFormattedResult( - sciformat=int(scinot), decimalmark=self.dmk) + sciformat=int(self.scinot), decimalmark=self.dmk) # LIMS-1379 Allow manual uncertainty value input # https://jira.bikalabs.com/browse/LIMS-1379 fu = format_uncertainty( - full_obj, result, decimalmark=self.dmk, sciformat=int(scinot)) + full_obj, result, decimalmark=self.dmk, sciformat=int( + self.scinot)) fu = fu if fu else '' if can_edit_analysis and full_obj.getAllowManualUncertainty(): unc = full_obj.getUncertainty(result) @@ -947,11 +948,11 @@ def folderitems(self): # Getting the multi-verification type of bika_setup self.mv_type = self.context.bika_setup.getTypeOfmultiVerification() self.show_methodinstr_columns = False + self.dmk = self.context.bika_setup.getResultsDecimalMark() + self.scinot = self.context.bika_setup.getScientificNotationResults() # Gettin all the items items = super(AnalysesView, self).folderitems(classic=False) - self.dmk = self.context.bika_setup.getResultsDecimalMark() - # the TAL requires values for all interim fields on all # items, so we set blank values in unused cells for item in items: