Mercurial > hgweb > health
changeset 2390:2fc509d3b3e7
health_lab : task #13882: Include the request test ID in lab results
| author | Luis Falcon <falcon@gnu.org> |
|---|---|
| date | Thu, 11 Feb 2016 22:19:27 +0000 |
| parents | 40f8af6c84f2 |
| children | 5ee4b8151c58 |
| files | tryton/health_lab/health_lab.py tryton/health_lab/view/gnuhealth_lab.xml tryton/health_lab/view/gnuhealth_lab_tree.xml tryton/health_lab/wizard/wizard_create_lab_test.py |
| diffstat | 4 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tryton/health_lab/health_lab.py +++ b/tryton/health_lab/health_lab.py @@ -112,6 +112,7 @@ date_requested = fields.DateTime('Date requested', required=True, select=True) date_analysis = fields.DateTime('Date of the Analysis', select=True) + request_order = fields.Integer('Request', readonly=True) @classmethod def __setup__(cls):
--- a/tryton/health_lab/view/gnuhealth_lab.xml +++ b/tryton/health_lab/view/gnuhealth_lab.xml @@ -18,6 +18,8 @@ <field name="date_requested"/> <label name="requestor"/> <field name="requestor"/> + <label name="request_order"/> + <field name="request_order"/> <field name="critearea" colspan="4" view_ids="health_lab.test_critearea_view_tree_lab,health_lab.test_critearea_view_form_lab"/> </page> <page string="Extra Info" id="lab_extra_info">
--- a/tryton/health_lab/view/gnuhealth_lab_tree.xml +++ b/tryton/health_lab/view/gnuhealth_lab_tree.xml @@ -2,6 +2,7 @@ <tree string="Lab test type"> <field name="name" expand="1"/> <field name="test" expand="1"/> + <field name="request_order" expand="1"/> <field name="patient" expand="1"/> <field name="date_analysis" widget="date" expand="1"/> </tree>
--- a/tryton/health_lab/wizard/wizard_create_lab_test.py +++ b/tryton/health_lab/wizard/wizard_create_lab_test.py @@ -70,6 +70,7 @@ if lab_test_order.doctor_id: test_report_data['requestor'] = lab_test_order.doctor_id.id test_report_data['date_requested'] = lab_test_order.date + test_report_data['request_order'] = lab_test_order.request for critearea in lab_test_order.name.critearea: test_cases.append(('create', [{
