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

lims, lims_analysis_sheet, lims_diagnosis: handle result report lines without notebook line

This commit is contained in:
Adrián Bernardi 2020-12-21 17:08:05 -03:00
parent cba3414587
commit a591d071cc
5 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lims/notebook.py
View File

@ -292,6 +292,7 @@ class Notebook(ModelSQL, ModelView):
('detail_sample.version_detail.laboratory', '=', laboratory_id),
('detail_sample.version_detail.state', 'in', ['draft', 'revised']),
('detail_sample.version_detail.type', '!=', 'preliminary'),
('notebook_line', '!=', None),
])
if draft_lines:
draft_lines_ids = [dl.notebook_line.id for dl in draft_lines]
@ -386,6 +387,7 @@ class Notebook(ModelSQL, ModelView):
('detail_sample.version_detail.laboratory', '=', laboratory_id),
('detail_sample.version_detail.state', 'in', ['draft', 'revised']),
('detail_sample.version_detail.type', '!=', 'preliminary'),
('notebook_line', '!=', None),
])
if draft_lines:
draft_lines_ids = [dl.notebook_line.id for dl in draft_lines]
@ -507,6 +509,7 @@ class Notebook(ModelSQL, ModelView):
('detail_sample.version_detail.laboratory', '=', laboratory_id),
('detail_sample.version_detail.state', 'in', ['draft', 'revised']),
('detail_sample.version_detail.type', '!=', 'preliminary'),
('notebook_line', '!=', None),
])
if draft_lines:
draft_lines_ids = [dl.notebook_line.id for dl in draft_lines]
@ -635,6 +638,7 @@ class Notebook(ModelSQL, ModelView):
('detail_sample.version_detail.laboratory', '=', laboratory_id),
('detail_sample.version_detail.state', 'in', ['draft', 'revised']),
('detail_sample.version_detail.type', '!=', 'preliminary'),
('notebook_line', '!=', None),
])
if draft_lines:
draft_lines_ids = [dl.notebook_line.id for dl in draft_lines]

4
lims/planification.py
View File

@ -3901,9 +3901,9 @@ class SearchFractions(Wizard):
planification_details = PlanificationServiceDetail.search([
('planification.state', '=', 'preplanned'),
('notebook_line', '!=', None),
])
planned_lines = [pd.notebook_line.id for pd in planification_details
if pd.notebook_line]
planned_lines = [pd.notebook_line.id for pd in planification_details]
planned_lines_ids = ', '.join(str(x) for x in [0] + planned_lines)
preplanned_where = 'AND nl.id NOT IN (%s) ' % planned_lines_ids

39
lims/results_report.py
View File

