Kalenis
/
kalenislims
mirror of https://github.com/Kalenis/kalenislims.git
2
1
Fork 1
Code Issues Projects Releases Wiki Activity

lims, lims_interface: notebook line result: show all decimals

This commit is contained in:
Adrián Bernardi 2022-01-24 09:52:22 -03:00
parent 3adbf21855
commit eb602fa2e6
3 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lims/notebook.py
View File

@ -1659,9 +1659,7 @@ class NotebookLine(ModelSQL, ModelView):
res = res.ljust(significant_digits + 2, '0')
else:
res = round(float(result), decimals)
if decimals == 0:
res = int(res)
res = str(res)
res = format(res, '.{}f'.format(decimals))
except (TypeError, ValueError):
pass
return res

18
lims/results_report.py
View File

@ -3589,8 +3589,7 @@ class ResultReport(Report):
else:
if result:
res = round(float(result), decimals)
if decimals == 0:
res = int(res)
res = format(res, '.{}f'.format(decimals))
else:
res = ''
if result_modifier == 'eq':
@ -3620,8 +3619,7 @@ class ResultReport(Report):
else:
if result:
res = round(float(result), decimals)
if decimals == 0:
res = int(res)
res = format(res, '.{}f'.format(decimals))
else:
res = ''
if result_modifier == 'eq':
@ -3673,8 +3671,7 @@ class ResultReport(Report):
else:
if converted_result and converted_result_modifier != 'ni':
res = round(float(converted_result), decimals)
if decimals == 0:
res = int(res)
res = format(res, '.{}f'.format(decimals))
if converted_result_modifier == 'low':
res = gettext(
'lims.msg_quantification_limit', loq=res)
@ -3701,8 +3698,7 @@ class ResultReport(Report):
if (not literal_result and result_modifier == 'eq' and
uncertainty and float(uncertainty) != 0):
res = round(float(uncertainty), decimals)
if decimals == 0:
res = int(res)
res = format(res, '.{}f'.format(decimals))
res = gettext(
'lims.msg_uncertainty', res=res, initial_unit='')
obs_uncert = True
@ -3728,8 +3724,7 @@ class ResultReport(Report):
if (not converted_result and uncertainty and
float(uncertainty) != 0):
res = round(float(uncertainty), decimals)
if decimals == 0:
res = int(res)
res = format(res, '.{}f'.format(decimals))
res = gettext('lims.msg_uncertainty',
res=res, initial_unit=initial_unit)
obs_uncert = True
@ -3774,8 +3769,7 @@ class ResultReport(Report):
else:
if uncertainty and float(uncertainty) != 0:
res = round(float(uncertainty), decimals)
if decimals == 0:
res = int(res)
res = format(res, '.{}f'.format(decimals))
res = gettext('lims.msg_uncertainty',
res=res, initial_unit=final_unit)
obs_uncert = True

8
lims_interface/interface.py
View File

@ -2071,12 +2071,8 @@ class Compilation(Workflow, ModelSQL, ModelView):
if not nb_line.significant_digits:
decimals = nb_line.decimals or 0
result = round(float(data[nl_field]), decimals)
if decimals == 0:
data[nl_field] = str(int(result))
else:
integer, decimal = str(result).split('.')
data[nl_field] = '%s.%s' % (integer,
decimal.ljust(decimals, '0'))
data[nl_field] = format(result,
'.{}f'.format(decimals))
if (nl_field == 'result_modifier' and
not data[nl_field]):
data[nl_field] = 'eq'