Mercurial > hgweb > health
changeset 2255:c6bda871e589
health_socioeconomics : Add history of social and family assessments
| author | Luis Falcon <falcon@gnu.org> |
|---|---|
| date | Fri, 18 Dec 2015 13:00:22 +0000 |
| parents | 82bd6dc73e35 |
| children | 8d1482a41f3d |
| files | tryton/health/health.py tryton/health_socioeconomics/health_socioeconomics.py tryton/health_socioeconomics/view/gnuhealth_patient.xml tryton/health_socioeconomics/view/gnuhealth_ses_assessment_tree.xml |
| diffstat | 4 files changed, 8 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/tryton/health/health.py +++ b/tryton/health/health.py @@ -5,6 +5,7 @@ # Copyright (C) 2008-2015 Luis Falcon <lfalcon@gnusolidario.org> # Copyright (C) 2011-2015 GNU Solidario <health@gnusolidario.org> # Copyright (C) 2015 Cédric Krier +# Copyright (C) 2014-2015 Chris Zimmerman <siv@riseup.net> # # # This program is free software: you can redistribute it and/or modify
--- a/tryton/health_socioeconomics/health_socioeconomics.py +++ b/tryton/health_socioeconomics/health_socioeconomics.py @@ -318,6 +318,10 @@ ], 'Housing conditions', help="Housing and sanitary living conditions", sort=False), 'get_patient_housing') + ses_assessments = fields.One2Many('gnuhealth.ses.assessment', + 'patient','Assessments', + help="Socioeconomics and Family assessments history") + hostile_area = fields.Boolean('Hostile Area', help="Check if patient lives in a zone of high hostility (eg, war)")
--- a/tryton/health_socioeconomics/view/gnuhealth_patient.xml +++ b/tryton/health_socioeconomics/view/gnuhealth_patient.xml @@ -11,15 +11,7 @@ <field name="housing"/> </group> <newline/> - <!-- Deprecated info . Will be removed in 3.2 - <group col="6" id="group_socioecomics_work"> - <newline/> - <label name="works_at_home"/> - <field name="works_at_home"/> - <label name="hours_outside"/> - <field name="hours_outside"/> - </group> - --> + <field name="ses_assessments"/> <newline/> <group colspan="4" col="8" string="Other Family and Environmental determinants" id="group_ses_other_family_issues"> <label name="single_parent"/>
--- a/tryton/health_socioeconomics/view/gnuhealth_ses_assessment_tree.xml +++ b/tryton/health_socioeconomics/view/gnuhealth_ses_assessment_tree.xml @@ -1,13 +1,13 @@ <?xml version="1.0"?> <tree string="Socioeconomics and Family assessment"> <field name="patient"/> + <field name="assessment_date" widget="date"/> <field name="ses" expand="1"/> <field name="education" expand="1"/> <field name="occupation" expand="1"/> <field name="housing" expand="1"/> <field name="income" expand="1"/> <field string="Family functionality" name="fam_apgar_score" expand="1"/> - <field name="assessment_date" widget="date"/> - <field name="health_professional"/> + <field name="health_professional" tree_invisible="1"/> <field name="state"/> </tree>
