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: planifications: add objetive description to reports

Browse source
This commit is contained in:
Patricia Grossi 2019-07-17 15:27:03 -03:00
parent 6fdf670954
commit 82df43a145
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lims/planification.py
View file

@ -5823,6 +5823,11 @@ class PlanificationWorksheetAnalysisReport(Report):
'urgent': 'SI' if notebook_line.urgent else '',
'comments': comments,
'planification_code': planification.code,
'sample_obj_description': (
fraction.sample.obj_description.description
if fraction.sample.obj_description else
fraction.sample.obj_description_manual
if fraction.sample.obj_description_manual else ''),
}
objects[date]['professionals'][p_key]['analysis'][
key]['lines'][number] = record
@ -5940,6 +5945,11 @@ class PlanificationWorksheetMethodReport(Report):
pack_quant + ' ' +
fraction.package_type.description,
'methods': {},
'sample_obj_description': (
fraction.sample.obj_description.description
if fraction.sample.obj_description else
fraction.sample.obj_description_manual
if fraction.sample.obj_description_manual else ''),
}
objects[date]['professionals'][p_key]['lines'][
number] = record
@ -6117,6 +6127,11 @@ class PlanificationWorksheetReport(Report):
pack_quant + ' ' +
fraction.package_type.description,
'methods': {},
'sample_obj_description': (
fraction.sample.obj_description.description
if fraction.sample.obj_description else
fraction.sample.obj_description_manual
if fraction.sample.obj_description_manual else ''),
}
objects[date]['professionals'][p_key]['analysis'][key][
'lines'][number] = record
@ -6953,6 +6968,8 @@ class PlanificationSequenceAnalysisReport(Report):
matrix = fraction.matrix.code
fraction_type = fraction.type.code
analysis = notebook_line.analysis.rec_name
initial_unit = (notebook_line.initial_unit.symbol
if notebook_line.initial_unit else '')
priority = notebook_line.priority
urgent = notebook_line.urgent
report_date = (notebook_line.report_date or
@ -6976,6 +6993,7 @@ class PlanificationSequenceAnalysisReport(Report):
'trace_report': trace_report,
'sample_client_description': (
sample_client_description),
'initial_unit': initial_unit,
}
for k1 in objects.keys():