changeset 3422:b61d9bab3600

HMIS Server.health_federation, health : Page of Life: Add HP federation account when creating a new evaluation . Use Name representation for health professional in Page of Life.
author Luis Falcon <falcon@gnuhealth.org>
date Tue, 29 Oct 2019 12:15:34 +0000
parents a1c5ff440c2d
children f58a2069f5e6
files tryton/health/health.py tryton/health/view/gnuhealth_pol_form.xml tryton/health_federation/data/federation_objects.xml
diffstat 3 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tryton/health/health.py
+++ b/tryton/health/health.py
@@ -1016,6 +1016,7 @@
     institution = fields.Many2One('gnuhealth.institution', 'Institution')
     node = fields.Char("Node")
     author = fields.Char("Author")
+    author_acct = fields.Char("Author account")
 
     @staticmethod
     def default_institution():
@@ -5331,7 +5332,8 @@
             'relevance':'important',
             'summary': evaluation.chief_complaint,
             'info': evaluation.evaluation_summary,
-            'author': evaluation.healthprof.name.name,
+            'author': evaluation.healthprof.name.rec_name,
+            'author_acct': evaluation.healthprof.name.federation_account,
             'node': evaluation.institution.name.name,
             }
         if (evaluation.diagnosis):
--- a/tryton/health/view/gnuhealth_pol_form.xml
+++ b/tryton/health/view/gnuhealth_pol_form.xml
@@ -56,13 +56,15 @@
     <separator string="Extended Information" id="separator_extra_info" colspan="4"/>
     <newline/>
     <field name="info" colspan="4"/>
-    <group id="pol_footer" colspan="4" col="8">
+    <group id="pol_footer" colspan="4" col="10">
         <label name="page"/>
         <field name="page"/>
         <label name="federation_account"/>
         <field name="federation_account"/>
         <label name="author"/>
         <field name="author"/>
+        <label name="author_acct"/>
+        <field name="author_acct"/>
         <label name="node"/>
         <field name="node"/>
     </group>
--- a/tryton/health_federation/data/federation_objects.xml
+++ b/tryton/health_federation/data/federation_objects.xml
@@ -38,7 +38,8 @@
 summary:pols:summary,
 info:pols:info,
 node:pols:node,
-author:pols:author</field>
+author:pols:author,
+author_acct:pols:author</field>
         </record>
     </data>
 </tryton>