diff --git a/gnuhealth-3.6.3.tar.gz b/gnuhealth-3.6.3.tar.gz deleted file mode 100644 index 129c094..0000000 --- a/gnuhealth-3.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac96d19802dbe16f854a6a55a52afda18e42e4dd6da86da9e724a0b0a8f9330f -size 10492316 diff --git a/gnuhealth-3.6.4.tar.gz b/gnuhealth-3.6.4.tar.gz new file mode 100644 index 0000000..b25b0fe --- /dev/null +++ b/gnuhealth-3.6.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:398a181d0f8d60ba00d60e8a2424c06a1d073ed55adde42f35cf45e45b46de8e +size 10733801 diff --git a/gnuhealth.changes b/gnuhealth.changes index 358036d..2fc6c13 100644 --- a/gnuhealth.changes +++ b/gnuhealth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat May 16 16:16:58 UTC 2020 - Axel Braun + +- Version 3.6.4 + additional functionality for COVID-19 and epidemiology tracing + new epidemiology evaluations + lab1.diff and lab2.diff removed, included in new version + ------------------------------------------------------------------- Wed Apr 22 09:42:49 UTC 2020 - Axel Braun diff --git a/gnuhealth.spec b/gnuhealth.spec index 606b096..f5e5f4a 100644 --- a/gnuhealth.spec +++ b/gnuhealth.spec @@ -21,7 +21,7 @@ %define majorver 3.6 Name: gnuhealth -Version: %{majorver}.3 +Version: %{majorver}.4 Release: 0 # List of additional build dependencies @@ -43,8 +43,6 @@ Source5: openSUSE-gnuhealth-setup Source6: gnuhealth Source7: gnuhealth-rpmlintrc Patch0: shebang.diff -Patch1: lab1.diff -Patch2: lab2.diff BuildArch: noarch @@ -108,8 +106,6 @@ This package provides the interface to Orthanc %prep %setup -q -n %{name}-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 cp %{S:1} . cp %{S:2} . diff --git a/lab1.diff b/lab1.diff deleted file mode 100644 index 9692986..0000000 --- a/lab1.diff +++ /dev/null @@ -1,154 +0,0 @@ -# HG changeset patch -# User Luis Falcon -# Date 1585952786 -3600 -# Node ID 79084d43ec44b89679016a699060bdd8a0033e88 -# Parent bf15b71efbd4b1ff7230520165f264c23586e576 -health_lab: task #15563: Assign health condition from a confirmed lab - -* Include the lab_confirmed and lab test ID reference on the patient health condition model -* Include in the tree view lab confirmed conditions -* Search/ filter by lab confirmed pathologies -* Include the pathology in the patient lab test form - -diff --git a/health_lab/__init__.py b/health_lab/__init__.py ---- a/health_lab/__init__.py -+++ b/health_lab/__init__.py -@@ -40,6 +40,7 @@ - CreateLabTestOrderInit, - RequestTest, - RequestPatientLabTestStart, -+ PatientHealthCondition, - module='health_lab', type_='model') - Pool.register( - CreateLabTestOrder, -diff --git a/health_lab/health_lab.py b/health_lab/health_lab.py ---- a/health_lab/health_lab.py -+++ b/health_lab/health_lab.py -@@ -27,12 +27,12 @@ - from trytond.pool import Pool - from trytond import backend - from trytond.tools.multivalue import migrate_property -- -+from trytond.pyson import Eval, Not, Bool, PYSONEncoder, Equal, And, Or, If - - __all__ = ['GnuHealthSequences', 'GnuHealthSequenceSetup', - 'PatientData', 'TestType', 'Lab', - 'GnuHealthLabTestUnits', 'GnuHealthTestCritearea', -- 'GnuHealthPatientLabTest'] -+ 'GnuHealthPatientLabTest','PatientHealthCondition'] - - sequences = ['lab_sequence', 'lab_request_sequence'] - -@@ -80,7 +80,7 @@ - lab_sequence = fields.Many2One('ir.sequence', - 'Lab Result Sequence', required=True, - domain=[('code', '=', 'gnuhealth.lab')]) -- -+ - @classmethod - def __register__(cls, module_name): - TableHandler = backend.get('TableHandler') -@@ -112,7 +112,7 @@ - ModelData = pool.get('ir.model.data') - return ModelData.get_id( - 'health_lab', 'seq_gnuhealth_lab_test') -- -+ - # END SEQUENCE SETUP , MIGRATION FROM FIELDS.MultiValue - - -@@ -194,6 +194,11 @@ - date_analysis = fields.DateTime('Date of the Analysis', select=True) - request_order = fields.Integer('Request', readonly=True) - -+ pathology = fields.Many2One( -+ 'gnuhealth.pathology', 'Pathology', -+ help='Pathology confirmed / associated to this lab test. ' -+ 'If set, a new health condition will be generated for the person') -+ - analytes_summary = \ - fields.Function(fields.Text('Summary'), - 'get_analytes_summary') -@@ -415,3 +420,18 @@ - default['date'] = cls.default_date() - return super(GnuHealthPatientLabTest, cls).copy(tests, - default=default) -+ -+class PatientHealthCondition(ModelSQL, ModelView): -+ 'Patient Conditions History' -+ __name__ = 'gnuhealth.patient.disease' -+ -+ # Adds lab confirmed and the link to the test to the -+ # Patient health Condition -+ -+ lab_confirmed = fields.Boolean('Lab Confirmed', help='Confirmed by' -+ ' laboratory test') -+ -+ lab_test = fields.Many2One('gnuhealth.lab','Lab Test', -+ domain=[('patient', '=', Eval('name'))], depends=['name'], -+ states={'invisible': Not(Bool(Eval('lab_confirmed')))}, -+ help='Lab test that confirmed the condition') -diff --git a/health_lab/health_lab_view.xml b/health_lab/health_lab_view.xml ---- a/health_lab/health_lab_view.xml -+++ b/health_lab/health_lab_view.xml -@@ -194,5 +194,19 @@ - - - -+ -+ -+ -+ gnuhealth.patient.disease -+ -+ gnuhealth_patient_health_condition_form -+ -+ -+ -+ gnuhealth.patient.disease -+ -+ gnuhealth_patient_health_condition_tree -+ -+ - - -diff --git a/health_lab/view/gnuhealth_lab.xml b/health_lab/view/gnuhealth_lab.xml ---- a/health_lab/view/gnuhealth_lab.xml -+++ b/health_lab/view/gnuhealth_lab.xml -@@ -20,6 +20,9 @@ - -