@ -744,6 +744,8 @@ class ResultsReportVersionDetail(ModelSQL, ModelView):
linked_entry_details = []
for sample in detail.samples:
for nline in sample.notebook_lines:
if not nline.notebook_line:
continue
linked_lines.append(nline.notebook_line.id)
linked_entry_details.append(
nline.notebook_line.analysis_detail.id)
@ -846,6 +848,8 @@ class ResultsReportVersionDetail(ModelSQL, ModelView):
unlinked_entry_details = []
for sample in detail.samples:
for nline in sample.notebook_lines:
if not nline.notebook_line:
continue
unlinked_lines.append(nline.notebook_line.id)
unlinked_entry_details.append(
nline.notebook_line.analysis_detail.id)
@ -1123,7 +1127,7 @@ class ResultsReportVersionDetailSample(ModelSQL, ModelView):
'notebook_line': nline.notebook_line.id,
'hide': nline.hide,
'corrected': nline.corrected,
} for nline in sample.notebook_lines]
} for nline in sample.notebook_lines if nline.notebook_line]
if notebook_lines:
sample_default['notebook_lines'] = [('create', notebook_lines)]
return sample_default
@ -1153,7 +1157,7 @@ class ResultsReportVersionDetailLine(ModelSQL, ModelView):
'lims.results_report.version.detail.sample', 'Sample Detail',
required=True, ondelete='CASCADE', select=True)
notebook_line = fields.Many2One('lims.notebook.line', 'Notebook Line',
required=True, readonly=True, select=True)
readonly=True, select=True)
hide = fields.Boolean('Hide in Report')
corrected = fields.Boolean('Corrected')
analysis_origin = fields.Function(fields.Char('Analysis origin'),
@ -1233,32 +1237,39 @@ class ResultsReportVersionDetailLine(ModelSQL, ModelView):
result[name] = {}
if cls._fields[name]._type == 'many2one':
for d in details:
field = getattr(d.notebook_line, name, None)
result[name][d.id] = field.id if field else None
if d.notebook_line:
field = getattr(d.notebook_line, name, None)
result[name][d.id] = field.id if field else None
else:
result[name][d.id] = None
else:
for d in details:
result[name][d.id] = getattr(d.notebook_line, name, None)
result[name][d.id] = (d.notebook_line and
getattr(d.notebook_line, name, None) or None)
return result
@classmethod
def get_result(cls, details, name):
result = {}
for d in details:
result[d.id] = d.notebook_line.get_formated_result()
result[d.id] = (d.notebook_line and
d.notebook_line.get_formated_result() or None)
return result
@classmethod
def get_converted_result(cls, details, name):
result = {}
for d in details:
result[d.id] = d.notebook_line.get_formated_converted_result()
result[d.id] = (d.notebook_line and
d.notebook_line.get_formated_converted_result() or None)
return result
@classmethod
def get_reference(cls, details, name):
result = {}
for d in details:
result[d.id] = cls._get_reference(d.notebook_line, d.detail_sample)
result[d.id] = (d.notebook_line and
cls._get_reference(d.notebook_line, d.detail_sample) or None)
return result
@classmethod
@ -1314,7 +1325,13 @@ class ResultsLineRepeatAnalysis(NotebookLineRepeatAnalysis):
def _get_notebook_line_id(self):
ResultsLine = Pool().get('lims.results_report.version.detail.line')
line = ResultsLine(Transaction().context['active_id'])
return line.notebook_line.id
return line.notebook_line and line.notebook_line.id or None
def default_start(self, fields):
line_id = self._get_notebook_line_id()
if not line_id:
return {}
return super().default_start(fields)
class DivideReportsResult(ModelView):
@ -1741,6 +1758,7 @@ class GenerateResultsReport(Wizard):
('detail_sample.version_detail.laboratory', '=',
self.start.laboratory.id),
('detail_sample.version_detail.state', 'in', ['draft', 'revised']),
('notebook_line', '!=', None),
])
if draft_lines:
draft_lines_ids = [dl.notebook_line.id for dl in draft_lines]
@ -3130,6 +3148,8 @@ class OpenResultsDetailAttachment(Wizard):
res.append(self._get_resource(
sample.notebook.fraction.sample.entry))
for line in sample.notebook_lines:
if not line.notebook_line:
continue
res.append(self._get_resource(line))
res.append(self._get_resource(line.notebook_line))
return res
@ -3442,6 +3462,7 @@ class ResultReport(Report):
notebook_lines = ResultsLine.search([
('detail_sample.version_detail.id', '=', report.id),
('hide', '=', False),
('notebook_line', '!=', None),
], order=[('detail_sample', 'ASC')])
if not notebook_lines:
raise UserError(gettext('lims.msg_empty_report'))

8
lims_analysis_sheet/planification.py
View File

@ -319,12 +319,12 @@ class SearchAnalysisSheet(Wizard):
for x in list(template_analysis.keys()))
service_where = 'AND ad.analysis IN (%s) ' % all_included_analysis_ids
planification_details = PlanificationServiceDetail.search(['OR',
planification_details = PlanificationServiceDetail.search([['OR',
('planification.state', '=', 'preplanned'),
('planification', '=', planification.id),
('planification', '=', planification.id)],
('notebook_line', '!=', None),
])
planned_lines = [pd.notebook_line.id for pd in planification_details
if pd.notebook_line]
planned_lines = [pd.notebook_line.id for pd in planification_details]
planned_lines_ids = ', '.join(str(x) for x in [0] + planned_lines)
preplanned_where = 'AND nl.id NOT IN (%s) ' % planned_lines_ids

1
lims_diagnosis/notebook.py
View File

@ -48,6 +48,7 @@ class Notebook(metaclass=PoolMeta):
('detail_sample.version_detail.laboratory', '=', laboratory_id),
('detail_sample.version_detail.state', 'in', ['draft', 'revised']),
('detail_sample.version_detail.type', '!=', 'preliminary'),
('notebook_line', '!=', None),
])
if draft_lines:
draft_lines_ids = [dl.notebook_line.id for dl in draft_lines]