Kalenis/kalenislims
2
1
Fork 1
mirror of https://github.com/Kalenis/kalenislims.git synced 2023-12-14 07:13:04 +01:00
Code Issues Projects Releases Wiki Activity

lims, lims_industry: add function fields (2)

Browse source
This commit is contained in:
Sebastián Marró 2020-10-26 18:30:08 -03:00
parent cfb4e6b17d
commit 2bc3fe46e5
5 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lims/notebook.py
View file

@ -45,6 +45,8 @@ class Notebook(ModelSQL, ModelView):
searcher='search_sample_field')
date2 = fields.Function(fields.Date('Date'), 'get_sample_field',
searcher='search_sample_field')
sample_comments = fields.Function(fields.Text('Sample Comments'),
'get_sample_field')
fraction_type = fields.Function(fields.Many2One('lims.fraction.type',
'Fraction type'), 'get_fraction_field',
searcher='search_fraction_field')
@ -94,6 +96,10 @@ class Notebook(ModelSQL, ModelView):
for n in notebooks:
field = getattr(n.fraction.sample, name, None)
result[name][n.id] = field.id if field else None
elif name == 'sample_comments':
for n in notebooks:
result[name][n.id] = getattr(
n.fraction.sample, 'comments', None)
else:
for n in notebooks:
result[name][n.id] = getattr(n.fraction.sample, name, None)

2
lims/results_report.py
View file

@ -931,6 +931,8 @@ class ResultsReportVersionDetailSample(ModelSQL, ModelView):
'Product type'), 'get_notebook_field')
matrix = fields.Function(fields.Many2One('lims.matrix', 'Matrix'),
'get_notebook_field')
sample_comments = fields.Function(fields.Text('Sample Comments'),
'get_notebook_field')
def get_rec_name(self, name):
return self.notebook.rec_name

2
lims_industry/notebook.py
View file

@ -20,6 +20,8 @@ class Notebook(metaclass=PoolMeta):
'get_sample_field')
equipment_serial_number = fields.Function(fields.Char(
'Equipment Serial Number'), 'get_sample_field')
equipment_name = fields.Function(fields.Char(
'Equipment Name'), 'get_sample_field')
component = fields.Function(fields.Many2One('lims.component', 'Component'),
'get_sample_field', searcher='search_sample_field')
comercial_product = fields.Function(fields.Many2One(

2
lims_industry/results_report.py
View file

@ -23,6 +23,8 @@ class ResultsReportVersionDetailSample(metaclass=PoolMeta):
'get_notebook_field')
equipment_serial_number = fields.Function(fields.Char(
'Equipment Serial Number'), 'get_notebook_field')
equipment_name = fields.Function(fields.Char(
'Equipment Name'), 'get_notebook_field')
component = fields.Function(fields.Many2One('lims.component', 'Component'),
'get_notebook_field')
comercial_product = fields.Function(fields.Many2One(

2
lims_industry/sample.py
View file

@ -34,6 +34,8 @@ class Sample(metaclass=PoolMeta):
'get_equipment_field')
equipment_serial_number = fields.Function(fields.Char(
'Equipment Serial Number'), 'get_equipment_field')
equipment_name = fields.Function(fields.Char(
'Equipment Name'), 'get_equipment_field')
component = fields.Many2One('lims.component', 'Component',
domain=[('equipment', '=', Eval('equipment'))], depends=['equipment'])
comercial_product = fields.Many2One('lims.comercial.product',