changeset 4795:320d3c300fed

health: Completed task #16079: Improve ergonomics on patient evaluation form [x] Make visible the footer on all evaluation pages [x] Place Dx, DDx and medical procedures in one page [x] Add a Administrative page for institution related information [x] Place the health service document on the Administrative page
author Luis Falcon <falcon@gnuhealth.org>
date Tue, 23 Nov 2021 11:13:15 +0000
parents a202b3a4bf79
children 21dea08f3aec
files tryton/health/health.py tryton/health/view/gnuhealth_patient_evaluation.xml tryton/health_services/view/gnuhealth_patient_evaluation.xml
diffstat 3 files changed, 47 insertions(+), 45 deletions(-) [+]
line wrap: on
line diff
--- a/tryton/health/health.py
+++ b/tryton/health/health.py
@@ -4859,7 +4859,8 @@
     secondary_conditions = fields.One2Many(
         'gnuhealth.secondary_condition',
         'evaluation', 'Other Conditions', help='Other '
-        ' conditions found on the patient',
+        ' conditions found on the patient in the context'
+        ' of this evaluation',
         states=STATES)
 
     diagnostic_hypothesis = fields.One2Many(
--- a/tryton/health/view/gnuhealth_patient_evaluation.xml
+++ b/tryton/health/view/gnuhealth_patient_evaluation.xml
@@ -40,26 +40,9 @@
                 <field name="diagnosis" colspan="4"/>
             </group>
             <newline/>
-            <field name="secondary_conditions" colspan="4"/>
-            <field name="diagnostic_hypothesis" colspan="2"/>
-            <field name="actions" colspan="2"/>
-            <newline/>
             <group string="Treatment Plan" colspan="4" id="group_treatment_plan">
                 <field name="directions" colspan="4"/>
             </group>
-            <newline/>    
-            <group colspan="4" col="10" id="group_eval_misc">
-                <label name="state"/>
-                <field name="state"/>
-                <label name="evaluation_start"/>
-                <field name="evaluation_start"/>
-                <label name="evaluation_endtime"/>
-                <field name="evaluation_endtime"/>
-                <label name="discharge_reason"/>
-                <field name="discharge_reason"/>
-                <button name="end_evaluation" help="Discharge patient / end this evaluation" string="Discharge" icon="tryton-go-next" confirm="Discharge patient / End this evaluation ?"/>
-            </group>
-
         </page>
         <page string="Clinical" id="page_patient_evaluation_signs">
             <group colspan="4" col="6" string="Vital Signs" id="group_patient_evaluation_vital_signs">
@@ -160,36 +143,54 @@
                 <field name="praxis"/>
             </group>
         </page>
-        <page string="Extra Info" id="page_patient_evaluation_extra_info">
+        <page string="Dx and Procedures" id="page_patient_evaluation_extra_info">
             <separator string="Information on Diagnosis" colspan="2" id="separator_evaluation_diagnosis_1"/>
             <newline/>
             <field name="info_diagnosis" colspan="4"/>
             <newline/>
+            <field name="secondary_conditions" colspan="2"/>
+            <field name="diagnostic_hypothesis" colspan="2"/>
+            <field name="actions" colspan="4"/>
+        </page>
+        <page string="Administrative" id="page_patient_evaluation_administrative">
+            <group id='group_patient_evaluation_appointment' colspan="4" col="10">
+                <label name="urgency"/>
+                <field name="urgency"/>
+                <label name="appointment"/>
+                <field name="appointment"/>
+                <label name="next_evaluation"/>
+                <field name="next_evaluation"/>
+                <label name="derived_from"/>
+                <field name="derived_from"/>
+                <label name="derived_to"/>
+                <field name="derived_to"/>
+            </group>
             <separator string="Other information related to this evaluation" colspan="4" id="separator_evaluation_diagnosis_1"/>
-            <field name="notes" colspan="4"/>               
+            <field name="notes" colspan="4"/>
             <newline/>
-            <label name="institution"/>               
-            <field name="institution" colspan="3"/>               
-            <newline/>
+            <group id='group_patient_evaluation_institution_info' colspan="4" col="8">
+                <field name="institution" colspan="2"/>
+                <label name="specialty"/>
+                <field name="specialty"/>
+                <label name="evaluation_type"/>
+                <field name="evaluation_type"/>
+                <label name="wait_time"/>
+                <field name="wait_time"/>
+            </group>
+        </page>
 
-            <label name="evaluation_type"/>
-            <field name="evaluation_type"/>
-            <label name="specialty"/>
-            <field name="specialty"/>
-            <label name="urgency"/>
-            <field name="urgency"/>
-            <newline/>
+    </notebook>
+    <newline/>
+    <group colspan="4" col="10" id="group_eval_misc">
+        <label name="state"/>
+        <field name="state"/>
+        <label name="evaluation_start"/>
+        <field name="evaluation_start"/>
+        <label name="evaluation_endtime"/>
+        <field name="evaluation_endtime"/>
+        <label name="discharge_reason"/>
+        <field name="discharge_reason"/>
+        <button name="end_evaluation" help="Discharge patient / end this evaluation" string="Discharge" icon="tryton-go-next" confirm="Discharge patient / End this evaluation ?"/>
+    </group>
 
-            <label name="appointment"/>
-            <field name="appointment"/>
-            <label name="wait_time"/>
-            <field name="wait_time"/>
-            <label name="derived_from"/>
-            <field name="derived_from"/>
-            <label name="next_evaluation"/>
-            <field name="next_evaluation"/>
-            <label name="derived_to"/>
-            <field name="derived_to"/>
-        </page>
-    </notebook>
 </form>
--- a/tryton/health_services/view/gnuhealth_patient_evaluation.xml
+++ b/tryton/health_services/view/gnuhealth_patient_evaluation.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <data>
-	<xpath expr="//page[@id=&quot;page_patient_evaluation_extra_info&quot;]" position="after">
-    <page id="evaluation_services_page" string="Services">
+
+    <xpath expr="//group[@id=&quot;group_patient_evaluation_institution_info&quot;]" position="after">
         <group id="group_evaluation_services" string="Services">
             <label name="product"/>
             <field name="product"/>
@@ -11,6 +11,6 @@
             <button name="update_service" help="Update Service document with this evaluation" string="Update Services" icon="tryton-go-next" confirm="Transfer
                     this evaluation to services?" colspan="4"/>
         </group>
-    </page>
     </xpath>
+
 </data>