diff --git a/Gazelle-HL7V2-Simulators/media/HL7V2Manager_UI.png b/Gazelle-HL7V2-Simulators/media/HL7V2Manager_UI.png
index cbabcf80c1357ffca53470f4143fe0dc00beb775..d772d3f1f6cbd65ed1490957bde53e0c62ee7eb9 100644
Binary files a/Gazelle-HL7V2-Simulators/media/HL7V2Manager_UI.png and b/Gazelle-HL7V2-Simulators/media/HL7V2Manager_UI.png differ
diff --git a/Gazelle-HL7V2-Simulators/user.md b/Gazelle-HL7V2-Simulators/user.md
index ce9c38e9bbad66544b4dca41c6e08d82738c8cb4..6a2b02b830a11f5460be8df0860077b04969ffb0 100755
--- a/Gazelle-HL7V2-Simulators/user.md
+++ b/Gazelle-HL7V2-Simulators/user.md
@@ -15,15 +15,15 @@ customer: IHE-EUROPE
HL7V2Simulators is the part of the Gazelle platform dedicated to the simulation of Hl7v2 messages transmission.
-The first simulator mimics the transmission of a Clinical Document Architecture (CDA) to a receiving application. The creator of the simulator expects to receive as many acknowledgments as requested by the message.
+One simulator mimics the transmission of a Clinical Document Architecture (CDA) to a receiving application. The creator of the simulator expects to receive as many acknowledgments as requested by the message.
-The second simulator acts as a server, receiving any CDA message sent to it. It then sends back as many acknowledgments as requested in the message to its sender.
+Three simulator acts as a server with different charset handled. For every CDA messages received, they send back as many acknowledgments as requested in the message to their sender.
Concerning HL7v2 simulators: the application also gathers the HL7 templates.
# User interface
-As shown on picture below, the [User Interface] provides two simulators tools: **Creator** and **Manager**:
+As shown on picture below, the [User Interface] provides two simulators tools: **Creator** and **Managers**:
@@ -31,7 +31,7 @@ As shown on picture below, the [User Interface] provides two simulators tools: *
-And **Manager** allows user to receive Hl7 messages from a creator:
+And **Managers** allows user to receive Hl7 messages from a creator:
@@ -40,12 +40,17 @@ Both tools use templates included in the application or imported by user.
## Browse Configuration SUT
-There are 5 fields that define a Configuration SUT:
+There are 10 fields that define a Configuration SUT:
- Name : Define the name of your configuration
- Host/ip: define the destination device of the message
- Port: Define on which port send the message on the destination device
- Application: Define the name of the application which you send the message it will help fulfill the message
- Facility: Define the name of the facility which you send the message it will help fulfill the message
+ - Owner: Show the creator of the configuration
+ - CompanyOwner: Show the company owner of the configuration, only user can see his company's not share configuration.
+ - isShare: Define if the configuration is share to others users. Only admin or people of the company can edit it.
+ - Charset: Define on a server it tells with which charset message should be sent and replied.
+ - isServerSide: Define if the configuration is for a server or a client
Once connected with CAS(Central Authentication Service) Select option  of **HL7v2 simulators tool** menu.
@@ -54,7 +59,7 @@ It will display the list of Configuration SUT :
-All the Configuration SUT available are gathered in the tool. You can either create, edit or delete one.
+Only admin cans see all configuration but a lambda user can see his company configuration also either create, edit or delete one.
## Browse Template
@@ -62,7 +67,7 @@ There are 4 fields that define a template :
-Title : Define the title of the template
-isEnabled : Define if the template can be used in a message
-Filename : Define the name of the stocked file corresponding at the mustache template
- -Description: Explain what is the purpose of the template or it's particularity
+ -Description: Explain what is the purpose of the template ,or it's particularity
Once connected with CAS(Central Authentication Service) Select option  of **HL7v2 simulators tool** menu.
@@ -90,9 +95,11 @@ It will display the list of Preference :
All Preference available are gathered in the tool. You can either create, edit or delete one.
-Preferences enable to custom the working of the application there are 3 things that can be custom.
+Preferences enable to custom the working of the application there are 5 things that can be custom.
Endpoint_Validator: The validation Endpoint to define which HL7 validator should be used.
- Manager_Name, Manager_Host, Manager_Application, Manager_Facility, Manager_Port :The configuration of the manager
+ UTF8_Manager_Name, UTF8_Manager_Host, UTF8_Manager_Application, UTF8_Manager_Facility, UTF8_Manager_Port :The configuration of the UTF-8 manager
+ I88591_Manager_Name, I88591_Manager_Host, I88591_Manager_Application, I88591_Manager_Facility, I88591_Manager_Port :The configuration of the 8859-1 manager
+ I885915_Manager_Name, I885915_Manager_Host, I885915_Manager_Application, I885915_Manager_Facility, I885915_Manager_Port :The configuration of the 8859-15 manager
Creator_Name, Creator_Host ,Creator_Application , Creator_Port:The configuration of the creator
@@ -114,17 +121,18 @@ Once the needed template is set it can be selected with dropdown on the creator
For sending the receiving application Configuration must have been insert in the configuration list.
On the Creator GUI before sending, a Configuration Receiver and a Template must have been selected.
-Once the message is sent the message history print messages who have been send and receive including ACK/NACK AND ZAM. 1
+Once the message is sent the message history print messages who have been sent and receive including ACK/NACK AND ZAM. 1
-## Manager
+## Managers
-The manager is easier to use because it's just a server that can be started/stopped.
-For replying ZAM the manager must have all required ZAM templates. See TEMPLATE section for details.
-For replying ZAM the manger should also have the configuration SUT defined of the sender. Else the manager cannot know where to send ZAM ( because ACK with HAPI is automatic).
-For starting the server manager just go to the Manger GUI and press the start button.
-Once the server is started it will try parsing every incoming messages and reply ACK/NACK AND corresponding ZAM.
+There is a manager for each charsets UTF-8,8859-1 et 8859-15.
+Managers are easier to use because it's just a server that can be started/stopped.
+For replying ZAM managers must have all required ZAM templates. See TEMPLATE section for details.
+For replying ZAM managers should also have the configuration SUT defined of the sender. Else managers cannot know where to send ZAM ( because ACK with HAPI is automatic).
+For starting servers managers just go to the Manager GUI and press the start button.
+Once servers are started they will try to parse every incoming messages and reply ACK/NACK AND corresponding ZAM.
## Default Import