From 8aaa4ce1bc92209516a9d9ac21c2e6d5858ed77d Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 20 Dec 2020 11:06:04 +0200
Subject: [PATCH 01/37] readme file

---
 README.md | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/README.md b/README.md
index 23911e6..4a528c4 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,47 @@
+## What is clinikal?
+
+Clinikal is a Electric Medical Records application.  
+Clinical offers a new experience of administrative and medical management for variety of clinics.  
+The foundation of the application is the popular open source [OpenEMR](https://github.com/openemr/openemr), we developed new layer of Fhir API base on ZF2 modules and new and modern React.js application to enjoy from wonderful user experience.  
+Clinikal continues to use OpenEMR interfaces as Content Management System for manage users, permissions, lists etc. (we doesn't supply compatibility with all Openemr screens) 
+
+The principle that guides us is **clean and clear**.  
+Each user sees only the screens and forms relevant to his role in the clinic.   
+This ability is caused by using a system of roles and privileges for each profession in the clinic and a different installation process for each medical field which creates an innovative and convenient user experience!
+
+### Get started and documentation
+To get started and documentation at https://clinikal-documentation.readthedocs.io/
+
+### Clinikal-beckend
+The product composed of a few component, Server-side modules and client-side application. 
+This repository contains several modules and configurations that common for all the medical fields in the system.  
+The repository contains:  
+* API layer
+* General functionality
+* Custom menus
+* Import data module
+* More helpers  
+
+### Resources
+* [Docker installation](https://clinikal-documentation.readthedocs.io/en/latest/get_started/docker_installation/)  
+* [Manual installation](https://clinikal-documentation.readthedocs.io/en/latest/get_started/openemr_modules/)  
+* [Internationalization](https://clinikal-documentation.readthedocs.io/en/latest/get_started/internationalization/)
+* [FHIR API](https://clinikal-documentation.readthedocs.io/en/latest/api/fhir/)
+
+### License
+Please see the [license agreement](https://github.com/israeli-moh/clinikal-react/blob/develop/LICENSE).
+
+### Acknowledgement
+The Clinikal team would like to thank Israeli Ministry Of Health that sponsored this project.
+
+
+
+
+
+
+
+
+
 # Description
 This repository contains modules that add functionality to Openemr.
 

From bd9a3a6f219f10dc0c7fa4adfbc5d159bdf3edda Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 20 Dec 2020 11:08:57 +0200
Subject: [PATCH 02/37] readme file

---
 README.md | 49 -------------------------------------------------
 1 file changed, 49 deletions(-)

diff --git a/README.md b/README.md
index 4a528c4..b67e4a5 100644
--- a/README.md
+++ b/README.md
@@ -34,52 +34,3 @@ Please see the [license agreement](https://github.com/israeli-moh/clinikal-react
 ### Acknowledgement
 The Clinikal team would like to thank Israeli Ministry Of Health that sponsored this project.
 
-
-
-
-
-
-
-
-
-# Description
-This repository contains modules that add functionality to Openemr.
-
-# Installation
-These instructions assume you have a working installation of Openemr.  
-
-Add the following to the openemr/composer.json:  
-``` json
-"repositories": [
-    {
-        "type": "vcs",
-        "url": "git@github.com:israeli-moh/clinikal-backend.git"
-    },
-    {
-        "type": "vcs",
-        "url": "git@github.com:israeli-moh/composer-installers-clinikal-extender.git"
-    }
-],
-"require": {
-    "clinikal/clinikal-backend": "dev-master",
-    "clinikal/composer-installers-clinikal-extender": "dev-master"
-},
-"extra": {
-    "installer-types": [
-        "clinikal-vertical"
-    ],
-}
-```
-
-In a terminal, `cd` into the openemr root directory (where the composer.json is), and run:  
-```
-composer update clinikal
-```  
-  
-This downloads the modules code into the openemr/vendor/clinikal and triggers the composer installer extension in the composer-installers-clinikal-extender repository.  
-The extension creates links from the files in vendor/clinikal to there appropriate places in the openemr codebase.  
-This enables us to use any modules, styles, and menus downloaded by composer into the vendor/clinikal directory.
-
-All modules can now be registered and enabled in the Manage Modules screen.  
-
-This project is sponsored by the Israeli Ministry Of Health.

From d53ed91feffc72fa4bd0b94e3d0a0f87bcb5de01 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 20 Dec 2020 11:50:13 +0200
Subject: [PATCH 03/37] readme file

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b67e4a5..216015c 100644
--- a/README.md
+++ b/README.md
@@ -14,8 +14,8 @@ To get started and documentation at https://clinikal-documentation.readthedocs.i
 
 ### Clinikal-beckend
 The product composed of a few component, Server-side modules and client-side application. 
-This repository contains several modules and configurations that common for all the medical fields in the system.  
-The repository contains:  
+This repository is part of server-side components and contains several modules and configurations that common for all the medical fields in the system.    
+Main contents:  
 * API layer
 * General functionality
 * Custom menus

From 5ce1e215446f06174b17c02fe202c1150de6983f Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 20 Dec 2020 11:52:07 +0200
Subject: [PATCH 04/37] readme file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 216015c..7400e6d 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ This ability is caused by using a system of roles and privileges for each profes
 To get started and documentation at https://clinikal-documentation.readthedocs.io/
 
 ### Clinikal-beckend
-The product composed of a few component, Server-side modules and client-side application. 
+The product composed of a few component, Server-side modules and client-side application.   
 This repository is part of server-side components and contains several modules and configurations that common for all the medical fields in the system.    
 Main contents:  
 * API layer

From 0e84b83af9e413d63077b2a5768748083561877c Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 20 Dec 2020 14:11:37 +0200
Subject: [PATCH 05/37] up modules versions

---
 .../sql/1_0_0-to-2_0_0_upgrade.sql            | 92 +++++++++++++++++++
 modules/ClinikalAPI/version.php               |  6 +-
 .../FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql    | 92 +++++++++++++++++++
 modules/FhirAPI/version.php                   |  6 +-
 .../sql/1_0_0-to-2_0_0_upgrade.sql            | 92 +++++++++++++++++++
 modules/GenericTools/version.php              |  6 +-
 .../ImportData/sql/1_0_0-to-2_0_0_upgrade.sql | 92 +++++++++++++++++++
 modules/ImportData/version.php                |  6 +-
 modules/ReportTool/version.php                |  5 +
 9 files changed, 385 insertions(+), 12 deletions(-)
 create mode 100644 modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
 create mode 100644 modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
 create mode 100644 modules/GenericTools/sql/1_0_0-to-2_0_0_upgrade.sql
 create mode 100644 modules/ImportData/sql/1_0_0-to-2_0_0_upgrade.sql
 create mode 100644 modules/ReportTool/version.php

diff --git a/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
new file mode 100644
index 0000000..8a631ba
--- /dev/null
+++ b/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -0,0 +1,92 @@
+--
+--  Comment Meta Language Constructs:
+--
+--  #IfNotTable
+--    argument: table_name
+--    behavior: if the table_name does not exist,  the block will be executed
+
+--  #IfTable
+--    argument: table_name
+--    behavior: if the table_name does exist, the block will be executed
+
+--  #IfColumn
+--    arguments: table_name colname
+--    behavior:  if the table and column exist,  the block will be executed
+
+--  #IfMissingColumn
+--    arguments: table_name colname
+--    behavior:  if the table exists but the column does not,  the block will be executed
+
+--  #IfNotColumnType
+--    arguments: table_name colname value
+--    behavior:  If the table table_name does not have a column colname with a data type equal to value, then the block will be executed
+
+--  #IfNotRow
+--    arguments: table_name colname value
+--    behavior:  If the table table_name does not have a row where colname = value, the block will be executed.
+
+--  #IfNotRow2D
+--    arguments: table_name colname value colname2 value2
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2, the block will be executed.
+
+--  #IfNotRow3D
+--    arguments: table_name colname value colname2 value2 colname3 value3
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
+
+--  #IfNotRow4D
+--    arguments: table_name colname value colname2 value2 colname3 value3 colname4 value4
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3 AND colname4 = value4, the block will be executed.
+
+--  #IfNotRow2Dx2
+--    desc:      This is a very specialized function to allow adding items to the list_options table to avoid both redundant option_id and title in each element.
+--    arguments: table_name colname value colname2 value2 colname3 value3
+--    behavior:  The block will be executed if both statements below are true:
+--               1) The table table_name does not have a row where colname = value AND colname2 = value2.
+--               2) The table table_name does not have a row where colname = value AND colname3 = value3.
+
+--  #IfRow2D
+--    arguments: table_name colname value colname2 value2
+--    behavior:  If the table table_name does have a row where colname = value AND colname2 = value2, the block will be executed.
+
+--  #IfRow3D
+--        arguments: table_name colname value colname2 value2 colname3 value3
+--        behavior:  If the table table_name does have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
+
+--  #IfIndex
+--    desc:      This function is most often used for dropping of indexes/keys.
+--    arguments: table_name colname
+--    behavior:  If the table and index exist the relevant statements are executed, otherwise not.
+
+--  #IfNotIndex
+--    desc:      This function will allow adding of indexes/keys.
+--    arguments: table_name colname
+--    behavior:  If the index does not exist, it will be created
+
+--  #EndIf
+--    all blocks are terminated with a #EndIf statement.
+
+--  #IfNotListReaction
+--    Custom function for creating Reaction List
+
+--  #IfNotListOccupation
+--    Custom function for creating Occupation List
+
+--  #IfTextNullFixNeeded
+--    desc: convert all text fields without default null to have default null.
+--    arguments: none
+
+--  #IfTableEngine
+--    desc:      Execute SQL if the table has been created with given engine specified.
+--    arguments: table_name engine
+--    behavior:  Use when engine conversion requires more than one ALTER TABLE
+
+--  #IfInnoDBMigrationNeeded
+--    desc: find all MyISAM tables and convert them to InnoDB.
+--    arguments: none
+--    behavior: can take a long time.
+
+--  #IfTranslationNeeded
+--    desc: find all MyISAM tables and convert them to InnoDB.
+--    arguments: constant_name english hebrew
+--    behavior: can take a long time.
+
diff --git a/modules/ClinikalAPI/version.php b/modules/ClinikalAPI/version.php
index e2d742c..e5e2435 100644
--- a/modules/ClinikalAPI/version.php
+++ b/modules/ClinikalAPI/version.php
@@ -1,5 +1,5 @@
 <?php
 
-$v_major = '0';
-$v_minor = '1';
-$v_patch = '0';
\ No newline at end of file
+$v_major = '1';
+$v_minor = '0';
+$v_patch = '0';
diff --git a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
new file mode 100644
index 0000000..8a631ba
--- /dev/null
+++ b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -0,0 +1,92 @@
+--
+--  Comment Meta Language Constructs:
+--
+--  #IfNotTable
+--    argument: table_name
+--    behavior: if the table_name does not exist,  the block will be executed
+
+--  #IfTable
+--    argument: table_name
+--    behavior: if the table_name does exist, the block will be executed
+
+--  #IfColumn
+--    arguments: table_name colname
+--    behavior:  if the table and column exist,  the block will be executed
+
+--  #IfMissingColumn
+--    arguments: table_name colname
+--    behavior:  if the table exists but the column does not,  the block will be executed
+
+--  #IfNotColumnType
+--    arguments: table_name colname value
+--    behavior:  If the table table_name does not have a column colname with a data type equal to value, then the block will be executed
+
+--  #IfNotRow
+--    arguments: table_name colname value
+--    behavior:  If the table table_name does not have a row where colname = value, the block will be executed.
+
+--  #IfNotRow2D
+--    arguments: table_name colname value colname2 value2
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2, the block will be executed.
+
+--  #IfNotRow3D
+--    arguments: table_name colname value colname2 value2 colname3 value3
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
+
+--  #IfNotRow4D
+--    arguments: table_name colname value colname2 value2 colname3 value3 colname4 value4
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3 AND colname4 = value4, the block will be executed.
+
+--  #IfNotRow2Dx2
+--    desc:      This is a very specialized function to allow adding items to the list_options table to avoid both redundant option_id and title in each element.
+--    arguments: table_name colname value colname2 value2 colname3 value3
+--    behavior:  The block will be executed if both statements below are true:
+--               1) The table table_name does not have a row where colname = value AND colname2 = value2.
+--               2) The table table_name does not have a row where colname = value AND colname3 = value3.
+
+--  #IfRow2D
+--    arguments: table_name colname value colname2 value2
+--    behavior:  If the table table_name does have a row where colname = value AND colname2 = value2, the block will be executed.
+
+--  #IfRow3D
+--        arguments: table_name colname value colname2 value2 colname3 value3
+--        behavior:  If the table table_name does have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
+
+--  #IfIndex
+--    desc:      This function is most often used for dropping of indexes/keys.
+--    arguments: table_name colname
+--    behavior:  If the table and index exist the relevant statements are executed, otherwise not.
+
+--  #IfNotIndex
+--    desc:      This function will allow adding of indexes/keys.
+--    arguments: table_name colname
+--    behavior:  If the index does not exist, it will be created
+
+--  #EndIf
+--    all blocks are terminated with a #EndIf statement.
+
+--  #IfNotListReaction
+--    Custom function for creating Reaction List
+
+--  #IfNotListOccupation
+--    Custom function for creating Occupation List
+
+--  #IfTextNullFixNeeded
+--    desc: convert all text fields without default null to have default null.
+--    arguments: none
+
+--  #IfTableEngine
+--    desc:      Execute SQL if the table has been created with given engine specified.
+--    arguments: table_name engine
+--    behavior:  Use when engine conversion requires more than one ALTER TABLE
+
+--  #IfInnoDBMigrationNeeded
+--    desc: find all MyISAM tables and convert them to InnoDB.
+--    arguments: none
+--    behavior: can take a long time.
+
+--  #IfTranslationNeeded
+--    desc: find all MyISAM tables and convert them to InnoDB.
+--    arguments: constant_name english hebrew
+--    behavior: can take a long time.
+
diff --git a/modules/FhirAPI/version.php b/modules/FhirAPI/version.php
index e2d742c..e5e2435 100644
--- a/modules/FhirAPI/version.php
+++ b/modules/FhirAPI/version.php
@@ -1,5 +1,5 @@
 <?php
 
-$v_major = '0';
-$v_minor = '1';
-$v_patch = '0';
\ No newline at end of file
+$v_major = '1';
+$v_minor = '0';
+$v_patch = '0';
diff --git a/modules/GenericTools/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/GenericTools/sql/1_0_0-to-2_0_0_upgrade.sql
new file mode 100644
index 0000000..8a631ba
--- /dev/null
+++ b/modules/GenericTools/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -0,0 +1,92 @@
+--
+--  Comment Meta Language Constructs:
+--
+--  #IfNotTable
+--    argument: table_name
+--    behavior: if the table_name does not exist,  the block will be executed
+
+--  #IfTable
+--    argument: table_name
+--    behavior: if the table_name does exist, the block will be executed
+
+--  #IfColumn
+--    arguments: table_name colname
+--    behavior:  if the table and column exist,  the block will be executed
+
+--  #IfMissingColumn
+--    arguments: table_name colname
+--    behavior:  if the table exists but the column does not,  the block will be executed
+
+--  #IfNotColumnType
+--    arguments: table_name colname value
+--    behavior:  If the table table_name does not have a column colname with a data type equal to value, then the block will be executed
+
+--  #IfNotRow
+--    arguments: table_name colname value
+--    behavior:  If the table table_name does not have a row where colname = value, the block will be executed.
+
+--  #IfNotRow2D
+--    arguments: table_name colname value colname2 value2
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2, the block will be executed.
+
+--  #IfNotRow3D
+--    arguments: table_name colname value colname2 value2 colname3 value3
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
+
+--  #IfNotRow4D
+--    arguments: table_name colname value colname2 value2 colname3 value3 colname4 value4
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3 AND colname4 = value4, the block will be executed.
+
+--  #IfNotRow2Dx2
+--    desc:      This is a very specialized function to allow adding items to the list_options table to avoid both redundant option_id and title in each element.
+--    arguments: table_name colname value colname2 value2 colname3 value3
+--    behavior:  The block will be executed if both statements below are true:
+--               1) The table table_name does not have a row where colname = value AND colname2 = value2.
+--               2) The table table_name does not have a row where colname = value AND colname3 = value3.
+
+--  #IfRow2D
+--    arguments: table_name colname value colname2 value2
+--    behavior:  If the table table_name does have a row where colname = value AND colname2 = value2, the block will be executed.
+
+--  #IfRow3D
+--        arguments: table_name colname value colname2 value2 colname3 value3
+--        behavior:  If the table table_name does have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
+
+--  #IfIndex
+--    desc:      This function is most often used for dropping of indexes/keys.
+--    arguments: table_name colname
+--    behavior:  If the table and index exist the relevant statements are executed, otherwise not.
+
+--  #IfNotIndex
+--    desc:      This function will allow adding of indexes/keys.
+--    arguments: table_name colname
+--    behavior:  If the index does not exist, it will be created
+
+--  #EndIf
+--    all blocks are terminated with a #EndIf statement.
+
+--  #IfNotListReaction
+--    Custom function for creating Reaction List
+
+--  #IfNotListOccupation
+--    Custom function for creating Occupation List
+
+--  #IfTextNullFixNeeded
+--    desc: convert all text fields without default null to have default null.
+--    arguments: none
+
+--  #IfTableEngine
+--    desc:      Execute SQL if the table has been created with given engine specified.
+--    arguments: table_name engine
+--    behavior:  Use when engine conversion requires more than one ALTER TABLE
+
+--  #IfInnoDBMigrationNeeded
+--    desc: find all MyISAM tables and convert them to InnoDB.
+--    arguments: none
+--    behavior: can take a long time.
+
+--  #IfTranslationNeeded
+--    desc: find all MyISAM tables and convert them to InnoDB.
+--    arguments: constant_name english hebrew
+--    behavior: can take a long time.
+
diff --git a/modules/GenericTools/version.php b/modules/GenericTools/version.php
index e2d742c..e5e2435 100644
--- a/modules/GenericTools/version.php
+++ b/modules/GenericTools/version.php
@@ -1,5 +1,5 @@
 <?php
 
-$v_major = '0';
-$v_minor = '1';
-$v_patch = '0';
\ No newline at end of file
+$v_major = '1';
+$v_minor = '0';
+$v_patch = '0';
diff --git a/modules/ImportData/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/ImportData/sql/1_0_0-to-2_0_0_upgrade.sql
new file mode 100644
index 0000000..8a631ba
--- /dev/null
+++ b/modules/ImportData/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -0,0 +1,92 @@
+--
+--  Comment Meta Language Constructs:
+--
+--  #IfNotTable
+--    argument: table_name
+--    behavior: if the table_name does not exist,  the block will be executed
+
+--  #IfTable
+--    argument: table_name
+--    behavior: if the table_name does exist, the block will be executed
+
+--  #IfColumn
+--    arguments: table_name colname
+--    behavior:  if the table and column exist,  the block will be executed
+
+--  #IfMissingColumn
+--    arguments: table_name colname
+--    behavior:  if the table exists but the column does not,  the block will be executed
+
+--  #IfNotColumnType
+--    arguments: table_name colname value
+--    behavior:  If the table table_name does not have a column colname with a data type equal to value, then the block will be executed
+
+--  #IfNotRow
+--    arguments: table_name colname value
+--    behavior:  If the table table_name does not have a row where colname = value, the block will be executed.
+
+--  #IfNotRow2D
+--    arguments: table_name colname value colname2 value2
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2, the block will be executed.
+
+--  #IfNotRow3D
+--    arguments: table_name colname value colname2 value2 colname3 value3
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
+
+--  #IfNotRow4D
+--    arguments: table_name colname value colname2 value2 colname3 value3 colname4 value4
+--    behavior:  If the table table_name does not have a row where colname = value AND colname2 = value2 AND colname3 = value3 AND colname4 = value4, the block will be executed.
+
+--  #IfNotRow2Dx2
+--    desc:      This is a very specialized function to allow adding items to the list_options table to avoid both redundant option_id and title in each element.
+--    arguments: table_name colname value colname2 value2 colname3 value3
+--    behavior:  The block will be executed if both statements below are true:
+--               1) The table table_name does not have a row where colname = value AND colname2 = value2.
+--               2) The table table_name does not have a row where colname = value AND colname3 = value3.
+
+--  #IfRow2D
+--    arguments: table_name colname value colname2 value2
+--    behavior:  If the table table_name does have a row where colname = value AND colname2 = value2, the block will be executed.
+
+--  #IfRow3D
+--        arguments: table_name colname value colname2 value2 colname3 value3
+--        behavior:  If the table table_name does have a row where colname = value AND colname2 = value2 AND colname3 = value3, the block will be executed.
+
+--  #IfIndex
+--    desc:      This function is most often used for dropping of indexes/keys.
+--    arguments: table_name colname
+--    behavior:  If the table and index exist the relevant statements are executed, otherwise not.
+
+--  #IfNotIndex
+--    desc:      This function will allow adding of indexes/keys.
+--    arguments: table_name colname
+--    behavior:  If the index does not exist, it will be created
+
+--  #EndIf
+--    all blocks are terminated with a #EndIf statement.
+
+--  #IfNotListReaction
+--    Custom function for creating Reaction List
+
+--  #IfNotListOccupation
+--    Custom function for creating Occupation List
+
+--  #IfTextNullFixNeeded
+--    desc: convert all text fields without default null to have default null.
+--    arguments: none
+
+--  #IfTableEngine
+--    desc:      Execute SQL if the table has been created with given engine specified.
+--    arguments: table_name engine
+--    behavior:  Use when engine conversion requires more than one ALTER TABLE
+
+--  #IfInnoDBMigrationNeeded
+--    desc: find all MyISAM tables and convert them to InnoDB.
+--    arguments: none
+--    behavior: can take a long time.
+
+--  #IfTranslationNeeded
+--    desc: find all MyISAM tables and convert them to InnoDB.
+--    arguments: constant_name english hebrew
+--    behavior: can take a long time.
+
diff --git a/modules/ImportData/version.php b/modules/ImportData/version.php
index e2d742c..e5e2435 100644
--- a/modules/ImportData/version.php
+++ b/modules/ImportData/version.php
@@ -1,5 +1,5 @@
 <?php
 
-$v_major = '0';
-$v_minor = '1';
-$v_patch = '0';
\ No newline at end of file
+$v_major = '1';
+$v_minor = '0';
+$v_patch = '0';
diff --git a/modules/ReportTool/version.php b/modules/ReportTool/version.php
new file mode 100644
index 0000000..e2d742c
--- /dev/null
+++ b/modules/ReportTool/version.php
@@ -0,0 +1,5 @@
+<?php
+
+$v_major = '0';
+$v_minor = '1';
+$v_patch = '0';
\ No newline at end of file

From 3d8d7e68c0205bcd03158d6436e7f1376c9ff6a9 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Mon, 28 Dec 2020 15:07:37 +0200
Subject: [PATCH 06/37] fix EM-460

---
 .../Controller/PdfBaseController.php          | 13 +++++++++++-
 .../FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql    | 16 ++++++++++++++
 modules/FhirAPI/sql/install.sql               | 21 +++++++++----------
 .../Observation/FhirObservationMapping.php    |  2 +-
 4 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
index 326a13a..bd6fe29 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
@@ -279,6 +279,11 @@ public function getConstantVitals($pid,$category,$acitivity,$order)
                 foreach ($v as $key => $value) {
                     if ($key !== 'height' && $key !== 'weight') {
                         unset($vitals[$k][$key]);
+                    } else {
+                        $vitals[$k][$key][2] = (is_null($value[2]) || $value[2] == "" || $value[2] == 0 && $value[2] == "0.00") ?"-":$value[2];
+                        if ($key === 'weight' && $vitals[$k][$key][2] !== '-') {
+                            $vitals[$k][$key][2] =  number_format($value[2],1);
+                        }
                     }
                 }
             }
@@ -301,7 +306,7 @@ public function getVariantVitals($pid,$category,$acitivity,$order)
                     $vitals[$key]['pressure'][$k] = $vitals[$key]['bpd'][$k];
                 }
                 else {
-                    $vitals[$key]['pressure'][$k] = $vitals[$key]['bpd'][$k] . "/" . $vitals[$key]['bps'][$k];
+                    $vitals[$key]['pressure'][$k] = $vitals[$key]['bps'][$k] . "/" . $vitals[$key]['bpd'][$k];
                 }
             }
 
@@ -316,6 +321,12 @@ public function getVariantVitals($pid,$category,$acitivity,$order)
                     case 'head_circ':
                         unset($vitals[$key][$k]);
                         break;
+                    case 'temperature':
+                        $vitals[$key][$k][2] = number_format($vitals[$key][$k][2],1);
+                    case 'pulse':
+                    case 'respiration':
+                    case 'oxygen_saturation':
+                        $vitals[$key][$k][2] = number_format($vitals[$key][$k][2],0);
                     case 'date':
                         $time = explode(":",$vitals[$key][$k][1]);
                         unset($time[2]);
diff --git a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
index 8a631ba..4790d2b 100644
--- a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
+++ b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -90,3 +90,19 @@
 --    arguments: constant_name english hebrew
 --    behavior: can take a long time.
 
+REPLACE INTO `list_options` (`list_id`, `option_id`, `title`, `seq`,`mapping` ,`notes`, `activity`,`subtype`) VALUES
+('loinc_org', '8480-6', 'Systolic blood pressure', 10,'bps','{"mask": "___","label":"Blood pressure"}', 1,'mmHg'),
+('loinc_org', '8462-4', 'Diastolic blood pressure', 20,'bpd','{"mask": "___","label":"Blood pressure"}', 1,'mmHg'),
+('loinc_org', '8308-9', 'Body height --standing', 30,'height','{"label": "Height","mask":"___"}', 1,'cm'),
+('loinc_org', '8335-2', 'Body weight Estimated', 40,'weight','{"label": "Weight","mask":"___._"}', 1,'Kg'),
+('loinc_org', '69000-8','Heart rate --sitting', 50,'pulse','{"label": "Pulse","mask": "___"}', 1,'PRA'),
+('loinc_org', '8310-5', 'Body temperature', 60,'temperature','{"label": "Fever","mask": "__._"}', 1,'C'),
+('loinc_org', '8327-9', 'Body temperature measurement site', 70,'temp_method','', 1,''),
+('loinc_org', '20564-1', 'Oxygen saturation in Blood', 80,'oxygen_saturation','{"label": "Saturation","mask": "___%"}', 1,'%'),
+('loinc_org', '39156-5', 'Body mass index (BMI) [Ratio]', 90,'BMI','', 1,'kg/m2'),
+('loinc_org', '59574-4', 'Body mass index (BMI) [Percentile]', 100,'BMI_status','', 1,''),
+('loinc_org', '8280-0', 'Waist Circumference at umbilicus by Tape measure', 110,'waist_circ','', 1,'cm'),
+('loinc_org', '8287-5', 'Head Occipital-frontal circumference by Tape measure', 120,'head_circ','', 1,'cm'),
+('loinc_org', '9303-9', 'Respiratory rate --resting', 130,'respiration','{"label": "Breaths per minute","mask": "__"}', 1,'BPM'),
+('loinc_org', '72514-3', 'Pain severity - 0-10 verbal numeric rating [Score] - Reported', 140,'pain_severity','{"label": "Pain level","mask": "__"}', 1,''),
+('loinc_org', '74774-1', 'Glucose [Mass/volume] in Serum, Plasma or Blood', 150,'glucose','{"label": "Blood sugar","mask": "___"}', 1,'mg/dL');
diff --git a/modules/FhirAPI/sql/install.sql b/modules/FhirAPI/sql/install.sql
index 502740d..de3b81a 100644
--- a/modules/FhirAPI/sql/install.sql
+++ b/modules/FhirAPI/sql/install.sql
@@ -246,22 +246,21 @@ ADD `status_update_date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `seco
 
 
 INSERT INTO `list_options` (`list_id`, `option_id`, `title`, `seq`,`mapping` ,`notes`, `activity`,`subtype`) VALUES
-('lists', 'loinc_org', 'http://loinc.org', 0,'','', 1,''),
-('loinc_org', '8480-6', 'Systolic blood pressure', 10,'bps','{"mask": "999","label":"Blood pressure"}', 1,'mmHg'),
-('loinc_org', '8462-4', 'Diastolic blood pressure', 20,'bpd','{"mask": "999","label":"Blood pressure"}', 1,'mmHg'),
-('loinc_org', '8308-9', 'Body height --standing', 30,'height','{"label": "Height","mask":"999"}', 1,'cm'),
-('loinc_org', '8335-2', 'Body weight Estimated', 40,'weight','{"label": "Weight","mask":"999.9"}', 1,'Kg'),
-('loinc_org', '69000-8','Heart rate --sitting', 50,'pulse','{"label": "Pulse","mask": "99"}', 1,'PRA'),
-('loinc_org', '8310-5', 'Body temperature', 60,'temperature','{"label": "Fever","mask": "99.9"}', 1,'C'),
+('loinc_org', '8480-6', 'Systolic blood pressure', 10,'bps','{"mask": "___","label":"Blood pressure"}', 1,'mmHg'),
+('loinc_org', '8462-4', 'Diastolic blood pressure', 20,'bpd','{"mask": "___","label":"Blood pressure"}', 1,'mmHg'),
+('loinc_org', '8308-9', 'Body height --standing', 30,'height','{"label": "Height","mask":"___"}', 1,'cm'),
+('loinc_org', '8335-2', 'Body weight Estimated', 40,'weight','{"label": "Weight","mask":"___._"}', 1,'Kg'),
+('loinc_org', '69000-8','Heart rate --sitting', 50,'pulse','{"label": "Pulse","mask": "___"}', 1,'PRA'),
+('loinc_org', '8310-5', 'Body temperature', 60,'temperature','{"label": "Fever","mask": "__._"}', 1,'C'),
 ('loinc_org', '8327-9', 'Body temperature measurement site', 70,'temp_method','', 1,''),
-('loinc_org', '20564-1', 'Oxygen saturation in Blood', 80,'oxygen_saturation','{"label": "Saturation","mask": "999%"}', 1,'%'),
+('loinc_org', '20564-1', 'Oxygen saturation in Blood', 80,'oxygen_saturation','{"label": "Saturation","mask": "___%"}', 1,'%'),
 ('loinc_org', '39156-5', 'Body mass index (BMI) [Ratio]', 90,'BMI','', 1,'kg/m2'),
 ('loinc_org', '59574-4', 'Body mass index (BMI) [Percentile]', 100,'BMI_status','', 1,''),
 ('loinc_org', '8280-0', 'Waist Circumference at umbilicus by Tape measure', 110,'waist_circ','', 1,'cm'),
 ('loinc_org', '8287-5', 'Head Occipital-frontal circumference by Tape measure', 120,'head_circ','', 1,'cm'),
-('loinc_org', '9303-9', 'Respiratory rate --resting', 130,'respiration','{"label": "Breaths per minute","mask": "99"}', 1,'BPM'),
-('loinc_org', '72514-3', 'Pain severity - 0-10 verbal numeric rating [Score] - Reported', 140,'pain_severity','{"label": "Pain level","mask": "99"}', 1,''),
-('loinc_org', '74774-1', 'Glucose [Mass/volume] in Serum, Plasma or Blood', 150,'glucose','{"label": "Blood sugar","mask": "999"}', 1,'mg/dL');
+('loinc_org', '9303-9', 'Respiratory rate --resting', 130,'respiration','{"label": "Breaths per minute","mask": "__"}', 1,'BPM'),
+('loinc_org', '72514-3', 'Pain severity - 0-10 verbal numeric rating [Score] - Reported', 140,'pain_severity','{"label": "Pain level","mask": "__"}', 1,''),
+('loinc_org', '74774-1', 'Glucose [Mass/volume] in Serum, Plasma or Blood', 150,'glucose','{"label": "Blood sugar","mask": "___"}', 1,'mg/dL');
 
 ALTER TABLE `form_vitals`
 ADD `glucose` INT NULL AFTER `external_id`,
diff --git a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
index f520cf4..9246536 100644
--- a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
+++ b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
@@ -191,7 +191,7 @@ public function fhirToDb($FHIRObservation)
             }
 
             $Quantity=$comp->getValueQuantity()->getValue();
-            $QuantityVal=$Quantity->getValue();
+            $QuantityVal=str_replace('_', '', $Quantity->getValue());
             if(!is_null($QuantityVal)){
                 $lonicCode=$comp->getValueQuantity()->getCode()->getValue();
                 $dbObservation[$LonicToDbMappig[$lonicCode]]=$QuantityVal;

From 3353711cdd33163734d2b00b234e2a3f243fba16 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Tue, 29 Dec 2020 16:56:02 +0200
Subject: [PATCH 07/37] chage sql of valueset - performance issue

---
 .../src/GenericTools/Model/ValueSetsTable.php | 89 +++++++++++++++++--
 1 file changed, 84 insertions(+), 5 deletions(-)

diff --git a/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php b/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
index 7a44ec8..8f3cb2b 100644
--- a/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
+++ b/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
@@ -22,7 +22,58 @@ public function getValueSetById($id,$where = array())
         $params= array();
         $params[]=$id;
 
-        $sql=
+        $type = $this->getValueSetType($id);
+        if ($type !== 'Codes') {
+            $sql = "SELECT  
+                    fvs.id AS vs_id,
+                    fvs.title AS vs_title,
+                    fvs.status AS vs_status,
+                    fvss.system AS system,
+                    lo.option_id AS code,
+                    lo.title AS display
+                FROM
+                    fhir_value_sets AS fvs
+                        JOIN
+                    fhir_value_set_systems AS fvss ON fvs.id = fvss.vs_id
+                        LEFT JOIN
+                    fhir_value_set_codes AS fvsc ON fvss.id = fvsc.vss_id
+                        JOIN list_options AS lo ON fvss.system = lo.list_id
+                        AND ((fvss.type = 'All'
+                        )
+                        OR (fvss.type = 'Partial'
+                        AND fvsc.code = lo.option_id
+                        )
+                        OR (fvss.type = 'Exclude'
+                        AND fvsc.code != lo.option_id
+                        )
+                        OR (fvss.type = 'Filter'
+                        AND fvss.filter = lo.notes
+                        )
+                        OR (fvss.type = 'Codes')
+                        )
+                WHERE
+                    fvs.id = ? ";
+        } else {
+            $sql = "SELECT 
+                    fvs.id AS vs_id,
+                    fvs.title AS vs_title,
+                    fvs.status AS vs_status,
+                    fvss.system AS system,
+                    co.code AS code,
+                    co.code_text AS display
+                FROM
+                    fhir_value_sets AS fvs
+                        JOIN
+                    fhir_value_set_systems AS fvss ON fvs.id = fvss.vs_id
+                        LEFT JOIN
+                    fhir_value_set_codes AS fvsc ON fvss.id = fvsc.vss_id
+                        JOIN codes AS co ON fvss.system = co.code_type
+                WHERE
+                    fvs.id = ? ";
+        }
+
+        // put original sql in comment - cause very serious performance problems
+       /* $sql=
             "
             SELECT fvs.id as vs_id, fvs.title as vs_title, fvs.status as vs_status, fvss.system as system, lo.a_option_id as code, lo.a_title as display
             FROM {$this->tableGateway->table} AS fvs
@@ -52,7 +103,7 @@ public function getValueSetById($id,$where = array())
 
                 )
                 ";
-        $sql .= " WHERE fvs.id = ? ";
+        $sql .= " WHERE fvs.id = ? ";*/
 
         foreach($where as $index => $conditionSet){
 
@@ -70,13 +121,20 @@ public function getValueSetById($id,$where = array())
 
                         $params[]=$condition['value'];
                         $params[]=$condition['value'];
-                        $sql .= "AND ( lo.a_option_id " . $action . " OR lo.a_title " . $action . " ) ";
+                        if ($type !== 'Codes') {
+                            $sql .= "AND ( lo.option_id " . $action . " OR lo.title " . $action . " ) ";
+                        } else {
+                            $sql .= "AND ( co.code " . $action . " OR co.code_text " . $action . " ) ";
+                        }
                     }
                 }
             }
         }
-
-        $sql .= " ORDER BY lo.a_list_id, lo.a_seq ";
+        if ($type !== 'Codes') {
+            $sql .= " ORDER BY lo.list_id, lo.seq ";
+        } else {
+            $sql .= " ORDER BY co.code_type , co.code ";
+        }
 
         $statement = $this->tableGateway->adapter->createStatement($sql, $params);
         $return = $statement->execute();
@@ -112,4 +170,25 @@ public function getCodeTypeByValueSet($valueSet)
         }
      }
 
+    public function getValueSetType($valueSetId)
+    {
+        $params= array();
+        $params[]=$valueSetId;
+
+        $sql  = "SELECT type FROM  fhir_value_set_systems WHERE vs_id = ?";
+
+        $statement = $this->tableGateway->adapter->createStatement($sql, $params);
+        $return = $statement->execute();
+
+        $results = array();
+        foreach ($return as $row) {
+            $results[] = $row;
+        }
+        if (!empty($results)){
+            return $results[0]['type'];
+        }else{
+            return null;
+        }
+    }
+
 }

From d8417d9a9d709ba118ef7e4f72e953ae27f3a246 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Wed, 30 Dec 2020 21:00:26 +0200
Subject: [PATCH 08/37] fix empty pdf page

---
 .../src/ClinikalAPI/Controller/PdfBaseController.php         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
index bd6fe29..d13c783 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
@@ -188,8 +188,11 @@ public function createBase64Pdf($fileName,$bodyPath,$headerPath, $footerPath,$he
         {
             foreach($bodyPath as $key=>$path) {
                 $bodyData=$bodyDataTemp[$key];
+                if ($key > 0) {
+                    $this->getPdfService()->pagebreak();
+                }
                 $this->getPdfService()->bodyBuilder($path, $bodyData);
-                $this->getPdfService()->pagebreak();
+
             }
         }
         else {

From 00d1531cdae6f7839848385530d65980adbdc3f8 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Mon, 11 Jan 2021 16:46:48 +0200
Subject: [PATCH 09/37] add missing use statement

---
 .../Parts/Strategy/StrategyElement/Encounter/Encounter.php       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Encounter/Encounter.php b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Encounter/Encounter.php
index caaeccd..d641283 100644
--- a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Encounter/Encounter.php
+++ b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Encounter/Encounter.php
@@ -18,6 +18,7 @@
 use FhirAPI\FhirRestApiBuilder\Parts\Strategy\Strategy;
 use FhirAPI\Model\QuestionnaireResponseTable;
 
+use GenericTools\Model\DocumentsTable;
 use GenericTools\Model\FormEncounterTable;
 use Interop\Container\ContainerInterface;
 

From 491bd11f53eaa5538e4b32dc45433dfcd102b797 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Tue, 12 Jan 2021 14:38:09 +0200
Subject: [PATCH 10/37] fixes - EM-463

---
 .../Controller/PdfBaseController.php          | 32 +++++++++----------
 .../Model/QuestionnaireMapTable.php           |  1 +
 .../src/GenericTools/Model/DocumentsTable.php |  1 -
 .../GenericTools/Model/FormVitalsTable.php    |  4 +--
 .../GenericTools/Model/ListsOpenEmrTable.php  | 11 +++++--
 .../src/GenericTools/Service/PdfService.php   |  2 +-
 6 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
index d13c783..db3d0d8 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
@@ -78,10 +78,10 @@ public function getPatientInfo($id = null)
         }
     }
 
-    public function getListsOpenEMRInfo($type=null,$pid,$outcome)
+    public function getListsOpenEMRInfo($type=null,$pid,$encounter,$outcome)
     {
         if (!is_null($type)) {
-            $info = $this->container->get('GenericTools\Model\ListsOpenEmrTable')->getListWithTheType($type,$pid,$outcome);
+            $info = $this->container->get('GenericTools\Model\ListsOpenEmrTable')->getListWithTheType($type,$pid,$encounter,$outcome);
             return $info;
 
         } else {
@@ -250,13 +250,13 @@ public function getServiceTypeAndReasonCodeArray(){
     }
 
     public function getSensitivities(){
-        return $this->getListsOpenEMRInfo("sensitive",$this->postData['patient'],1);
+        return $this->getListsOpenEMRInfo("sensitive",$this->postData['patient'],$this->postData['encounter'],1);
     }
     public function getMedicalProblems(){
-        return $this->getListsOpenEMRInfo("medical_problem",$this->postData['patient'],1);
+        return $this->getListsOpenEMRInfo("medical_problem",$this->postData['patient'],$this->postData['encounter'],1);
     }
     public function getMedicine(){
-        return $this->getListsOpenEMRInfo("medication",$this->postData['patient'],1);
+        return $this->getListsOpenEMRInfo("medication",$this->postData['patient'],$this->postData['encounter'],1);
     }
     public function createTableJsonFromVitals($vitals){
         $arrTemp = [];
@@ -273,9 +273,9 @@ public function createTableJsonFromVitals($vitals){
 
         return $arrTemp;
     }
-    public function getConstantVitals($pid,$category,$acitivity,$order)
+    public function getConstantVitals($encounter,$pid,$category,$acitivity,$order)
     {
-        $vitals = $this->getVitals($pid,$category,$acitivity,$order);
+        $vitals = $this->getVitals($encounter,$pid,$category,$acitivity,$order);
         foreach($vitals as $k=>$v)
         {
             if($k === 0) {
@@ -284,8 +284,8 @@ public function getConstantVitals($pid,$category,$acitivity,$order)
                         unset($vitals[$k][$key]);
                     } else {
                         $vitals[$k][$key][2] = (is_null($value[2]) || $value[2] == "" || $value[2] == 0 && $value[2] == "0.00") ?"-":$value[2];
-                        if ($key === 'weight' && $vitals[$k][$key][2] !== '-') {
-                            $vitals[$k][$key][2] =  number_format($value[2],1);
+                        if ($vitals[$k][$key][2] !== '-') {
+                            $vitals[$k][$key][2] = $key === 'weight' ? number_format($value[2],1) : number_format($value[2]);
                         }
                     }
                 }
@@ -296,9 +296,9 @@ public function getConstantVitals($pid,$category,$acitivity,$order)
         }
         return sizeof($vitals[0]) > 1 ? $this->createTableJsonFromVitals($vitals) : null;
     }
-    public function getVariantVitals($pid,$category,$acitivity,$order)
+    public function getVariantVitals($encounter,$pid,$category,$acitivity,$order)
     {
-        $vitals = $this->getVitals($pid,$category,$acitivity,$order);
+        $vitals = $this->getVitals($encounter,$pid,$category,$acitivity,$order);
 
 
 
@@ -325,11 +325,11 @@ public function getVariantVitals($pid,$category,$acitivity,$order)
                         unset($vitals[$key][$k]);
                         break;
                     case 'temperature':
-                        $vitals[$key][$k][2] = number_format($vitals[$key][$k][2],1);
+                        $vitals[$key][$k][2] = $vitals[$key][$k][2] !== '0.00' && $vitals[$key][$k][2] > 0 ? number_format($vitals[$key][$k][2],1) : '-';
                     case 'pulse':
                     case 'respiration':
                     case 'oxygen_saturation':
-                        $vitals[$key][$k][2] = number_format($vitals[$key][$k][2],0);
+                        $vitals[$key][$k][2] = $vitals[$key][$k][2] !== '0.00' && $vitals[$key][$k][2] > 0 ? number_format($vitals[$key][$k][2],0) : '-';
                     case 'date':
                         $time = explode(":",$vitals[$key][$k][1]);
                         unset($time[2]);
@@ -349,7 +349,7 @@ public function getVariantVitals($pid,$category,$acitivity,$order)
 
         return $this->createTableJsonFromVitals($vitals);
     }
-    public function getVitals($pid,$category,$acitivity,$order){
+    public function getVitals($encounter,$pid,$category,$acitivity,$order){
         $observationList =  $this->container->get('GenericTools\Model\ListsTable')->getList("loinc_org");
         $observationTitleList = [];
         foreach($observationList as $key=>$value)
@@ -357,7 +357,7 @@ public function getVitals($pid,$category,$acitivity,$order){
             $notes = json_decode($value['notes']);
             $observationTitleList[$value['mapping']] = [xl($notes->label),xl($value['subtype'])];
         }
-        $observations = $this->container->get('GenericTools\Model\FormVitalsTable')->getVitals($pid,$category,$acitivity,$order);
+        $observations = $this->container->get('GenericTools\Model\FormVitalsTable')->getVitals($encounter,$pid,$category,$acitivity,$order);
         $observedArr = [];
 
         foreach($observations as $keyParent=>$valuesParent)
@@ -368,7 +368,7 @@ public function getVitals($pid,$category,$acitivity,$order){
                     $observedArr[$keyParent][$key] = array_merge($observationTitleList[$key], [$value]);
                 }
                 if($key==="date"){
-                    $observedArr[$keyParent][$key]=[xlt("Hour"), explode(" ",$value)[1]];
+                    $observedArr[$keyParent][$key]=[xlt("Hour"), oeFormatDateTime($value)];
                 }
             }
 
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Model/QuestionnaireMapTable.php b/modules/ClinikalAPI/src/ClinikalAPI/Model/QuestionnaireMapTable.php
index 91f9264..66e361f 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Model/QuestionnaireMapTable.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Model/QuestionnaireMapTable.php
@@ -50,6 +50,7 @@ public function getQuestionnaireAnswer($encounter_id=null,$question_id=null){
         foreach ($rs as $r) {
             $rsArray[] = get_object_vars($r);
         }
+        print_r($rsArray);DIE;
         return $rsArray;
     }
 }
diff --git a/modules/GenericTools/src/GenericTools/Model/DocumentsTable.php b/modules/GenericTools/src/GenericTools/Model/DocumentsTable.php
index 3d49ab1..c094edd 100644
--- a/modules/GenericTools/src/GenericTools/Model/DocumentsTable.php
+++ b/modules/GenericTools/src/GenericTools/Model/DocumentsTable.php
@@ -5,7 +5,6 @@
 
 use GenericTools\Model\UtilsTraits\JoinBuilder;
 use Laminas\Db\Sql\Select;
-use Laminas\Db\Sql\Sql;
 use Laminas\Db\TableGateway\TableGateway;
 use Laminas\Db\Sql\Expression;
 
diff --git a/modules/GenericTools/src/GenericTools/Model/FormVitalsTable.php b/modules/GenericTools/src/GenericTools/Model/FormVitalsTable.php
index 10c4c51..8da7c61 100644
--- a/modules/GenericTools/src/GenericTools/Model/FormVitalsTable.php
+++ b/modules/GenericTools/src/GenericTools/Model/FormVitalsTable.php
@@ -15,8 +15,8 @@ public function __construct(TableGateway $tableGateway)
         $this->tableGateway = $tableGateway;
     }
 
-    public function getVitals($pid,$category,$activity,$order){
-        return $this->buildGenericSelect(['pid'=>$pid,'category'=>$category,'activity'=>$activity],$order);
+    public function getVitals($encounter,$pid,$category,$activity,$order){
+        return $this->buildGenericSelect(['eid' => $encounter,'pid'=>$pid,'category'=>$category,'activity'=>$activity],$order);
     }
 
 }
diff --git a/modules/GenericTools/src/GenericTools/Model/ListsOpenEmrTable.php b/modules/GenericTools/src/GenericTools/Model/ListsOpenEmrTable.php
index 33e4f79..411fefb 100644
--- a/modules/GenericTools/src/GenericTools/Model/ListsOpenEmrTable.php
+++ b/modules/GenericTools/src/GenericTools/Model/ListsOpenEmrTable.php
@@ -69,7 +69,7 @@ public function fetchListUpToDate($listType,$endDate,$pid)
         }
         return $rsArray;
     }
-    public function getListWithTheType($type,$pid,$outcome)
+    public function getListWithTheType($type,$pid,$encounter,$outcome)
     {
         /*
 
@@ -94,10 +94,17 @@ public function getListWithTheType($type,$pid,$outcome)
             ["ct_id","ct_key"],
             Select::JOIN_RIGHT
         );
+        $this->join = $this->appendJoin(
+            ["ie"=>"issue_encounter"],
+            new Expression("ie.pid=lists.pid AND ie.list_id=lists.id"),
+            ['encounter'=>'encounter','resolved'=>'resolved'],
+            Select::JOIN_LEFT
+        );
+
         //WAIT FOR SOSH $this->joinTables(); // add new join code
         $this->join = $this->getJoins();
 
-        $rs = $this->buildGenericSelect(['lists.type'=>$type,'lists.outcome'=>$outcome,"lists.pid"=>$pid]);
+        $rs = $this->buildGenericSelect(['lists.type'=>$type,'lists.outcome'=>$outcome,"lists.pid"=>$pid, "encounter"=>$encounter]);
 
         foreach ($rs as $r) {
             $rsArray[] = xl($r['code_text']);
diff --git a/modules/GenericTools/src/GenericTools/Service/PdfService.php b/modules/GenericTools/src/GenericTools/Service/PdfService.php
index 913a2f4..3ed92e6 100644
--- a/modules/GenericTools/src/GenericTools/Service/PdfService.php
+++ b/modules/GenericTools/src/GenericTools/Service/PdfService.php
@@ -255,7 +255,7 @@ public function setCustomHeaderFooter($headerPath,$footerPath,$data=array(),$sho
         $showDate=($showDate===true) ? 'true' : $showDate;
         switch ($showDate) {
             case "datetime":
-                $showDate= oeFormatDateTime(date("Y-m-d H:m"),false, false);
+                $showDate= oeFormatDateTime(date("Y-m-d H:i"),false, false);
                 break;
             case false :
                 $showDate= false;

From deb3197f7ce674a032ba5dbf5134052dc96fd5a8 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Tue, 12 Jan 2021 15:04:46 +0200
Subject: [PATCH 11/37] fixes - EM-463

---
 .../src/ClinikalAPI/Controller/PdfBaseController.php       | 7 +++++++
 .../src/ClinikalAPI/Model/QuestionnaireMapTable.php        | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
index db3d0d8..e8b211f 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
@@ -6,6 +6,7 @@
 use FhirAPI\FhirRestApiBuilder\Parts\Strategy\StrategyElement\ServiceRequest\FhirServiceRequestMapping;
 use FhirAPI\FhirRestApiBuilder\Parts\Strategy\StrategyElement\ServiceRequest\ServiceRequest;
 use FhirAPI\Model\FhirServiceRequestTable;
+use FhirAPI\Model\QuestionnaireResponseTable;
 use Formhandler\View\Helper\GenericTable;
 use GenericTools\Controller\BaseController as GenericBaseController;
 use GenericTools\Model\AclTables;
@@ -420,4 +421,10 @@ public function getDrugForm(){
         return $list;
     }
 
+    public function getQuestionareUpdatedUser($encounter, $questionaireName)
+    {
+        $result = $this->container->get(QuestionnaireResponseTable::class)->buildGenericSelect(['encounter' => $encounter, 'form_name' => $questionaireName]);
+        return !empty($result) ? $result[0]['update_by'] : null;
+    }
+
 }
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Model/QuestionnaireMapTable.php b/modules/ClinikalAPI/src/ClinikalAPI/Model/QuestionnaireMapTable.php
index 66e361f..91f9264 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Model/QuestionnaireMapTable.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Model/QuestionnaireMapTable.php
@@ -50,7 +50,6 @@ public function getQuestionnaireAnswer($encounter_id=null,$question_id=null){
         foreach ($rs as $r) {
             $rsArray[] = get_object_vars($r);
         }
-        print_r($rsArray);DIE;
         return $rsArray;
     }
 }

From c66589f3b943b052fe65c552c6c40134fd8c550b Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Wed, 27 Jan 2021 11:14:37 +0200
Subject: [PATCH 12/37] start point

---
 .../FormTemplatesManagementController.php     | 212 ++++++++++++++++++
 .../Model/GetTemplatesServiceTable.php        |   2 +-
 2 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
new file mode 100644
index 0000000..d66c731
--- /dev/null
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
@@ -0,0 +1,212 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: yuriyge
+ * Date: 2/24/19
+ * Time: 5:59 PM
+ */
+
+namespace ClinikalApi\Controller;
+
+use Interop\Container\ContainerInterface;
+
+class FormTemplatesManagementController extends BaseController
+
+{
+    const TITLE = "Managment of email address for serious side-effects";
+    const MAILS_LIST = "moh_vac_list_mails";
+
+    public function __construct(ContainerInterface $container)
+    {
+        parent::__construct($container);
+        $this->container = $container;
+    }
+
+    public function TempleteManagementIndexAction()
+    {
+//        if (!acl_check('modules', 'warnings_and_contraindications_management', '', 'write')) {
+//            $this->redirect()->toRoute('errors', array('action' => 'access-denied'));
+//        }
+
+        /*$data            = $this->getVacListMailsTable()->fetchAll();
+        $facilities_list = $this->getFacilityTable()->getListWithSomeKeyValue("facility_code", "name");
+        $recipient_mail  = $this->getRecordsByField($data, "recipient_email");
+        $data            = $this->renderDataForDataTable($data, $facilities_list);
+
+        $parameters = array(
+            'data'              => $data,
+            'title'             => xlt(self::TITLE),
+            'facilities_list'   => $facilities_list,
+            'recipient_mail'    => $recipient_mail,
+            'recipientType'     => Array(
+                                         "Permanent" => xlt("Permanent"),
+                                         "Variable" => xlt("Variable"),
+                                        ),
+        );*/
+        $parameters = [];
+        return $this->renderView($parameters, true);
+    }
+
+    public function templatesManagementAjaxAction()
+    {
+        /*if (isset($_GET['action'])) {
+            $recipient_email = ($this->params()->fromQuery('recipient_email') !== null) ? $this->params()->fromQuery('recipient_email') : 'all';
+            $recipient_type  = ($this->params()->fromQuery('recipient_type') !== null) ? $this->params()->fromQuery('recipient_type') : 'all';
+            $facility_id     = ($this->params()->fromQuery('facility_id') !== null) ? $this->params()->fromQuery('facility_id') : 'all';
+
+            $data = $this->getVacListMailsTable()->getAddresses($recipient_email, $recipient_type, $facility_id );
+        } else {
+            $data = $this->getVacListMailsTable()->fetchAll();
+        }
+
+        $facilities_list = $this->getFacilityTable()->getListWithSomeKeyValue("facility_code", "name");
+
+        $data = $this->renderDataForDataTable($data, $facilities_list);*/
+        $parms = array('data' => $data);
+        return $this->responseWithNoLayout($parms, true);
+    }
+
+    /**
+     * @return \Zend\Stdlib\ResponseInterface
+     */
+    public function checkIfTempletesExistAction()
+    {
+        /*$row_id          = intval($_POST['row_id']);
+        $recipient_email = $_POST['recipient_email'];
+        $recipient_type  = $_POST['recipient_type'];
+        $facility_id     = $_POST['facility_id'];
+        $isEdit          = $_POST['is_edit'];
+
+        if ($isEdit == "0") {
+            $rez     = empty($this->getVacListMailsTable()->getAllActiveNames(array(
+                    'recipient_email' => $recipient_email,
+            )));
+            $isExist = ($rez) ? 0 : 1;
+            $data    = array(
+                'is_exist' => $isExist
+            );
+            $parms   = array(
+                'data' => $data
+            );
+        }
+        else {
+            $isExist = 0;
+            $data    = array(
+                'is_exist' => $isExist
+            );
+            $parms   = array(
+                'data' => $data
+            );
+        }*/
+        return $this->responseWithNoLayout($parms, true);
+    }
+
+    /**
+     * @return \Zend\Stdlib\ResponseInterface
+     */
+    public function saveAssignTempleteAction()
+    {
+       /* $row_id          = intval($_POST['row_id']);
+        $recipient_email = $_POST['recipient_email'];
+        $recipient_type  = $_POST['recipient_type'];
+        $facility_id     = $_POST['facility_id'];
+        $isEdit          = $_POST['is_edit'];
+        $updateDate      = date("Y-m-d");
+        $updateBy        = $_SESSION['authUserID'];
+
+        if ($isEdit == 1) {
+            $this->getVacListMailsTable()->updateRow($row_id, $recipient_email, $recipient_type, $facility_id, $updateDate, $updateBy);
+        } else {
+            $this->getVacListMailsTable()->insertRow($recipient_email, $recipient_type, $facility_id, $updateDate, $updateBy);
+        }
+        $data       = "";
+        $parameters = array(
+            'data' => $data
+        );*/
+        return $this->responseWithNoLayout($parameters, true);
+    }
+
+    /**
+     * @return \Zend\View\Model\ViewModel
+     */
+    public function addEditEmailsVaccinesManagementAction()
+    {
+       /* $id              = $this->params()->fromQuery('row_id');
+        $object          = $this->getVacListMailsTable()->fetchRow($id);
+        $facilities_list = $this->getFacilityTable()->getListWithSomeKeyValue("facility_code", "name");
+        $list = array(
+                        "facilities_list" => $facilities_list,
+                     );
+
+        if (!empty($id)) {
+            $is_edit    = 1;
+            $row_id     = $id;
+            $date       = $object['updated_date'];
+            $userName   = $this->getUserNameById($object['updated_by']);
+            $form       = new EmailsVaccinesAddEditForm($list);
+            $form->setData($object);
+        } else {
+            $is_edit    = 0;
+            $row_id     = 0;
+            $date       = "";
+            $userName   = "";
+            $form       = new EmailsVaccinesAddEditForm($list);
+        }*/
+
+        return $this->renderView(array(
+            'title'     => xlt(self::TITLE),
+            'form'      => $form,
+            'userName'  => $userName,
+            'date'      => $date,
+            'is_edit'   => $is_edit,
+            'row_id'    => $row_id,
+        ));
+    }
+
+    /**
+     * @return \Zend\Stdlib\ResponseInterface
+     */
+    public function deleteAssignTempleteAjaxAction()
+    {
+        $request = $this->getRequest();
+        if ($request->isPost()) {
+            $id = $request->getPost()['id'];
+            $status = $this->getVacListMailsTable()->deleteRow($id);
+            return $this->ajaxOutPut( ($status ? 'success' : 'false') );
+        }
+    }
+
+    /**
+     * @param $dataArr
+     * @param $facilities_list
+     * @return array
+     */
+    private function renderDataForDataTable($dataArr,$facilities_list)
+    {
+        $resultAll = array();
+
+        $counter = 0;
+        foreach ($dataArr as $index => $temp_record) {
+            $resultAll[$counter][] = xlt($temp_record['id']);
+            $resultAll[$counter][] = "<span id='editRow_" . $temp_record['id'] . "' class='editRow' style='color:blue' ><u>" . attr($temp_record['recipient_email']) . "</u> </span>";
+            $resultAll[$counter][] = xlt($temp_record['recipient_type']);
+            $resultAll[$counter][] = (array_key_exists($temp_record["facility_id"], $facilities_list) ? xlt($facilities_list[$temp_record['facility_id']]) : "");
+            $counter++;
+        }
+
+        return $resultAll;
+    }
+
+    function getRecordsByField($data, $field_name)
+    {
+        $result = false;
+        if (is_array($data) && strlen($field_name) > 0) {
+            foreach ($data as $row) {
+                if (array_key_exists($field_name, $row) && strlen($row[$field_name]) > 0 ) {
+                    $result[] = $row[$field_name];
+                }
+            }
+        }
+        return (is_array($result) ? array_unique($result) : $result);
+    }
+}
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
index 31fc3f4..298816d 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
@@ -46,7 +46,7 @@ public function getTemplatesForForm($form_id=null,$form_field=null,$service_type
 
         $select->where($where);
         $select->order(array('clinikal_templates_map.seq ASC'));
-        $debug = $select->getSqlString();
+        //$debug = $select->getSqlString();
         $rs = $this->tableGateway->selectWith($select);
         foreach ($rs as $r) {
             $rsArray[] = get_object_vars($r);

From 78a55a394984de3580bc357d8e946ac144b08ea3 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Wed, 27 Jan 2021 11:51:33 +0200
Subject: [PATCH 13/37] assign teplete to all reason codes PC-1399

---
 .../src/ClinikalAPI/Model/GetTemplatesServiceTable.php   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
index 31fc3f4..ea527a1 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
@@ -15,6 +15,7 @@
 class GetTemplatesServiceTable
 {
     const LEFT_JOIN = "LEFT";
+    const ALL_REASON_CODE = 'ALL';
     protected $tableGateway;
     public function __construct(TableGateway $tableGateway)
     {
@@ -39,14 +40,18 @@ public function getTemplatesForForm($form_id=null,$form_field=null,$service_type
 
         if(!is_null($service_type)){
             $where->equalTo("service_type",$service_type)->AND->
-                    in("reason_code",explode(",",$reason_code))->AND->
+                    NEST->
+                        in("reason_code",explode(",",$reason_code))->OR->
+                        equalTo("reason_code",self::ALL_REASON_CODE)->
+                    UNNEST->AND->
                     equalTo("form_field",$form_field)->AND->
                     equalTo("form_id",$form_id);
         }
 
         $select->where($where);
         $select->order(array('clinikal_templates_map.seq ASC'));
-        $debug = $select->getSqlString();
+        //$debug = $select->getSqlString();
+        //echo $debug;die;
         $rs = $this->tableGateway->selectWith($select);
         foreach ($rs as $r) {
             $rsArray[] = get_object_vars($r);

From 32b6b073e3649bdc2ddc4434042e00598900d1db Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 31 Jan 2021 17:19:42 +0200
Subject: [PATCH 14/37] list page - PC-1575 PC-1576

---
 modules/ClinikalAPI/Module.php                |  24 +-
 modules/ClinikalAPI/config/module.config.php  |  21 +
 .../sql/1_0_0-to-2_0_0_upgrade.sql            |  11 +
 modules/ClinikalAPI/sql/install.sql           |  12 +
 .../FormTemplatesManagementController.php     | 166 +++++---
 .../Model/GetTemplatesServiceTable.php        |  38 ++
 .../assign-templete.phtml                     | 380 ++++++++++++++++++
 .../templates-management-index.phtml          | 251 ++++++++++++
 modules/ClinikalAPI/view/layout/layout.phtml  |  55 +++
 .../datatable}/dataTablesExtend.css           |   0
 .../datatable}/jquery.dataTables.min.css      |   0
 .../datatable}/buttons.html5.min.js           |   0
 .../datatable}/buttons.print.min.js           |   0
 .../datatable}/dataTables.bootstrap.min.js    |   0
 .../datatable}/dataTables.buttons.min.js      |   0
 .../datatable}/dataTablesExtend.js            |   0
 .../generictools/datatable}/datatables.min.js |   0
 .../generictools/datatable}/jquery.min.js     |   0
 .../sql/1_0_0-to-2_0_0_upgrade.sql            |  22 +
 modules/GenericTools/sql/install.sql          |  43 ++
 .../DataTableExtended/DataTableExtended.php   |  21 +-
 .../UiComponents/Header/ClinikalHeaders.php   |   1 +
 .../ValidateJS/ValidateJsFunctions.php        |   3 +-
 .../src/GenericTools/Model/RegistryTable.php  |  15 +
 modules/ReportTool/sql/install.sql            |  22 +-
 25 files changed, 1004 insertions(+), 81 deletions(-)
 create mode 100644 modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-templete.phtml
 create mode 100644 modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
 create mode 100644 modules/ClinikalAPI/view/layout/layout.phtml
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/css => css/generictools/datatable}/dataTablesExtend.css (100%)
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/css => css/generictools/datatable}/jquery.dataTables.min.css (100%)
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/js => js/generictools/datatable}/buttons.html5.min.js (100%)
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/js => js/generictools/datatable}/buttons.print.min.js (100%)
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/js => js/generictools/datatable}/dataTables.bootstrap.min.js (100%)
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/js => js/generictools/datatable}/dataTables.buttons.min.js (100%)
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/js => js/generictools/datatable}/dataTablesExtend.js (100%)
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/js => js/generictools/datatable}/datatables.min.js (100%)
 rename modules/GenericTools/{src/GenericTools/Library/UiComponents/DataTableExtended/src/js => js/generictools/datatable}/jquery.min.js (100%)

diff --git a/modules/ClinikalAPI/Module.php b/modules/ClinikalAPI/Module.php
index ca7239f..cc61337 100644
--- a/modules/ClinikalAPI/Module.php
+++ b/modules/ClinikalAPI/Module.php
@@ -157,6 +157,28 @@ public function initApi($m)
 
     }
 
-
+    /**
+     * load global variables foe every controllers
+     * @param ModuleManager $manager
+     */
+    public function init(ModuleManager $manager)
+    {
+        $events = $manager->getEventManager();
+        $sharedEvents = $events->getSharedManager();
+
+        $sharedEvents->attach(__NAMESPACE__, 'dispatch', function ($e) {
+            $controller = $e->getTarget();
+            //$controller->layout()->setVariable('status', null);
+            $controller->layout('clinikalApi/layout/layout');
+
+            //global variable of language direction
+            $controller->layout()->setVariable('language_direction', $_SESSION['language_direction']);
+
+            // autoloader for ui-components from clinikal folder.
+            /*spl_autoload_register(function ($class) {
+                require_once $GLOBALS['fileroot'].'/clinikal/ui-components/' . str_replace("\\", '/', $class) . '.php';
+            });*/
+        }, 100);
+    }
 
 }
diff --git a/modules/ClinikalAPI/config/module.config.php b/modules/ClinikalAPI/config/module.config.php
index e10050f..e3b7861 100644
--- a/modules/ClinikalAPI/config/module.config.php
+++ b/modules/ClinikalAPI/config/module.config.php
@@ -18,6 +18,7 @@
  */
 
 use ClinikalAPI\Controller\ManagerApi;
+use ClinikalAPI\Controller\FormTemplatesManagementController;
 use Interop\Container\ContainerInterface;
 
 return array(
@@ -29,6 +30,9 @@
             ManagerApi::class => function (ContainerInterface $container) {
                 return new ManagerApi($container);
             },
+            FormTemplatesManagementController::class => function (ContainerInterface $container) {
+                return new FormTemplatesManagementController($container);
+            },
         ],
 
     ),
@@ -53,6 +57,19 @@
                     ),
                 ),
             ),
+            'templetes_management' => array(
+                'type' => 'segment',
+                'options' => array(
+                    'route' => '/templates-management[/:action]',
+                    'constraints' => array(
+                        'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                    ),
+                    'defaults' => array(
+                        'controller' => FormTemplatesManagementController::class,
+                        'action' => 'templatesManagementIndex',
+                    ),
+                ),
+            ),
         ),
     ),
 
@@ -61,5 +78,9 @@
         'template_path_stack' => array(
             'ClinikalAPI' => __DIR__ . '/../view',
         ),
+        'template_map' => array(
+            'clinikalApi/layout/layout' => __DIR__ . '/../view/layout/layout.phtml',
+        )
     ),
+
 );
diff --git a/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
index 8a631ba..d1f2120 100644
--- a/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
+++ b/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -90,3 +90,14 @@
 --    arguments: constant_name english hebrew
 --    behavior: can take a long time.
 
+#IfMissingColumn clinikal_templates_map active
+ALTER TABLE `clinikal_templates_map` ADD `active` tinyint(1) NOT NULL DEFAULT 1;
+#EndIf
+
+#IfMissingColumn clinikal_templates_map update_by
+ALTER TABLE `clinikal_templates_map` ADD `update_by` int(11)  NOT NULL;
+#EndIf
+
+#IfMissingColumn clinikal_templates_map update_date
+ALTER TABLE `clinikal_templates_map` ADD `update_date` datetime NOT NULL DEFAULT current_timestamp;
+#EndIf
diff --git a/modules/ClinikalAPI/sql/install.sql b/modules/ClinikalAPI/sql/install.sql
index 09d04c1..f2a664f 100644
--- a/modules/ClinikalAPI/sql/install.sql
+++ b/modules/ClinikalAPI/sql/install.sql
@@ -49,6 +49,12 @@ CREATE TABLE `clinikal_templates_map` (
 ALTER TABLE `clinikal_templates_map`
   ADD PRIMARY KEY (`form_id`,`form_field`,`service_type`,`reason_code`,`message_id`);
 
+ALTER TABLE `clinikal_templates_map` ADD `active` tinyint(1) NOT NULL DEFAULT 1;
+ALTER TABLE `clinikal_templates_map` ADD `update_by` int(11)  NOT NULL;
+ALTER TABLE `clinikal_templates_map` ADD `update_date` datetime NOT NULL DEFAULT current_timestamp;
+
+
+
 
 CREATE TABLE `form_context_map` (
     `form_id`           INT NOT NULL,
@@ -150,3 +156,9 @@ CREATE TABLE manage_templates_letters(
     `letter_post_json` mediumtext DEFAULT NULL,
     PRIMARY KEY (`id`)
 );
+
+
+
+INSERT INTO `list_options` (`list_id`, `option_id`, `title`, `seq`, `is_default`, `option_value`, `mapping`, `notes`, `codes`, `toggle_setting_1`, `toggle_setting_2`, `activity`, `subtype`, `edit_options`) VALUES
+('lists', 'clinikal_form_fields_templates', 'Form fields that use templates', 0, 0, 0, '', '', '', 0, 0, 1, '', 1);
+
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
index d66c731..cae8266 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
@@ -8,13 +8,22 @@
 
 namespace ClinikalApi\Controller;
 
+use GenericTools\Controller\BaseController;
+use GenericTools\Model\LangLanguagesTable;
+use GenericTools\Model\ListsTable;
 use Interop\Container\ContainerInterface;
+use ClinikalAPI\Model\GetTemplatesServiceTable;
+use GenericTools\Model\RegistryTable;
 
 class FormTemplatesManagementController extends BaseController
 
 {
-    const TITLE = "Managment of email address for serious side-effects";
-    const MAILS_LIST = "moh_vac_list_mails";
+    const TITLE = "templates Managment";
+    private $forms;
+    private $fileds;
+    private $serviceTypes;
+    private $reasonCodes;
+    private $templates;
 
     public function __construct(ContainerInterface $container)
     {
@@ -22,54 +31,134 @@ public function __construct(ContainerInterface $container)
         $this->container = $container;
     }
 
-    public function TempleteManagementIndexAction()
+    public function templatesManagementIndexAction()
     {
+
 //        if (!acl_check('modules', 'warnings_and_contraindications_management', '', 'write')) {
 //            $this->redirect()->toRoute('errors', array('action' => 'access-denied'));
 //        }
+        $this->loadClientSideForms();
+        $this->loadServiceTypes();
+        $this->loadtemplates();
 
-        /*$data            = $this->getVacListMailsTable()->fetchAll();
-        $facilities_list = $this->getFacilityTable()->getListWithSomeKeyValue("facility_code", "name");
-        $recipient_mail  = $this->getRecordsByField($data, "recipient_email");
-        $data            = $this->renderDataForDataTable($data, $facilities_list);
+        $langCode = ($this->container->get(LangLanguagesTable::class)->getLangCode($_SESSION['language_choice'] ? $_SESSION['language_choice'] : $this->container->get(LangLanguagesTable::class)->getLangIdByGlobals()));
+        $data = $this->normalizeDataForTable($this->container->get(GetTemplatesServiceTable::class)->fetch($langCode, ['active' => 1]));
+        //$this->die_r($data);
 
         $parameters = array(
-            'data'              => $data,
-            'title'             => xlt(self::TITLE),
-            'facilities_list'   => $facilities_list,
-            'recipient_mail'    => $recipient_mail,
-            'recipientType'     => Array(
-                                         "Permanent" => xlt("Permanent"),
-                                         "Variable" => xlt("Variable"),
-                                        ),
-        );*/
-        $parameters = [];
-        return $this->renderView($parameters, true);
+            'title' => xlt(self::TITLE),
+            'data'  => $data,
+            'forms' => $this->forms,
+            'serviceTypes' => $this->serviceTypes,
+            'templates' => $this->templates
+        );
+        $this->layout('clinikalApi/layout/layout');
+        return $parameters;
     }
 
-    public function templatesManagementAjaxAction()
+    private function loadClientSideForms()
     {
-        /*if (isset($_GET['action'])) {
-            $recipient_email = ($this->params()->fromQuery('recipient_email') !== null) ? $this->params()->fromQuery('recipient_email') : 'all';
-            $recipient_type  = ($this->params()->fromQuery('recipient_type') !== null) ? $this->params()->fromQuery('recipient_type') : 'all';
-            $facility_id     = ($this->params()->fromQuery('facility_id') !== null) ? $this->params()->fromQuery('facility_id') : 'all';
+        $this->forms = $this->container->get(RegistryTable::class)->getFormsKeyDirectoryValueName(['category' => 'React form']);
+    }
 
-            $data = $this->getVacListMailsTable()->getAddresses($recipient_email, $recipient_type, $facility_id );
-        } else {
-            $data = $this->getVacListMailsTable()->fetchAll();
+    private function loadFormFileds($formId = null)
+    {
+        $this->fileds = is_null($formId)
+            ?
+            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_form_fields_templates', true)
+            :
+            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_form_fields_templates', true, ['notes' => $formId]);
+    }
+
+    private function loadServiceTypes()
+    {
+        $this->serviceTypes = $this->container->get(ListsTable::class)->getListForViewForm('clinikal_service_types', true);
+    }
+
+    private function loadReasonCodes($serviceType = null)
+    {
+        $this->reasonCodes = is_null($serviceType)
+            ?
+            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_reason_codes', true)
+            :
+            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_reason_codes', true, ['notes' =>  $serviceType]);
+    }
+
+    private function loadtemplates()
+    {
+        $this->templates = $this->container->get(ListsTable::class)->getListForViewForm('clinikal_templates', true);
+    }
+
+    private function normalizeDataForTable($dbMapping)
+    {
+        $results = [];
+        foreach ($dbMapping as $item) {
+            $results[] = [
+                $item['form'],
+                $item['field'],
+                $item['service_type'],
+                $item['reason_code'],
+                $item['template'],
+                (intval($item['active']) === 1) ? "<i style='color: green;font-size: 1.7em;' class='fas fa-check-circle'></i>" : "<i style='color: red;  font-size: 1.7em;' class='fas fa-times-circle'></i>",
+                '<button onclick="gotoEdit(' . "'{$item['form']}','{$item['field']}',{$item['service_type']},{$item['reason_code']}" . ')">' . xlt('Edit') . '</button>'
+            ];
         }
+        return $results;
+    }
 
-        $facilities_list = $this->getFacilityTable()->getListWithSomeKeyValue("facility_code", "name");
 
-        $data = $this->renderDataForDataTable($data, $facilities_list);*/
+    public function templatesManagementAjaxAction()
+    {
+        $queryFilters = [];
+        if ($this->params()->fromQuery('form_name') && $this->params()->fromQuery('form_name') !== 'all') {
+            $queryFilters['form_id'] = $this->params()->fromQuery('form_name');
+        }
+        if ($this->params()->fromQuery('field_name') && $this->params()->fromQuery('field_name') !== 'all') {
+            $queryFilters['form_field'] = $this->params()->fromQuery('field_name');
+        }
+        if ($this->params()->fromQuery('service_type') && $this->params()->fromQuery('service_type') !== 'all') {
+            $queryFilters['service_type'] = $this->params()->fromQuery('service_type');
+        }
+        if ($this->params()->fromQuery('reason_code') && $this->params()->fromQuery('reason_code') !== 'all') {
+            $queryFilters['reason_code'] = $this->params()->fromQuery('reason_code');
+        }
+        if ($this->params()->fromQuery('template') && $this->params()->fromQuery('template') !== 'all') {
+            $queryFilters['message_id'] = $this->params()->fromQuery('template');
+        }
+        if (!is_null($this->params()->fromQuery('active')) && $this->params()->fromQuery('active') !== 'all' && $this->params()->fromQuery('active') !== '') {
+            $queryFilters['active'] = $this->params()->fromQuery('active');
+        }
+
+        $langCode = ($this->container->get(LangLanguagesTable::class)->getLangCode($_SESSION['language_choice'] ? $_SESSION['language_choice'] : $this->container->get(LangLanguagesTable::class)->getLangIdByGlobals()));
+        $data = $this->normalizeDataForTable($this->container->get(GetTemplatesServiceTable::class)->fetch($langCode, $queryFilters));
         $parms = array('data' => $data);
         return $this->responseWithNoLayout($parms, true);
     }
 
+    public function loadFiledsAction()
+    {
+        $form = $this->params()->fromQuery('filter');
+        if (empty($form)) {
+            throw new \Exception('Missing filter parameter');
+        }
+        $this->loadFormFileds($form);
+        return $this->responseWithNoLayout($this->fileds ? $this->fileds : []);
+    }
+
+    public function loadReasonCodesAction()
+    {
+        $serviceType = $this->params()->fromQuery('filter');
+        if (empty($serviceType)) {
+            throw new \Exception('Missing filter parameter');
+        }
+        $this->loadReasonCodes($serviceType);
+        return $this->responseWithNoLayout($this->reasonCodes ? $this->reasonCodes : []);
+    }
+
     /**
      * @return \Zend\Stdlib\ResponseInterface
      */
-    public function checkIfTempletesExistAction()
+    public function checkIftemplatesExistAction()
     {
         /*$row_id          = intval($_POST['row_id']);
         $recipient_email = $_POST['recipient_email'];
@@ -176,26 +265,7 @@ public function deleteAssignTempleteAjaxAction()
         }
     }
 
-    /**
-     * @param $dataArr
-     * @param $facilities_list
-     * @return array
-     */
-    private function renderDataForDataTable($dataArr,$facilities_list)
-    {
-        $resultAll = array();
 
-        $counter = 0;
-        foreach ($dataArr as $index => $temp_record) {
-            $resultAll[$counter][] = xlt($temp_record['id']);
-            $resultAll[$counter][] = "<span id='editRow_" . $temp_record['id'] . "' class='editRow' style='color:blue' ><u>" . attr($temp_record['recipient_email']) . "</u> </span>";
-            $resultAll[$counter][] = xlt($temp_record['recipient_type']);
-            $resultAll[$counter][] = (array_key_exists($temp_record["facility_id"], $facilities_list) ? xlt($facilities_list[$temp_record['facility_id']]) : "");
-            $counter++;
-        }
-
-        return $resultAll;
-    }
 
     function getRecordsByField($data, $field_name)
     {
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
index ea527a1..00f4277 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
@@ -59,4 +59,42 @@ public function getTemplatesForForm($form_id=null,$form_field=null,$service_type
 
         return $rsArray;
     }
+
+    /**
+     * @return array -   all of the facilities from facility table
+     */
+    public function fetch($langCode, $equalFilters = null)
+    {
+        $sql = "
+        SELECT
+            translateString(r.name, ?) as form,
+            translateString(GetOptionTitle('clinikal_form_fields_templates', ctm.form_field),?) as field,
+            translateString(GetOptionTitle('clinikal_service_types', ctm.service_type),?) as service_type,
+            translateString(GetOptionTitle('clinikal_reason_codes', ctm.reason_code),?) as reason_code,
+            translateString(GetOptionTitle('clinikal_templates', ctm.message_id),?) as template,
+            ctm.active as active
+        FROM  clinikal_templates_map AS ctm
+                  JOIN registry AS r ON ctm.form_id = r.directory
+        ";
+        $bindParams = [$langCode, $langCode, $langCode, $langCode, $langCode];
+
+        $where = [];
+        foreach ($equalFilters as $column => $value) {
+            $where[] = " ctm.$column = ? ";
+            $bindParams[] = $value;
+        }
+        if (!empty($equalFilters)) {
+            $sql .= " WHERE " . implode('AND', $where);
+        }
+
+        $sql .= " ORDER BY form, field, service_type, reason_code, seq";
+
+        $statement = $this->tableGateway->adapter->createStatement($sql, $bindParams);
+        $return = $statement->execute();
+        $results = array();
+        foreach ($return as $row) {
+            $results[] = $row;
+        }
+        return $results;
+    }
 }
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-templete.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-templete.phtml
new file mode 100644
index 0000000..277bd62
--- /dev/null
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-templete.phtml
@@ -0,0 +1,380 @@
+<?php
+require_once $GLOBALS['fileroot'].'/clinikal/ui-components/Header/ClinikalHeaders.php';
+$headers = new ClinikalHeaders();
+?>
+<style>
+
+    #row_1 #commercial_name{
+        font-size: 12px;
+    }
+
+</style>
+<div id="add-edit-batch" class="container">
+
+    <?php echo $headers->titleWithButtons($is_edit? "Update manufacturer name" : "Add manufacturer name" , array(array('id' => 'save', 'title' => 'Save'), array('id' => 'go_back', 'title' => 'cancel')));  ?>
+
+    <div id="batch-form-container" class="">
+        <form>
+
+            <div id="row_1" class="row row_padded">
+
+                <div class="col-xs-12 col-md-4">
+                    <div class="col-xs-2 col-md-4">
+                        <label for="commercial_name" class="control-label"><?php echo xlt("Commercial name").":"; ?></label>
+                    </div>
+                    <div class="col-xs-2 col-md-8">
+                        <input   type='text'  class='input-sm form-control' name='form_commercial_name' id='commercial_name' value='<?php echo (isset($data['vac_commercial_name']))? $data['vac_commercial_name']: '' ?>' >
+                        <span id="error_commercial_name_empty" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+                        <span id="error_commercial_name_length" class="error-message" style="display: none"> <?php echo xlt("Value need to be less them 50 chars"); ?> </span>
+                        <span id="error_commercial_name_exist" class="error-message" style="display: none"> <?php echo xlt("Commercial name already exist"); ?> </span>
+                    </div>
+
+                </div>
+
+                <div class="col-xs-12 col-md-4">
+                    <div class="col-xs-2 col-md-4">
+                        <label><?php echo xlt("Vaccine name").":"; ?></label>
+                    </div>
+                    <div class="col-xs-10 col-md-8">
+                        <select class="selectpicker form-control" name='vaccine_name' id="vaccine_name" data-show-subtext="true" data-live-search="true">
+                            <option data-tokens="choose" value="choose"><?php echo xlt("Choose"); ?></option>
+                            <?php foreach ($vaccineNames as $vaccineId => $vaccineInfo): ?>
+                                <option data-tokens="" value="<?php echo attr($vaccineId)?>" <?php echo (isset($data["vaccine_id"])&&$data["vaccine_id"]==$vaccineId) ? "selected":""  ?> ><?php echo $vaccineInfo; ?></option>
+                            <?php endforeach; ?>
+                        </select>
+                        <span id="error_vaccine_name" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+                        <span id="alert-inactive-vaccine" class="error-message" style="display: <?php echo !isset($data["vaccine_active"]) || $data['vaccine_active'] ? 'none' : 'inline' ?>"> <?php echo xlt("Note, The vaccine is inactive"); ?>. </span>
+                    </div>
+                </div>
+
+
+            </div>
+            <br>
+            <div id="row_2" class="row row_padded">
+
+                <div class="col-xs-12 col-md-4">
+                    <div class="col-xs-2 col-md-4">
+                        <label><?php echo xlt("Manufacturer name").":"; ?></label>
+                    </div>
+                    <div class="col-xs-10 col-md-8">
+                        <select class="selectpicker form-control" name='manufacturer_name' id="manufacturer_name" data-show-subtext="true" data-live-search="true">
+                            <option data-tokens="choose" value="choose"><?php echo xlt("Choose"); ?></option>
+                            <?php foreach ($manufacturerNames as $manufacturerId => $manufacturerInfo): ?>
+                                <option data-tokens="" value="<?php echo attr($manufacturerId)?>" <?php echo (isset($data["vac_manufacturer_id"])&&$data["vac_manufacturer_id"]==$manufacturerId) ? "selected":""  ?> ><?php echo $manufacturerInfo; ?></option>
+                            <?php endforeach; ?>
+                        </select>
+                        <span id="error_manufacturer_name" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+                    </div>
+                </div>
+
+                <div class="col-xs-12 col-md-4">
+                    <div class="col-xs-2 col-md-4">
+                        <label for="catalog_num" class="control-label"><?php echo xlt("Catalog number").":"; ?></label>
+                    </div>
+                    <div class="col-xs-2 col-md-8">
+                        <input   type='text'  class='input-sm form-control' name='catalog_num' id='catalog_num' value='<?php echo (isset($data['catalog_num']))? $data['catalog_num']: '' ?>' maxlength="20">
+                    </div>
+
+                </div>
+
+                <div class="col-xs-12 col-md-3">
+                    <div class="col-xs-2 col-md-5">
+                        <label for="active" class="control-label"><?php echo xlt("Active").":"; ?></label>
+                    </div>
+                    <div id="active" class="col-xs-2 col-md-7">
+                        <label class="radio-inline fix_inline_radio"><input type="radio" value="1" name="optradio" <?php echo (!$is_edit||isset($data['active'])&&$data['active']=="1")? "checked" : ""; ?>><?php echo xlt("Yes"); ?></label>
+                        <label class="radio-inline fix_inline_radio"><input type="radio" value="0"name="optradio" <?php echo (isset($data['active'])&&$data['active']=="0")? "checked" : ""; ?>><?php echo xlt("No"); ?></label>
+                    </div>
+
+                </div>
+            </div>
+            <br>
+            <div id="row_3" class="row row_padded">
+                <div class="col-xs-12 col-md-4">
+                    <div class="col-xs-2 col-md-4">
+                        <label><?php echo xlt("Updated by").":"; ?></label>
+                    </div>
+                    <div class="col-xs-10 col-md-8">
+                        <label id="updated_by"><?php echo (isset($data["user_name"])) ?   $data["user_name"] :  $currentUserName; ?></label>
+                    </div>
+                </div>
+                <div class="col-xs-12 col-md-4">
+                    <div class="col-xs-2 col-md-4">
+                        <label><?php echo xlt("Update date").":"; ?></label>
+                    </div>
+                    <div class="col-xs-10 col-md-8">
+                        <label id="update_date"><?php echo (isset($data["updated_date"])) ?   $data["updated_date"] :  oeFormatShortDate(date("Y-m-d")); ?></label>
+                    </div>
+                </div>
+
+            </div>
+
+        </form>
+
+    </div>
+</div>
+
+<script>
+    function goBack(e) {
+        e.preventDefault();
+        var url=  '<?php echo $this->basePath()?>'+'/commercial-names-management/commercial-names-management-index';
+        top.restoreSession();
+        window.location=url;
+    }
+
+
+
+    function ValidateForm(commercial_name,vaccine_id,manufacturer_id, catalog_num, active,row_id){
+
+        var is_edit='<?php echo $is_edit?>';
+
+        var flag=true;
+
+        if (vaccine_id =="choose" ) {
+            flag=false;
+            $('#error_vaccine_name').css('display','block');
+            $('#select2-vaccine_name-container').parent().css('border', 'solid 1px red');
+        }
+
+        if ( manufacturer_id =="choose") {
+            flag=false;
+            $('#error_manufacturer_name').css('display','block');
+            $('#select2-manufacturer_name-container').parent().css('border', 'solid 1px red');
+        }
+
+        if ( commercial_name =="") {
+            flag=false;
+            $('#error_commercial_name_empty').css('display','block');
+            $('#commercial_name').css('border', 'solid 1px red');
+        }
+
+        if (commercial_name.length>50){
+            flag=false;
+            $('#error_commercial_name_length').css('display','block');
+            $('#commercial_name').css('border', 'solid 1px red');
+            return flag;
+        }
+
+        var commercial_check_url='<?php echo $this->basePath()?>/commercial-names-management';
+        var commercial_check_action="checkIfCommercialNameExist";
+
+        $.ajax({
+            url: commercial_check_url+"/"+commercial_check_action,
+            data: {
+                commercial_name: commercial_name,
+                active: active,
+                is_edit:is_edit
+
+            },
+            error: function() {
+
+                flag=false;
+                console.log("Server validation call failed");
+                return flag;
+            },
+            dataType: 'json',
+            success: function(data) {
+
+               var is_exist=data['data']['is_exist'];
+
+                if (is_exist=="1"){
+                    console.log("Active name already exist");
+                    flag=false;
+                    $('#error_commercial_name_exist').css('display','block');
+                    return flag;
+                }
+
+                if(flag) {
+
+                    sendToServer(commercial_name,vaccine_id,manufacturer_id, catalog_num, active,row_id);
+                }
+
+            },
+            type: 'POST'
+        });
+
+
+    }
+
+    function sendToServer(commercial_name,vaccine_id,manufacturer_id, catalog_num, active,row_id) {
+
+        var url= '<?php echo $this->basePath()?>/commercial-names-management';
+        var action="saveCommercial";
+        var is_edit='<?php echo $is_edit?>';
+
+        $.ajax({
+            url: url+"/"+action,
+            data: {
+                commercial_name: commercial_name,
+                vaccine_id: vaccine_id,
+                manufacturer_id:manufacturer_id,
+                catalog_num: catalog_num,
+                active: active,
+                row_id: row_id,
+                is_edit:is_edit
+
+            },
+            error: function() {
+                console.log("data was not saved");
+            },
+            dataType: 'json',
+            success: function(data) {
+
+                console.log("data was saved");
+                top.restoreSession();
+                window.location=url;
+
+            },
+            type: 'POST'
+        });
+    }
+
+    function saveRecord(e,is_edit,row_id) {
+
+        e.preventDefault();
+
+
+        /****************************/
+        var commercial_name =$("#commercial_name").val().trim();
+        var vaccine_id =$("#vaccine_name").val();
+        var manufacturer_id=$("#manufacturer_name").val();
+        var catalog_num=$("#catalog_num").val();
+        var active = $('#active input:radio:checked').val();
+
+        commercial_name=commercial_name.replace(/[\x0d\x0a]/g,/[\r\n]/g);
+
+        /****************************/
+
+        ValidateForm(commercial_name,vaccine_id,manufacturer_id, catalog_num, active,row_id);
+
+    }
+
+    function renderOptions(mySelect,myOptions){
+
+        var selected=mySelect.find(":selected").val();
+
+        mySelect.empty();
+        mySelect.append(
+            $('<option></option>').val("choose").html("<?php echo xlt('Choose')?>")
+        );
+
+        $.each(myOptions, function(val, text) {
+            mySelect.append(
+                $('<option></option>').val(val).html(text)
+            );
+        });
+
+        mySelect.val(selected);
+    }
+
+
+
+    function disableValidaionWarning(id){
+
+        $('#error_'+id).css('display','none');
+
+    }
+
+    /*
+    removes red validation border
+    parent - to toggle the element itself to which the id belongs or its parent.
+     */
+    function removeRedBorder(id, parent){
+        if(parent!==undefined && parent!==null ){
+            $('#select2-' + id + '-container').parent().css('border', '1px solid #aaa');
+        }
+        else{
+            $('#' + id).css('border', '1px solid #aaa');
+        }
+
+    }
+
+    function removeBOM($data) {
+        if (0 === strpos(bin2hex($data), 'efbbbf')) {
+            return substr($data, 3);
+        }
+        return $data;
+    }
+
+    $( document ).ready(function() {
+
+        $('#vaccine_name,#manufacturer_name').select2({
+            <?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
+        });
+
+
+
+        $("#tab_title").html('<?php echo $title ?>');
+
+        $( "#vaccine_name" ).change(function() {
+            disableValidaionWarning($(this)["0"]["id"]);
+            removeRedBorder($(this)["0"]["id"], 1);
+            //getCommercialnames();
+
+        });
+
+        $( "#manufacturer_name" ).change(function() {
+            disableValidaionWarning($(this)["0"]["id"]);
+            removeRedBorder($(this)["0"]["id"], 1);
+            //getCommercialnames();
+
+        });
+
+
+
+        $( "#commercial_name" ).change(function() {
+            disableValidaionWarning('commercial_name_empty');
+            disableValidaionWarning('commercial_name_length');
+            disableValidaionWarning('commercial_name_exist');
+            removeRedBorder($(this)["0"]["id"]);
+
+        });
+
+
+
+        $('.datepicker').datetimepicker({
+            <?php $datetimepicker_timepicker = false; ?>
+            <?php $datetimepicker_showseconds = false; ?>
+            <?php $datetimepicker_formatInput = true; ?>
+            <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
+            <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
+        });
+
+        var is_edit='<?php echo $is_edit ?>';
+
+        var data={
+            "test_date":"<?php echo $data['test_date'] ?>",
+            "test_type":"<?php echo $data['test_type'] ?>",
+            "result":"<?php echo $data['result'] ?>",
+            "genotype":"<?php echo $data['genotype'] ?>",
+            "fibrotest":"<?php echo $data['fibrotest'] ?>",
+            "comment":"<?php echo str_replace("\"","\\\"",preg_replace("/[\x0d\x0a]/i","",$data['comment'])) ?>"
+        };
+        var row_id='<?php echo $row_id ?>';
+
+        $("#go_back").on( "click",function(e) {goBack(e)});
+        $("#save").on( "click",function(e) {saveRecord(e,is_edit,row_id)});
+
+        <?php if($is_edit): ?>
+        $('#vaccine_name').on('change', function () {
+           $.ajax({
+               url:'<?php echo $this->basePath()?>/vaccines-management/is-vaccine-active-ajax',
+               data:{vaccineId: $('#vaccine_name').val()},
+               method:'post',
+               dataType:'json'
+           }).done(function (data) {
+               if(data.output) {
+                   $('#alert-inactive-vaccine').hide();
+               } else {
+                   $('#alert-inactive-vaccine').show();
+               }
+           });
+        });
+        <?php endif; ?>
+
+
+    });
+
+</script>
+
+
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
new file mode 100644
index 0000000..c5037d1
--- /dev/null
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
@@ -0,0 +1,251 @@
+<?php
+
+use GenericTools\Library\UiComponents\DataTableExtended\DataTableExtended;
+use GenericTools\Library\UiComponents\Header\ClinikalHeaders;
+
+$table_id='templates_table';
+$table_col_names=array(
+    '0'=>Xl('Form'),
+    '1'=>Xl('field'),
+    '2'=>Xl('Service type'),
+    '3'=>Xl('Reason code'),
+    '4'=>Xl('Template'),
+    '5'=>Xl('Active'),
+    '6' => ''
+);
+$table_handler= new DataTableExtended($table_id,$table_col_names);
+$headers = new ClinikalHeaders();
+
+?>
+
+
+<?php $table_handler->LoadEssentialCssJs(); ?>
+<div id="patient-vaccines" class="container">
+
+    <?php echo $headers->titleWithButtons('Templates management', array(
+        array('id' => 'assign_template', 'title' => 'Assign template' ),
+        array('id' => 'add_template', 'title' => 'add/edit template' ),
+        )); ?>
+
+    <div id="filters-container">
+        <div class="row">
+
+            <div class="col-xs-12 col-md-3">
+                <label for="form_name" class="control-label"><?php echo xlt("Form name").":"; ?></label>
+                <select class="selectpicker form-control" id="form_name" data-show-subtext="true" data-live-search="true">
+                    <option data-tokens="" value=""><?php echo xlt("All"); ?></option>
+                    <?php foreach ($forms as $formId => $formName): ?>
+                        <option data-tokens="" value="<?php echo attr($formId)?>"><?php echo xlt($formName); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+
+            <div class="col-xs-12 col-md-3">
+                <label for="field_name" class="control-label"><?php echo xlt("Field name").":"; ?></label>
+                <select class="selectpicker form-control" id="field_name" data-show-subtext="true" data-live-search="true" disabled="true">
+                    <option data-tokens="" value="" selected><?php echo xlt("All"); ?></option>
+                </select>
+            </div>
+
+            <div class="col-xs-12 col-md-3">
+                <label for="service_type" class="control-label"><?php echo xlt("Service type").":"; ?></label>
+                <select class="selectpicker form-control" id="service_type" data-show-subtext="true" data-live-search="true">
+                    <option data-tokens="" value=""><?php echo xlt("All"); ?></option>
+                    <?php foreach ($serviceTypes as $serviceTypeId => $serviceTypeName): ?>
+                        <option data-tokens="" value="<?php echo attr($serviceTypeId)?>"><?php echo xlt($serviceTypeName); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+
+            <div class="col-xs-12 col-md-3">
+                <label for="reason_code" class="control-label"><?php echo xlt("Reason code").":"; ?></label>
+                <select class="selectpicker form-control" id="reason_code" data-show-subtext="true" data-live-search="true" disabled="true">
+                    <option data-tokens="" value="" selected><?php echo xlt("All"); ?></option>
+                </select>
+            </div>
+
+            <div class="col-xs-12 col-md-6">
+                <label for="templates" class="control-label"><?php echo xlt("Template").":"; ?></label>
+                <select class="selectpicker form-control" id="templates" data-show-subtext="true" data-live-search="true">
+                    <option data-tokens="" value=""><?php echo xlt("All"); ?></option>
+                    <?php foreach ($templates as $templateId => $templateName): ?>
+                        <option data-tokens="" value="<?php echo attr($templateId)?>"><?php echo xlt($templateName); ?></option>
+                    <?php endforeach; ?>
+                </select>
+            </div>
+
+            <div class="col-xs-12 col-md-2">
+                <label for="active" class="control-label"><?php echo xlt("Active").":"; ?></label>
+                <select class="selectpicker form-control select2lookalike" id="active" data-show-subtext="true" data-live-search="true">
+                    <option data-tokens="" value=""><?php echo xlt("All"); ?></option>
+                    <option data-tokens="1" value="1" selected><?php echo xlt("Yes"); ?></option>
+                    <option data-tokens="0" value="0"><?php echo xlt("No"); ?></option>
+                </select>
+
+            </div>
+
+            <div class="col-xs-12 col-md-2 pull-left">
+                <br>
+                <button type="button" id ="filter" class="btn btn-info"><?php echo xlt("Filter"); ?></button>
+                <button type="button" id ="clear_filters" class="btn btn-info pull-left" ><?php echo xlt("Clear Filters"); ?></button>
+            </div>
+
+
+        </div>
+
+    </div>
+
+    <br>
+
+    <div class="row">
+        <div class="col-md-12">
+            <div class="table-container">
+                <div class="content">
+                    <?php $table_handler->echoBaseHTML(); ?>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+
+    function renderOptions(mySelect,myOptions){
+
+
+        var selected=mySelect.find(":selected").val();
+
+        mySelect.empty();
+        mySelect.append(
+            $('<option></option>').val("").html("<?php echo xlt('ALL')?>")
+        );
+
+        $.each(myOptions, function(val, text) {
+            mySelect.append(
+                $('<option></option>').val(val).html(text)
+            );
+        });
+
+    }
+
+    function loadList(action, filter, selectElement)
+    {
+        var url= '<?php echo $this->basePath()?>/templates-management';
+        $.ajax({
+            url: url+"/"+action + '?filter='+filter,
+            error: function() {
+                console.log("row failed to load");
+            },
+            dataType: 'json',
+            success: function(data) {
+                console.log(data)
+
+                renderOptions(selectElement,data);
+                selectElement.prop('disabled', false);
+
+
+            },
+            type: 'GET'
+        });
+    }
+
+
+
+    function clearFilters() {
+
+        var form_name=$('#form_name').val('').trigger('change');
+        var field_name= $('#field_name').val('').trigger('change').prop('disabled', true);
+        var service_type=$('#service_type').val('').trigger('change');
+        var reason_code=$('#reason_code').val('').trigger('change').prop('disabled', true)
+        var template=$('#templates').val('').trigger('change');
+        var active= $('#active').val(1).trigger('change');
+    }
+
+    function getFilteredData(){
+        var form_name=$('#form_name').val();
+        var field_name= $('#field_name').val();
+        var service_type=$('#service_type').val();
+        var reason_code=$('#reason_code').val();
+        var template=$('#templates').val();
+        var active= $('#active').val();
+
+
+
+        var data =  {
+            "form_name": form_name,
+            "field_name": field_name,
+            "service_type": service_type,
+            "reason_code": reason_code,
+            "template": template,
+            "active": active,
+        }
+
+        return data;
+    }
+
+    function goToAddNewBatch(e,row_id) {
+        e.preventDefault();
+        //console.log(document.URL);
+        var url= "<?php echo $this->basePath() ?>"+"/commercial-names-management/add-edit-commercial?row_id="+row_id;
+        top.restoreSession();
+        window.location=url;
+    }
+
+    $( document ).ready(function() {
+
+        $('#reason_codes, #templates').select2({
+            <?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
+        });
+
+        $("#tab_title").html('<?php echo $title ?>');
+
+       /* DATATABLE */
+        <?php $table_handler->setUiSettings(false, false);?>
+       <?php $table_handler->initDataTable($table_id, $data,null,false );?>
+       <?php require($GLOBALS['srcdir'] . '/js/xl/datatables-net.js.php'); ?>
+       <?php $table_handler->closeDataTable() ?>
+
+
+        function filterData() {
+
+            var data = getFilteredData();
+            loadFilteredData(custom_table, data,'<?php echo $this->basePath()?>/templates-management/templates-management-ajax');
+        }
+
+        function loadFields()
+        {
+            var selectedForm = $('#form_name').val();
+            if(selectedForm.length > 0) {
+                loadList('loadFileds', selectedForm, $('#field_name'))
+            } else {
+                $('#field_name').empty();
+                $('#field_name').append(
+                    $('<option></option>').val("").html("<?php echo xlt('ALL')?>")
+                );
+                $('#field_name').prop('disabled', true);
+            }
+        }
+
+        function loadReasonCodes()
+        {
+            var selectedServiceType = $('#service_type').val();
+            if(selectedServiceType.length > 0) {
+                loadList('loadReasonCodes', selectedServiceType, $('#reason_code'))
+            } else {
+                $('#reason_code').empty();
+                $('#reason_code').append(
+                    $('<option></option>').val("").html("<?php echo xlt('ALL')?>")
+                );
+                $('#reason_code').prop('disabled', true);
+            }
+        }
+
+        $("#clear_filters").on( "click",clearFilters);
+        $("#filter").on( "click",filterData);
+        $("#form_name").on( "change",loadFields);
+        $("#service_type").on( "change",loadReasonCodes);
+
+    });
+</script>
+
+
diff --git a/modules/ClinikalAPI/view/layout/layout.phtml b/modules/ClinikalAPI/view/layout/layout.phtml
new file mode 100644
index 0000000..7975765
--- /dev/null
+++ b/modules/ClinikalAPI/view/layout/layout.phtml
@@ -0,0 +1,55 @@
+<?php
+use GenericTools\Library\UiComponents\ValidateJS\ValidateJsFunctions;
+use OpenEMR\Core\Header;
+?>
+<!-- Layout -->
+<html>
+    <head>
+        <title id="tab_title"></title>
+        <?php Header::setupHeader(['jquery','bootstrap','datetime-picker','main-theme', 'fontawesome','select2']); ?>
+        <?php    $use_validate_js = 1;?>
+        <?php  require_once($GLOBALS['srcdir'] . "/validation/validation_script.js.php"); ?>
+
+        <script>
+            var constraints = JSON.parse(<?php echo json_encode($validateJs)?>);
+            <?php echo ValidateJsFunctions::append(); ?>
+        </script>
+        <style>
+
+            .dataTables_filter input{
+                background-color: ghostwhite;
+            }
+            #print{
+                margin-top: 10px;
+                margin-bottom: 15px;
+            }
+
+            .row_padded{
+                padding-top: 5px;
+
+            }
+
+            .btn-no-padding{
+                padding-top: 0px;
+                padding-bottom: 0px;
+            }
+
+            .form-inline .form-group-TWB >.long-label{
+                width: 130px !important;
+            }
+
+
+        </style>
+
+    </head>
+    <body class="body_top">
+        <div class="container-fluid">
+            <div class='row'>
+                <div id="logistic-management-wrapper" class="col-md-12">
+                    <?php echo $this->content; ?>
+                </div>
+            </div>
+        </div>
+    </body>
+</html>
+
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/css/dataTablesExtend.css b/modules/GenericTools/css/generictools/datatable/dataTablesExtend.css
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/css/dataTablesExtend.css
rename to modules/GenericTools/css/generictools/datatable/dataTablesExtend.css
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/css/jquery.dataTables.min.css b/modules/GenericTools/css/generictools/datatable/jquery.dataTables.min.css
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/css/jquery.dataTables.min.css
rename to modules/GenericTools/css/generictools/datatable/jquery.dataTables.min.css
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/buttons.html5.min.js b/modules/GenericTools/js/generictools/datatable/buttons.html5.min.js
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/buttons.html5.min.js
rename to modules/GenericTools/js/generictools/datatable/buttons.html5.min.js
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/buttons.print.min.js b/modules/GenericTools/js/generictools/datatable/buttons.print.min.js
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/buttons.print.min.js
rename to modules/GenericTools/js/generictools/datatable/buttons.print.min.js
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/dataTables.bootstrap.min.js b/modules/GenericTools/js/generictools/datatable/dataTables.bootstrap.min.js
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/dataTables.bootstrap.min.js
rename to modules/GenericTools/js/generictools/datatable/dataTables.bootstrap.min.js
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/dataTables.buttons.min.js b/modules/GenericTools/js/generictools/datatable/dataTables.buttons.min.js
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/dataTables.buttons.min.js
rename to modules/GenericTools/js/generictools/datatable/dataTables.buttons.min.js
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/dataTablesExtend.js b/modules/GenericTools/js/generictools/datatable/dataTablesExtend.js
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/dataTablesExtend.js
rename to modules/GenericTools/js/generictools/datatable/dataTablesExtend.js
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/datatables.min.js b/modules/GenericTools/js/generictools/datatable/datatables.min.js
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/datatables.min.js
rename to modules/GenericTools/js/generictools/datatable/datatables.min.js
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/jquery.min.js b/modules/GenericTools/js/generictools/datatable/jquery.min.js
similarity index 100%
rename from modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/src/js/jquery.min.js
rename to modules/GenericTools/js/generictools/datatable/jquery.min.js
diff --git a/modules/GenericTools/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/GenericTools/sql/1_0_0-to-2_0_0_upgrade.sql
index 8a631ba..be3226d 100644
--- a/modules/GenericTools/sql/1_0_0-to-2_0_0_upgrade.sql
+++ b/modules/GenericTools/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -90,3 +90,25 @@
 --    arguments: constant_name english hebrew
 --    behavior: can take a long time.
 
+
+
+DROP FUNCTION IF EXISTS `translateString`;
+#SpecialSql
+
+CREATE FUNCTION translateString(p_title varchar(255), p_lang varchar(5)) RETURNS varchar(255) READS SQL DATA
+BEGIN
+
+   DECLARE v_title varchar(255);
+
+select d.definition
+INTO v_title
+from lang_constants c
+         join lang_definitions d on d.cons_id = c.cons_id and lang_id= (select lang_id from lang_languages where lang_code = p_lang)
+where c.constant_name = p_title;
+
+RETURN ifnull(v_title, p_title);
+
+END;
+#EndSpecialSql
+
+
diff --git a/modules/GenericTools/sql/install.sql b/modules/GenericTools/sql/install.sql
index 605951e..3ec7d98 100644
--- a/modules/GenericTools/sql/install.sql
+++ b/modules/GenericTools/sql/install.sql
@@ -1 +1,44 @@
 INSERT INTO `globals` (`gl_name`, `gl_value`) VALUES ('s3_version', '2006-03-01');
+
+
+DROP FUNCTION IF EXISTS `GetOptionTitle`;
+#SpecialSql
+
+CREATE FUNCTION GetOptionTitle(p_list_id varchar(255), p_option_id varchar(100)) RETURNS varchar(255) READS SQL DATA
+BEGIN
+
+   DECLARE v_title varchar(255);
+
+select lo.title
+INTO v_title
+from `list_options` lo
+where lo.list_id = p_list_id and
+        lo.option_id = p_option_id;
+
+RETURN v_title;
+
+END;
+#EndSpecialSql
+
+
+
+DROP FUNCTION IF EXISTS `translateString`;
+#SpecialSql
+
+CREATE FUNCTION translateString(p_title varchar(255), p_lang varchar(5)) RETURNS varchar(255) READS SQL DATA
+BEGIN
+
+   DECLARE v_title varchar(255);
+
+select d.definition
+INTO v_title
+from lang_constants c
+         join lang_definitions d on d.cons_id = c.cons_id and lang_id= (select lang_id from lang_languages where lang_code = p_lang)
+where c.constant_name = p_title;
+
+RETURN ifnull(v_title, p_title);
+
+END;
+#EndSpecialSql
+
+
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php b/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php
index 89618c8..14ef09d 100644
--- a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php
+++ b/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace DataTableExtended;
+namespace GenericTools\Library\UiComponents\DataTableExtended;
 
 class DataTableExtended
 {
@@ -56,19 +56,20 @@ public function echoBaseHTML()
 
     public function LoadEssentialCssJs()
     {
-        $uiComponentsPath='/vendor/clinikal/clinikal-backend/modules/GenericTools/src/GenericTools/Library/UiComponents';
+        //$uiComponentsPath='/vendor/clinikal/clinikal-backend/modules/GenericTools/src/GenericTools/Library/UiComponents';
+        $uiPath='/'.$GLOBALS['webroot'].$GLOBALS['baseModDir'].$GLOBALS['zendModDir'].'/public';
         $header_html='';
-        $header_html.='<link href="'.$GLOBALS['webroot'].$uiComponentsPath.'/DataTableExtended/src/css/jquery.dataTables.min.css" media="screen" rel="stylesheet" type="text/css">';
-        $header_html.='<link href="'.$GLOBALS['webroot'].$uiComponentsPath.'/DataTableExtended/src/css/dataTablesExtend.css" media="screen" rel="stylesheet" type="text/css">';
+        $header_html.='<link href="'.$uiPath.'/css/generictools/datatable/jquery.dataTables.min.css" media="screen" rel="stylesheet" type="text/css">';
+        $header_html.='<link href="'.$uiPath.'/css/generictools/datatable/dataTablesExtend.css" media="screen" rel="stylesheet" type="text/css">';
 
-        $header_html.='<script type="text/javascript" src="'.$GLOBALS['webroot'].$uiComponentsPath.'/DataTableExtended/src/js/datatables.min.js"></script>';
+        $header_html.='<script type="text/javascript" src="'.$uiPath.'/js/generictools/datatable/datatables.min.js"></script>';
 
-        $header_html.='<script type="text/javascript" src="'.$GLOBALS['webroot'].$uiComponentsPath.'/DataTableExtended/src/js/dataTables.bootstrap.min.js"></script>';
-        $header_html.='<script type="text/javascript" src="'.$GLOBALS['webroot'].$uiComponentsPath.'/DataTableExtended/src/js/dataTables.buttons.min.js"></script>';
-        $header_html.='<script type="text/javascript" src="'.$GLOBALS['webroot'].$uiComponentsPath.'/DataTableExtended/src/js/buttons.print.min.js"></script>';
-        $header_html.='<script type="text/javascript" src="'.$GLOBALS['webroot'].$uiComponentsPath.'/DataTableExtended/src/js/buttons.html5.min.js"></script>';
+        $header_html.='<script type="text/javascript" src="'.$uiPath.'/js/generictools/datatable/dataTables.bootstrap.min.js"></script>';
+        $header_html.='<script type="text/javascript" src="'.$uiPath.'/js/generictools/datatable/dataTables.buttons.min.js"></script>';
+        $header_html.='<script type="text/javascript" src="'.$uiPath.'/js/generictools/datatable/buttons.print.min.js"></script>';
+        $header_html.='<script type="text/javascript" src="'.$uiPath.'/js/generictools/datatable/buttons.html5.min.js"></script>';
 
-        $header_html.='<script type="text/javascript" src="'.$GLOBALS['webroot'].$uiComponentsPath.'/DataTableExtended/src/js/dataTablesExtend.js"></script>';
+        $header_html.='<script type="text/javascript" src="'.$uiPath.'/js/generictools/datatable/dataTablesExtend.js"></script>';
 
         //$header_html.='<script type="text/javascript" src="'.$GLOBALS['webroot'].'/interface/modules/zend_modules/public/js/bootstrap.min.js"></script>';
         echo $header_html;
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php b/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
index 1bd8508..e6fbed4 100644
--- a/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
+++ b/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
@@ -5,6 +5,7 @@
  * Date: 04/09/18
  * Time: 08:53
  */
+namespace GenericTools\Library\UiComponents\Header;
 
 class ClinikalHeaders
 {
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/ValidateJS/ValidateJsFunctions.php b/modules/GenericTools/src/GenericTools/Library/UiComponents/ValidateJS/ValidateJsFunctions.php
index 21298b3..7f6aa79 100644
--- a/modules/GenericTools/src/GenericTools/Library/UiComponents/ValidateJS/ValidateJsFunctions.php
+++ b/modules/GenericTools/src/GenericTools/Library/UiComponents/ValidateJS/ValidateJsFunctions.php
@@ -5,6 +5,7 @@
  * Date: 13/05/18
  * Time: 12:24
  */
+namespace GenericTools\Library\UiComponents\ValidateJS;
 
 class ValidateJsFunctions
 {
@@ -54,4 +55,4 @@ static function append(){
 
         echo $output;
     }
-}
\ No newline at end of file
+}
diff --git a/modules/GenericTools/src/GenericTools/Model/RegistryTable.php b/modules/GenericTools/src/GenericTools/Model/RegistryTable.php
index b7c82ff..2c445d8 100644
--- a/modules/GenericTools/src/GenericTools/Model/RegistryTable.php
+++ b/modules/GenericTools/src/GenericTools/Model/RegistryTable.php
@@ -3,6 +3,7 @@
 
 namespace GenericTools\Model;
 
+use Laminas\Db\Sql\Where;
 use Laminas\Db\TableGateway\TableGateway;
 use GenericTools\Model\UtilsTraits\JoinBuilder;
 use Laminas\Db\Sql\Expression;
@@ -44,4 +45,18 @@ private function joinTables()
         return $this->getJoins();
     }
 
+    public function getFormsKeyDirectoryValueName($equalConditions)
+    {
+        $where = new Where();
+        foreach ($equalConditions as $column => $value) {
+            $where->equalTo($column, $value);
+        }
+        $rs= $this->tableGateway->select($where);
+        $rsArray=array();
+        foreach($rs as $r) {
+            $rsArray[$r->directory]=$r->name;
+        }
+        return $rsArray;
+    }
+
 }
diff --git a/modules/ReportTool/sql/install.sql b/modules/ReportTool/sql/install.sql
index 0cf6930..aeca588 100644
--- a/modules/ReportTool/sql/install.sql
+++ b/modules/ReportTool/sql/install.sql
@@ -34,7 +34,7 @@ BEGIN
 
    DECLARE v_title varchar(255);
 
-    select d.definition
+    select ifnull(d.definition,v_title)
     INTO v_title
 	from lang_constants c
 	join lang_definitions d on d.cons_id = c.cons_id and lang_id= (select lang_id from lang_languages where lang_code = 'he')
@@ -45,23 +45,3 @@ BEGIN
 END;
 
 #EndSpecialSql
-
-DROP FUNCTION IF EXISTS `GetOptionTitle`;
-#SpecialSql
-
-CREATE FUNCTION GetOptionTitle(p_list_id varchar(255), p_option_id varchar(100)) RETURNS varchar(255) READS SQL DATA
-BEGIN
-
-   DECLARE v_title varchar(255);
-
-   select lo.title
-   INTO v_title
-   from `list_options` lo
-   where lo.list_id = p_list_id and
-		 lo.option_id = p_option_id;
-
-   RETURN v_title;
-
-END;
-#EndSpecialSql
-

From 7648e8d5fbc3fbe0b42363ea954ee1051c13bef8 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Thu, 4 Feb 2021 13:33:25 +0200
Subject: [PATCH 15/37] assign template screen

---
 .../FormTemplatesManagementController.php     | 175 ++++---
 .../ClinikalAPI/Model/GetTemplatesService.php |   2 +
 .../Model/GetTemplatesServiceTable.php        |  38 +-
 .../assign-template.phtml                     | 485 ++++++++++++++++++
 .../assign-templete.phtml                     | 380 --------------
 .../templates-management-index.phtml          |  30 +-
 modules/ClinikalAPI/view/layout/layout.phtml  |   5 +
 .../Controller/BaseController.php             |   7 +
 .../UiComponents/Header/ClinikalHeaders.php   |  10 +-
 9 files changed, 653 insertions(+), 479 deletions(-)
 create mode 100644 modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
 delete mode 100644 modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-templete.phtml

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
index cae8266..d3abdf9 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
@@ -42,7 +42,7 @@ public function templatesManagementIndexAction()
         $this->loadtemplates();
 
         $langCode = ($this->container->get(LangLanguagesTable::class)->getLangCode($_SESSION['language_choice'] ? $_SESSION['language_choice'] : $this->container->get(LangLanguagesTable::class)->getLangIdByGlobals()));
-        $data = $this->normalizeDataForTable($this->container->get(GetTemplatesServiceTable::class)->fetch($langCode, ['active' => 1]));
+        $data = $this->normalizeDataForTable($this->container->get(GetTemplatesServiceTable::class)->fetchNormalizedData($langCode, ['active' => 1]));
         //$this->die_r($data);
 
         $parameters = array(
@@ -100,7 +100,7 @@ private function normalizeDataForTable($dbMapping)
                 $item['reason_code'],
                 $item['template'],
                 (intval($item['active']) === 1) ? "<i style='color: green;font-size: 1.7em;' class='fas fa-check-circle'></i>" : "<i style='color: red;  font-size: 1.7em;' class='fas fa-times-circle'></i>",
-                '<button onclick="gotoEdit(' . "'{$item['form']}','{$item['field']}',{$item['service_type']},{$item['reason_code']}" . ')">' . xlt('Edit') . '</button>'
+                '<button onclick="gotoEdit(' . "'{$item['form_id']}','{$item['field_id']}','{$item['service_type_id']}','{$item['reason_code_id']}','{$item['template_id']}'" . ')">' . xlt('Edit') . '</button>'
             ];
         }
         return $results;
@@ -130,14 +130,50 @@ public function templatesManagementAjaxAction()
         }
 
         $langCode = ($this->container->get(LangLanguagesTable::class)->getLangCode($_SESSION['language_choice'] ? $_SESSION['language_choice'] : $this->container->get(LangLanguagesTable::class)->getLangIdByGlobals()));
-        $data = $this->normalizeDataForTable($this->container->get(GetTemplatesServiceTable::class)->fetch($langCode, $queryFilters));
+        $data = $this->normalizeDataForTable($this->container->get(GetTemplatesServiceTable::class)->fetchNormalizedData($langCode, $queryFilters));
         $parms = array('data' => $data);
         return $this->responseWithNoLayout($parms, true);
     }
 
+    public function assignTemplateAction()
+    {
+        $this->loadClientSideForms();
+        $this->loadServiceTypes();
+        $this->loadtemplates();
+
+        $parameters = array(
+            'title' => xlt(self::TITLE),
+            'forms' => $this->forms,
+            'serviceTypes' => $this->serviceTypes,
+            'templates' => $this->templates,
+            'user' => $this->getUserNameById($this->getConnectedUserId())
+        );
+
+        if ($this->params()->fromQuery('edit')) {
+            $queryFilters = [];
+            $queryFilters['form_id'] = $this->params()->fromQuery('form_id');
+            $queryFilters['form_field'] = $this->params()->fromQuery('field_id');
+            $queryFilters['service_type'] = $this->params()->fromQuery('service_type');
+            $queryFilters['reason_code'] = $this->params()->fromQuery('reason_code');
+            $queryFilters['message_id'] = $this->params()->fromQuery('template');
+
+            $result = $this->container->get(GetTemplatesServiceTable::class)->get($queryFilters)[0];
+            $parameters['record'] = $result;
+            $this->loadFormFileds($result['form_id']);
+            $this->loadReasonCodes($result['service_type']);
+            $parameters['formFiles'] = $this->fileds;
+            $parameters['reasonCode'] = $this->reasonCodes;
+            $parameters['is_edit'] = true;
+        }
+
+        $this->layout('clinikalApi/layout/layout');
+        return $parameters;
+
+    }
+
     public function loadFiledsAction()
     {
-        $form = $this->params()->fromQuery('filter');
+         $form = $this->params()->fromQuery('filter');
         if (empty($form)) {
             throw new \Exception('Missing filter parameter');
         }
@@ -152,106 +188,69 @@ public function loadReasonCodesAction()
             throw new \Exception('Missing filter parameter');
         }
         $this->loadReasonCodes($serviceType);
-        return $this->responseWithNoLayout($this->reasonCodes ? $this->reasonCodes : []);
+        $reasonCodes = $this->reasonCodes ? $this->reasonCodes : [];
+        $allReasonsOptions = [GetTemplatesServiceTable::ALL_REASON_CODE => xlt(GetTemplatesServiceTable::ALL_REASON_CODE_STRING)];
+
+        return $this->responseWithNoLayout(array_merge( $reasonCodes, $allReasonsOptions));
     }
 
     /**
      * @return \Zend\Stdlib\ResponseInterface
      */
-    public function checkIftemplatesExistAction()
+    public function saveAssignTemplateAction()
     {
-        /*$row_id          = intval($_POST['row_id']);
-        $recipient_email = $_POST['recipient_email'];
-        $recipient_type  = $_POST['recipient_type'];
-        $facility_id     = $_POST['facility_id'];
-        $isEdit          = $_POST['is_edit'];
-
-        if ($isEdit == "0") {
-            $rez     = empty($this->getVacListMailsTable()->getAllActiveNames(array(
-                    'recipient_email' => $recipient_email,
-            )));
-            $isExist = ($rez) ? 0 : 1;
-            $data    = array(
-                'is_exist' => $isExist
-            );
-            $parms   = array(
-                'data' => $data
-            );
+        $data = $this->params()->fromPost('data');
+        $isEdit = $this->params()->fromPost('is_edit');
+        $oldData = $isEdit ? $this->params()->fromPost('old_data') : null;
+
+        if ($this->validateData($data)) {
+            $isExistData = $data;
+            unset($isExistData['seq'], $isExistData['active']);
+            $isExist = !empty($this->container->get(GetTemplatesServiceTable::class)->get($isExistData)) ? true : false;
+            if(!$isExist && $isEdit) {
+                //delete old record
+                $this->container->get(GetTemplatesServiceTable::class)->delete($oldData);
+            }
+            if($isExist && $isEdit) {
+                if($this->primaryKeysNotChanged($data, $oldData)) {
+                    $this->container->get(GetTemplatesServiceTable::class)->delete($oldData);
+                } else {
+                    return $this->responseWithNoLayout('data_conflict', true, 409);
+                }
+            }
+            if ($isExist && !$isEdit) {
+                return $this->responseWithNoLayout('data_conflict', true, 409);
+            }
+
+            $data['update_by'] = $this->getConnectedUserId();
+            $result = $this->container->get(GetTemplatesServiceTable::class)->insert($data);
+            return $this->responseWithNoLayout(true, true);
+
         }
-        else {
-            $isExist = 0;
-            $data    = array(
-                'is_exist' => $isExist
-            );
-            $parms   = array(
-                'data' => $data
-            );
-        }*/
-        return $this->responseWithNoLayout($parms, true);
+        return $this->responseWithNoLayout(false, 500);
     }
 
-    /**
-     * @return \Zend\Stdlib\ResponseInterface
-     */
-    public function saveAssignTempleteAction()
+    private function validateData($data)
     {
-       /* $row_id          = intval($_POST['row_id']);
-        $recipient_email = $_POST['recipient_email'];
-        $recipient_type  = $_POST['recipient_type'];
-        $facility_id     = $_POST['facility_id'];
-        $isEdit          = $_POST['is_edit'];
-        $updateDate      = date("Y-m-d");
-        $updateBy        = $_SESSION['authUserID'];
-
-        if ($isEdit == 1) {
-            $this->getVacListMailsTable()->updateRow($row_id, $recipient_email, $recipient_type, $facility_id, $updateDate, $updateBy);
-        } else {
-            $this->getVacListMailsTable()->insertRow($recipient_email, $recipient_type, $facility_id, $updateDate, $updateBy);
+        $requiredFileds = ['form_id','form_field','service_type','reason_code','message_id','seq','active'];
+        foreach ($requiredFileds as $name) {
+           if(!isset($data[$name]) || is_null($data[$name]) || $data[$name] == '') {
+               return false;
+           }
         }
-        $data       = "";
-        $parameters = array(
-            'data' => $data
-        );*/
-        return $this->responseWithNoLayout($parameters, true);
+        return true;
     }
 
-    /**
-     * @return \Zend\View\Model\ViewModel
-     */
-    public function addEditEmailsVaccinesManagementAction()
+    private function primaryKeysNotChanged($data, $oldData)
     {
-       /* $id              = $this->params()->fromQuery('row_id');
-        $object          = $this->getVacListMailsTable()->fetchRow($id);
-        $facilities_list = $this->getFacilityTable()->getListWithSomeKeyValue("facility_code", "name");
-        $list = array(
-                        "facilities_list" => $facilities_list,
-                     );
-
-        if (!empty($id)) {
-            $is_edit    = 1;
-            $row_id     = $id;
-            $date       = $object['updated_date'];
-            $userName   = $this->getUserNameById($object['updated_by']);
-            $form       = new EmailsVaccinesAddEditForm($list);
-            $form->setData($object);
-        } else {
-            $is_edit    = 0;
-            $row_id     = 0;
-            $date       = "";
-            $userName   = "";
-            $form       = new EmailsVaccinesAddEditForm($list);
-        }*/
-
-        return $this->renderView(array(
-            'title'     => xlt(self::TITLE),
-            'form'      => $form,
-            'userName'  => $userName,
-            'date'      => $date,
-            'is_edit'   => $is_edit,
-            'row_id'    => $row_id,
-        ));
+        $requiredFileds = ['form_id','form_field','service_type','reason_code','message_id'];
+        foreach ($requiredFileds as $name) {
+            if($data[$name] !== $oldData[$name]) return false;
+        }
+        return true;
     }
 
+
     /**
      * @return \Zend\Stdlib\ResponseInterface
      */
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesService.php b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesService.php
index 8ce41f0..2ce3d33 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesService.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesService.php
@@ -18,6 +18,7 @@ class GetTemplatesService
     public $reason_code;
     public $message_id;
     public $order;
+    public $active;
 
     //lists fields for join
     public $option_id;
@@ -37,6 +38,7 @@ public function exchangeArray($data)
         $this->option_id = (!empty($data['option_id'])) ? $data['option_id'] : null;
         $this->title = (!empty($data['title'])) ? $data['title'] : null;
         $this->seq = (!empty($data['seq'])) ? $data['seq'] : null;
+        $this->active = (!empty($data['active'])) ? $data['active'] : null;
     }
 }
 
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
index 00f4277..da40a5d 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
@@ -15,7 +15,8 @@
 class GetTemplatesServiceTable
 {
     const LEFT_JOIN = "LEFT";
-    const ALL_REASON_CODE = 'ALL';
+    const ALL_REASON_CODE = 'all_reasons';
+    const ALL_REASON_CODE_STRING = 'All the reason codes';
     protected $tableGateway;
     public function __construct(TableGateway $tableGateway)
     {
@@ -63,14 +64,19 @@ public function getTemplatesForForm($form_id=null,$form_field=null,$service_type
     /**
      * @return array -   all of the facilities from facility table
      */
-    public function fetch($langCode, $equalFilters = null)
+    public function fetchNormalizedData($langCode, $equalFilters = null)
     {
         $sql = "
         SELECT
+            ctm.form_id as form_id,
             translateString(r.name, ?) as form,
+            ctm.form_field as field_id,
             translateString(GetOptionTitle('clinikal_form_fields_templates', ctm.form_field),?) as field,
+            ctm.service_type as service_type_id,
             translateString(GetOptionTitle('clinikal_service_types', ctm.service_type),?) as service_type,
-            translateString(GetOptionTitle('clinikal_reason_codes', ctm.reason_code),?) as reason_code,
+            ctm.reason_code as reason_code_id,
+            translateString(ifnull(GetOptionTitle('clinikal_reason_codes', ctm.reason_code),'" . self::ALL_REASON_CODE_STRING . "'),?) as reason_code,
+            ctm.message_id as template_id,
             translateString(GetOptionTitle('clinikal_templates', ctm.message_id),?) as template,
             ctm.active as active
         FROM  clinikal_templates_map AS ctm
@@ -97,4 +103,30 @@ public function fetch($langCode, $equalFilters = null)
         }
         return $results;
     }
+
+    public function get($equalFilters)
+    {
+        $select = $this->tableGateway->getSql()->select();
+        $where = new Where();
+        foreach ($equalFilters as $column => $value) {
+            $where->equalTo($column, $value);
+        }
+        $select->where($where);
+        //$debug = $select->getSqlString();
+        //echo $debug;die;
+        $rs = $this->tableGateway->selectWith($select);
+        $rsArray = [];
+        foreach ($rs as $r) {
+            $rsArray[] = get_object_vars($r);
+        }
+        return $rsArray;
+    }
+
+    public function insert($data) {
+        return $this->tableGateway->insert($data) ? true : false;
+    }
+
+    public function delete($data) {
+        return $this->tableGateway->delete($data) ? true : false;
+    }
 }
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
new file mode 100644
index 0000000..28c9a24
--- /dev/null
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
@@ -0,0 +1,485 @@
+<?php
+
+use ClinikalAPI\Model\GetTemplatesServiceTable;
+use GenericTools\Library\UiComponents\Header\ClinikalHeaders;
+$headers = new ClinikalHeaders();
+?>
+<style>
+
+    #row_1 #commercial_name{
+        font-size: 12px;
+    }
+    #alredy-exists{
+        display: none;
+    }
+    #general-error{
+        display: none;
+    }
+
+</style>
+<div id="add-edit-batch" class="container">
+
+    <?php echo $headers->titleWithButtons($is_edit? "Update assignment" : "Assign template" , array(array('id' => 'save', 'title' => 'Save'), array('id' => 'go_back', 'title' => 'cancel')));  ?>
+
+    <div id="template-form-container" class="">
+        <div class="row">
+            <div class="col-md-6 text-center">
+                <div id="alredy-exists" class="alert alert-danger" role="alert">
+                    <?php echo xlt('This assigment already exists')?>
+                </div>
+                <div id="general-error" class="alert alert-danger" role="alert">
+                    <?php echo xlt('Error ouccored')?>
+                </div>
+            </div>
+        </div>
+        <form>
+        <div id="row_1" class="row row_padded">
+
+            <div class="col-xs-12 col-md-3">
+                <label for="form_name" class="control-label"><?php echo xlt("Form name").":"; ?></label>
+                <select class="selectpicker form-control" id="form_name" data-show-subtext="true" data-live-search="true">
+                    <?php if(!$is_edit): ?>
+                        <option data-tokens="" value=""><?php echo xlt("Choose"); ?></option>
+                    <?php endif; ?>
+                    <?php foreach ($forms as $formId => $formName): ?>
+                        <option data-tokens="" value="<?php echo attr($formId)?>" <?php if ($formId === $record['form_id']) echo 'selected';?>><?php echo xlt($formName); ?></option>
+                    <?php endforeach; ?>
+                </select>
+                <span id="form_name_error" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+            </div>
+
+            <div class="col-xs-12 col-md-3">
+                <label for="field_name" class="control-label"><?php echo xlt("Field name").":"; ?></label>
+                <select class="selectpicker form-control" id="field_name" data-show-subtext="true" data-live-search="true" <?php if (!$is_edit) echo 'disabled';?>>
+                    <?php if($is_edit): ?>
+                        <?php foreach ($formFiles as $fieldId => $fieldName): ?>
+                            <option data-tokens="" value="<?php echo attr($fieldId)?>" <?php if ($fieldId === $record['form_field']) echo 'selected';?>><?php echo xlt($fieldName); ?></option>
+                        <?php endforeach; ?>
+                    <?php endif; ?>
+                </select>
+                <span id="field_name_error" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+            </div>
+
+            <div class="col-xs-12 col-md-3">
+                <label for="service_type" class="control-label"><?php echo xlt("Service type").":"; ?></label>
+                <select class="selectpicker form-control" id="service_type" data-show-subtext="true" data-live-search="true">
+                    <?php if(!$is_edit): ?>
+                        <option data-tokens="" value=""><?php echo xlt("Choose"); ?></option>
+                    <?php endif; ?>
+                    <?php foreach ($serviceTypes as $serviceTypeId => $serviceTypeName): ?>
+                        <option data-tokens="" value="<?php echo attr($serviceTypeId)?>" <?php if ($serviceTypeId === $record['service_type']) echo 'selected';?>><?php echo xlt($serviceTypeName); ?></option>
+                    <?php endforeach; ?>
+                </select>
+                <span id="service_type_error" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+            </div>
+
+            <div class="col-xs-12 col-md-3">
+                <label for="reason_code" class="control-label"><?php echo xlt("Reason code").":"; ?></label>
+                <select class="selectpicker form-control" id="reason_code" data-show-subtext="true" data-live-search="true" <?php if (!$is_edit) echo 'disabled';?>>
+                    <?php if($is_edit): ?>
+                        <option value="all" <?php if ($record['reason_code'] == GetTemplatesServiceTable::ALL_REASON_CODE) echo 'selected';?>><?php echo xlt(GetTemplatesServiceTable::ALL_REASON_CODE_STRING); ?></option>
+                        <?php foreach ($reasonCode as $reasonCodeId => $reasonCodeName): ?>
+                            <option value="<?php echo attr($reasonCodeId)?>" <?php if ($reasonCodeId == $record['reason_code']) echo 'selected';?>><?php echo xlt($reasonCodeName); ?></option>
+                        <?php endforeach; ?>
+                    <?php endif; ?>
+                </select>
+                <span id="reason_code_error" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+            </div>
+        </div>
+        <div id="row_2" class="row row_padded">
+            <div class="col-xs-12 col-md-6">
+                <label for="templates" class="control-label"><?php echo xlt("Template").":"; ?></label>
+                <select class="selectpicker form-control" id="templates" data-show-subtext="true" data-live-search="true">
+                    <?php if(!$is_edit): ?>
+                        <option data-tokens="" value=""><?php echo xlt("Choose"); ?></option>
+                    <?php endif; ?>
+                    <?php foreach ($templates as $templateId => $templateName): ?>
+                        <option data-tokens="" value="<?php echo attr($templateId)?>" <?php if ($templateId == $record['message_id']) echo 'selected';?>><?php echo xlt($templateName); ?></option>
+                    <?php endforeach; ?>
+                </select>
+                <span id="templates_error" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+            </div>
+
+            <div class="col-xs-12 col-md-2">
+                <label for="seq" class="control-label"><?php echo xlt("Level of usability").":"; ?></label>
+                <select class="selectpicker form-control select2lookalike" id="seq" data-show-subtext="true" data-live-search="true">
+                    <?php for ($number = 1; $number <=10; $number++): ?>
+                        <option data-tokens="<?php echo $number?>" value="<?php echo $number?>" <?php if ($number == $record['seq'] || (!$is_edit && $number === 5)) echo 'selected';?>><?php echo $number?></option>
+                    <?php endfor; ?>
+                </select>
+
+            </div>
+
+            <div class="col-xs-12 col-md-3">
+                <div class="col-xs-2 col-md-5">
+                    <label for="active" class="control-label"><?php echo xlt("Active").":"; ?></label>
+                </div>
+                <div id="active" class="col-xs-2 col-md-7">
+                    <label class="radio-inline fix_inline_radio"><input type="radio" value="1" name="optradio" <?php echo (!$is_edit||isset($record['active'])&&$record['active']=="1")? "checked" : ""; ?>><?php echo xlt("Yes"); ?></label>
+                    <label class="radio-inline fix_inline_radio"><input type="radio" value="0"name="optradio" <?php echo (isset($record['active'])&&$record['active']=="0")? "checked" : ""; ?>><?php echo xlt("No"); ?></label>
+                </div>
+
+            </div>
+            </div>
+        </div>
+        <div id="row_3" class="row row_padded">
+            <div class="col-xs-12 col-md-4">
+                <div class="row">
+                    <div class="col-xs-2 col-md-4">
+                        <label><?php echo xlt("Updated by").":"; ?></label>
+                    </div>
+                    <div class="col-xs-10 col-md-8">
+                        <label id="updated_by"><?php echo (isset($user)) ?   text($user) : '';?></label>
+                    </div>
+                </div>
+            </div>
+            <div class="col-xs-12 col-md-6">
+                <div class="row">
+                    <div class="col-xs-2 col-md-3">
+                        <label><?php echo xlt("Update date").":"; ?></label>
+                    </div>
+                    <div class="col-xs-10 col-md-4">
+                        <label id="update_date"><?php echo text(oeFormatShortDate(date("Y-m-d"))); ?></label>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+
+        </form>
+
+    </div>
+</div>
+
+<script>
+
+    var is_edit=<?php echo js_escape($is_edit) ?>;
+
+    <?php if ($is_edit): ?>
+    var old_data={
+        "form_id":<?php echo js_escape($record['form_id']) ?>,
+        "form_field":<?php echo js_escape($record['form_field']) ?>,
+        "service_type":<?php echo js_escape($record['service_type']) ?>,
+        "reason_code":<?php echo js_escape($record['reason_code']) ?>,
+        "message_id":<?php echo js_escape($record['message_id']) ?>
+    };
+    <?php else: ?>
+    var old_data=null;
+    <?php endif; ?>
+
+    $('#reason_code, #templates').select2({
+        <?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
+    });
+
+    function goBack(e) {
+        e.preventDefault();
+        var url=  '<?php echo $this->basePath()?>'+'/templates-management';
+        top.restoreSession();
+        window.location=url;
+    }
+
+    /*function renderOptions(mySelect,myOptions){
+
+
+        var selected=mySelect.find(":selected").val();
+
+        mySelect.empty();
+        mySelect.append(
+            $('<option></option>').val("").html("<?php echo xlt('ALL')?>")
+        );
+
+        $.each(myOptions, function(val, text) {
+            mySelect.append(
+                $('<option></option>').val(val).html(text)
+            );
+        });
+
+    }*/
+
+    function loadList(action, filter, selectElement)
+    {
+        var url= '<?php echo $this->basePath()?>/templates-management';
+        $.ajax({
+            url: url+"/"+action + '?filter='+filter,
+            error: function() {
+                console.log("row failed to load");
+            },
+            dataType: 'json',
+            success: function(data) {
+                console.log(data)
+
+                renderOptions(selectElement,data);
+                selectElement.prop('disabled', false);
+
+
+            },
+            type: 'GET'
+        });
+    }
+
+    function loadFields()
+    {
+        var selectedForm = $('#form_name').val();
+        if(selectedForm.length > 0) {
+            loadList('loadFileds', selectedForm, $('#field_name'))
+        } else {
+            $('#field_name').empty();
+            $('#field_name').append(
+                $('<option></option>').val("").html("<?php echo xlt('ALL')?>")
+            );
+            $('#field_name').prop('disabled', true);
+        }
+    }
+
+    function loadReasonCodes()
+    {
+        var selectedServiceType = $('#service_type').val();
+        if(selectedServiceType.length > 0) {
+            loadList('loadReasonCodes', selectedServiceType, $('#reason_code'))
+        } else {
+            $('#reason_code').empty();
+            $('#reason_code').append(
+                $('<option></option>').val("").html("<?php echo xlt('ALL')?>")
+            );
+            $('#reason_code').prop('disabled', true);
+        }
+    }
+
+
+    $("#form_name").on( "change",loadFields);
+    $("#service_type").on( "change",loadReasonCodes);
+
+    function ValidateForm(formData){
+
+        var is_edit='<?php echo $is_edit?>';
+
+        var flag=true;
+        hideErrors();
+
+        if (formData.form_id =="" ) {
+            flag=false;
+            showError('form_name')
+        }
+
+        if ( formData.form_field =="") {
+            flag=false;
+            showError('field_name')
+        }
+
+        if ( formData.service_type =="") {
+            flag=false;
+            showError('service_type')
+        }
+
+        if ( formData.reason_code =="") {
+            flag=false;
+            showSelect2Error('reason_code')
+        }
+
+        if ( formData.message_id =="") {
+            flag=false;
+            showSelect2Error('templates')
+        }
+
+        if(flag) {
+
+            sendToServer(formData);
+        }
+
+    }
+
+    function showError(id)
+    {
+        $('#' + id + '_error').css('display','block');
+        $('#' + id).css('border', 'solid 1px red');
+    }
+
+    function showSelect2Error(id)
+    {
+        $('#' + id + '_error').css('display','block');
+        $('#select2-' + id + '-container').parent().css('border', 'solid 1px red');
+    }
+
+    function hideErrors()
+    {
+        $('select').css('border', '1px solid #ced4da');
+        $('.select2-selection').css('border', '1px solid #ced4da');
+        $('[id$="_error"]').css('display','none');
+        $('#alredy-exists').hide();
+        $('#general-error').hide();
+    }
+
+    function sendToServer(formData) {
+
+        var url= '<?php echo $this->basePath()?>/templates-management';
+        var action="saveAssignTemplate";
+        var is_edit='<?php echo $is_edit?>';
+
+        $.ajax({
+            url: url+"/"+action,
+            data: {
+                data:formData,
+                is_edit:is_edit,
+                old_data:old_data
+            },
+            error: function(data) {
+               if (data.status = 409) {
+                   $('#alredy-exists').show();
+               } else {
+                   $('#general-error').show();
+               }
+            },
+            dataType: 'json',
+            success: function(data) {
+
+                console.log(data);
+                top.restoreSession();
+                window.location=url;
+
+            },
+            type: 'POST'
+        });
+    }
+
+    function saveRecord(e,is_edit) {
+
+        e.preventDefault();
+
+
+        /****************************/
+        collectedData = {
+            form_id :$("#form_name").val().trim(),
+            form_field :$("#field_name").val(),
+            service_type:$("#service_type").val(),
+            reason_code:$("#reason_code").val(),
+            message_id:$("#templates").val(),
+            seq:$("#seq").val(),
+            active : $('#active input:radio:checked').val()
+        }
+
+        /****************************/
+
+        ValidateForm(collectedData);
+
+    }
+
+    function renderOptions(mySelect,myOptions){
+
+        var selected=mySelect.find(":selected").val();
+
+        mySelect.empty();
+        mySelect.append(
+            $('<option></option>').val("").html("<?php echo xlt('Choose')?>").prop('selected',true)
+        );
+
+        $.each(myOptions, function(val, text) {
+            mySelect.append(
+                $('<option></option>').val(val).html(text)
+            );
+        });
+
+        mySelect.val(selected);
+    }
+
+
+
+    function disableValidaionWarning(id){
+
+        $('#error_'+id).css('display','none');
+
+    }
+
+    /*
+    removes red validation border
+    parent - to toggle the element itself to which the id belongs or its parent.
+     */
+    function removeRedBorder(id, parent){
+        if(parent!==undefined && parent!==null ){
+            $('#select2-' + id + '-container').parent().css('border', '1px solid #aaa');
+        }
+        else{
+            $('#' + id).css('border', '1px solid #aaa');
+        }
+
+    }
+
+    function removeBOM($data) {
+        if (0 === strpos(bin2hex($data), 'efbbbf')) {
+            return substr($data, 3);
+        }
+        return $data;
+    }
+
+    $( document ).ready(function() {
+
+        $('#vaccine_name,#manufacturer_name').select2({
+            <?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
+        });
+
+
+
+        $("#tab_title").html('<?php echo $title ?>');
+
+        $( "#vaccine_name" ).change(function() {
+            disableValidaionWarning($(this)["0"]["id"]);
+            removeRedBorder($(this)["0"]["id"], 1);
+            //getCommercialnames();
+
+        });
+
+        $( "#manufacturer_name" ).change(function() {
+            disableValidaionWarning($(this)["0"]["id"]);
+            removeRedBorder($(this)["0"]["id"], 1);
+            //getCommercialnames();
+
+        });
+
+
+
+        $( "#commercial_name" ).change(function() {
+            disableValidaionWarning('commercial_name_empty');
+            disableValidaionWarning('commercial_name_length');
+            disableValidaionWarning('commercial_name_exist');
+            removeRedBorder($(this)["0"]["id"]);
+
+        });
+
+
+
+        $('.datepicker').datetimepicker({
+            <?php $datetimepicker_timepicker = false; ?>
+            <?php $datetimepicker_showseconds = false; ?>
+            <?php $datetimepicker_formatInput = true; ?>
+            <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
+            <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
+        });
+
+
+
+
+        $("#go_back").on( "click",function(e) {goBack(e)});
+        $("#save").on( "click",function(e) {saveRecord(e,is_edit)});
+
+        <?php if($is_edit): ?>
+        $('#vaccine_name').on('change', function () {
+           $.ajax({
+               url:'<?php echo $this->basePath()?>/vaccines-management/is-vaccine-active-ajax',
+               data:{vaccineId: $('#vaccine_name').val()},
+               method:'post',
+               dataType:'json'
+           }).done(function (data) {
+               if(data.output) {
+                   $('#alert-inactive-vaccine').hide();
+               } else {
+                   $('#alert-inactive-vaccine').show();
+               }
+           });
+        });
+        <?php endif; ?>
+
+
+    });
+
+</script>
+
+
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-templete.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-templete.phtml
deleted file mode 100644
index 277bd62..0000000
--- a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-templete.phtml
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-require_once $GLOBALS['fileroot'].'/clinikal/ui-components/Header/ClinikalHeaders.php';
-$headers = new ClinikalHeaders();
-?>
-<style>
-
-    #row_1 #commercial_name{
-        font-size: 12px;
-    }
-
-</style>
-<div id="add-edit-batch" class="container">
-
-    <?php echo $headers->titleWithButtons($is_edit? "Update manufacturer name" : "Add manufacturer name" , array(array('id' => 'save', 'title' => 'Save'), array('id' => 'go_back', 'title' => 'cancel')));  ?>
-
-    <div id="batch-form-container" class="">
-        <form>
-
-            <div id="row_1" class="row row_padded">
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="col-xs-2 col-md-4">
-                        <label for="commercial_name" class="control-label"><?php echo xlt("Commercial name").":"; ?></label>
-                    </div>
-                    <div class="col-xs-2 col-md-8">
-                        <input   type='text'  class='input-sm form-control' name='form_commercial_name' id='commercial_name' value='<?php echo (isset($data['vac_commercial_name']))? $data['vac_commercial_name']: '' ?>' >
-                        <span id="error_commercial_name_empty" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
-                        <span id="error_commercial_name_length" class="error-message" style="display: none"> <?php echo xlt("Value need to be less them 50 chars"); ?> </span>
-                        <span id="error_commercial_name_exist" class="error-message" style="display: none"> <?php echo xlt("Commercial name already exist"); ?> </span>
-                    </div>
-
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="col-xs-2 col-md-4">
-                        <label><?php echo xlt("Vaccine name").":"; ?></label>
-                    </div>
-                    <div class="col-xs-10 col-md-8">
-                        <select class="selectpicker form-control" name='vaccine_name' id="vaccine_name" data-show-subtext="true" data-live-search="true">
-                            <option data-tokens="choose" value="choose"><?php echo xlt("Choose"); ?></option>
-                            <?php foreach ($vaccineNames as $vaccineId => $vaccineInfo): ?>
-                                <option data-tokens="" value="<?php echo attr($vaccineId)?>" <?php echo (isset($data["vaccine_id"])&&$data["vaccine_id"]==$vaccineId) ? "selected":""  ?> ><?php echo $vaccineInfo; ?></option>
-                            <?php endforeach; ?>
-                        </select>
-                        <span id="error_vaccine_name" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
-                        <span id="alert-inactive-vaccine" class="error-message" style="display: <?php echo !isset($data["vaccine_active"]) || $data['vaccine_active'] ? 'none' : 'inline' ?>"> <?php echo xlt("Note, The vaccine is inactive"); ?>. </span>
-                    </div>
-                </div>
-
-
-            </div>
-            <br>
-            <div id="row_2" class="row row_padded">
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="col-xs-2 col-md-4">
-                        <label><?php echo xlt("Manufacturer name").":"; ?></label>
-                    </div>
-                    <div class="col-xs-10 col-md-8">
-                        <select class="selectpicker form-control" name='manufacturer_name' id="manufacturer_name" data-show-subtext="true" data-live-search="true">
-                            <option data-tokens="choose" value="choose"><?php echo xlt("Choose"); ?></option>
-                            <?php foreach ($manufacturerNames as $manufacturerId => $manufacturerInfo): ?>
-                                <option data-tokens="" value="<?php echo attr($manufacturerId)?>" <?php echo (isset($data["vac_manufacturer_id"])&&$data["vac_manufacturer_id"]==$manufacturerId) ? "selected":""  ?> ><?php echo $manufacturerInfo; ?></option>
-                            <?php endforeach; ?>
-                        </select>
-                        <span id="error_manufacturer_name" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
-                    </div>
-                </div>
-
-                <div class="col-xs-12 col-md-4">
-                    <div class="col-xs-2 col-md-4">
-                        <label for="catalog_num" class="control-label"><?php echo xlt("Catalog number").":"; ?></label>
-                    </div>
-                    <div class="col-xs-2 col-md-8">
-                        <input   type='text'  class='input-sm form-control' name='catalog_num' id='catalog_num' value='<?php echo (isset($data['catalog_num']))? $data['catalog_num']: '' ?>' maxlength="20">
-                    </div>
-
-                </div>
-
-                <div class="col-xs-12 col-md-3">
-                    <div class="col-xs-2 col-md-5">
-                        <label for="active" class="control-label"><?php echo xlt("Active").":"; ?></label>
-                    </div>
-                    <div id="active" class="col-xs-2 col-md-7">
-                        <label class="radio-inline fix_inline_radio"><input type="radio" value="1" name="optradio" <?php echo (!$is_edit||isset($data['active'])&&$data['active']=="1")? "checked" : ""; ?>><?php echo xlt("Yes"); ?></label>
-                        <label class="radio-inline fix_inline_radio"><input type="radio" value="0"name="optradio" <?php echo (isset($data['active'])&&$data['active']=="0")? "checked" : ""; ?>><?php echo xlt("No"); ?></label>
-                    </div>
-
-                </div>
-            </div>
-            <br>
-            <div id="row_3" class="row row_padded">
-                <div class="col-xs-12 col-md-4">
-                    <div class="col-xs-2 col-md-4">
-                        <label><?php echo xlt("Updated by").":"; ?></label>
-                    </div>
-                    <div class="col-xs-10 col-md-8">
-                        <label id="updated_by"><?php echo (isset($data["user_name"])) ?   $data["user_name"] :  $currentUserName; ?></label>
-                    </div>
-                </div>
-                <div class="col-xs-12 col-md-4">
-                    <div class="col-xs-2 col-md-4">
-                        <label><?php echo xlt("Update date").":"; ?></label>
-                    </div>
-                    <div class="col-xs-10 col-md-8">
-                        <label id="update_date"><?php echo (isset($data["updated_date"])) ?   $data["updated_date"] :  oeFormatShortDate(date("Y-m-d")); ?></label>
-                    </div>
-                </div>
-
-            </div>
-
-        </form>
-
-    </div>
-</div>
-
-<script>
-    function goBack(e) {
-        e.preventDefault();
-        var url=  '<?php echo $this->basePath()?>'+'/commercial-names-management/commercial-names-management-index';
-        top.restoreSession();
-        window.location=url;
-    }
-
-
-
-    function ValidateForm(commercial_name,vaccine_id,manufacturer_id, catalog_num, active,row_id){
-
-        var is_edit='<?php echo $is_edit?>';
-
-        var flag=true;
-
-        if (vaccine_id =="choose" ) {
-            flag=false;
-            $('#error_vaccine_name').css('display','block');
-            $('#select2-vaccine_name-container').parent().css('border', 'solid 1px red');
-        }
-
-        if ( manufacturer_id =="choose") {
-            flag=false;
-            $('#error_manufacturer_name').css('display','block');
-            $('#select2-manufacturer_name-container').parent().css('border', 'solid 1px red');
-        }
-
-        if ( commercial_name =="") {
-            flag=false;
-            $('#error_commercial_name_empty').css('display','block');
-            $('#commercial_name').css('border', 'solid 1px red');
-        }
-
-        if (commercial_name.length>50){
-            flag=false;
-            $('#error_commercial_name_length').css('display','block');
-            $('#commercial_name').css('border', 'solid 1px red');
-            return flag;
-        }
-
-        var commercial_check_url='<?php echo $this->basePath()?>/commercial-names-management';
-        var commercial_check_action="checkIfCommercialNameExist";
-
-        $.ajax({
-            url: commercial_check_url+"/"+commercial_check_action,
-            data: {
-                commercial_name: commercial_name,
-                active: active,
-                is_edit:is_edit
-
-            },
-            error: function() {
-
-                flag=false;
-                console.log("Server validation call failed");
-                return flag;
-            },
-            dataType: 'json',
-            success: function(data) {
-
-               var is_exist=data['data']['is_exist'];
-
-                if (is_exist=="1"){
-                    console.log("Active name already exist");
-                    flag=false;
-                    $('#error_commercial_name_exist').css('display','block');
-                    return flag;
-                }
-
-                if(flag) {
-
-                    sendToServer(commercial_name,vaccine_id,manufacturer_id, catalog_num, active,row_id);
-                }
-
-            },
-            type: 'POST'
-        });
-
-
-    }
-
-    function sendToServer(commercial_name,vaccine_id,manufacturer_id, catalog_num, active,row_id) {
-
-        var url= '<?php echo $this->basePath()?>/commercial-names-management';
-        var action="saveCommercial";
-        var is_edit='<?php echo $is_edit?>';
-
-        $.ajax({
-            url: url+"/"+action,
-            data: {
-                commercial_name: commercial_name,
-                vaccine_id: vaccine_id,
-                manufacturer_id:manufacturer_id,
-                catalog_num: catalog_num,
-                active: active,
-                row_id: row_id,
-                is_edit:is_edit
-
-            },
-            error: function() {
-                console.log("data was not saved");
-            },
-            dataType: 'json',
-            success: function(data) {
-
-                console.log("data was saved");
-                top.restoreSession();
-                window.location=url;
-
-            },
-            type: 'POST'
-        });
-    }
-
-    function saveRecord(e,is_edit,row_id) {
-
-        e.preventDefault();
-
-
-        /****************************/
-        var commercial_name =$("#commercial_name").val().trim();
-        var vaccine_id =$("#vaccine_name").val();
-        var manufacturer_id=$("#manufacturer_name").val();
-        var catalog_num=$("#catalog_num").val();
-        var active = $('#active input:radio:checked').val();
-
-        commercial_name=commercial_name.replace(/[\x0d\x0a]/g,/[\r\n]/g);
-
-        /****************************/
-
-        ValidateForm(commercial_name,vaccine_id,manufacturer_id, catalog_num, active,row_id);
-
-    }
-
-    function renderOptions(mySelect,myOptions){
-
-        var selected=mySelect.find(":selected").val();
-
-        mySelect.empty();
-        mySelect.append(
-            $('<option></option>').val("choose").html("<?php echo xlt('Choose')?>")
-        );
-
-        $.each(myOptions, function(val, text) {
-            mySelect.append(
-                $('<option></option>').val(val).html(text)
-            );
-        });
-
-        mySelect.val(selected);
-    }
-
-
-
-    function disableValidaionWarning(id){
-
-        $('#error_'+id).css('display','none');
-
-    }
-
-    /*
-    removes red validation border
-    parent - to toggle the element itself to which the id belongs or its parent.
-     */
-    function removeRedBorder(id, parent){
-        if(parent!==undefined && parent!==null ){
-            $('#select2-' + id + '-container').parent().css('border', '1px solid #aaa');
-        }
-        else{
-            $('#' + id).css('border', '1px solid #aaa');
-        }
-
-    }
-
-    function removeBOM($data) {
-        if (0 === strpos(bin2hex($data), 'efbbbf')) {
-            return substr($data, 3);
-        }
-        return $data;
-    }
-
-    $( document ).ready(function() {
-
-        $('#vaccine_name,#manufacturer_name').select2({
-            <?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
-        });
-
-
-
-        $("#tab_title").html('<?php echo $title ?>');
-
-        $( "#vaccine_name" ).change(function() {
-            disableValidaionWarning($(this)["0"]["id"]);
-            removeRedBorder($(this)["0"]["id"], 1);
-            //getCommercialnames();
-
-        });
-
-        $( "#manufacturer_name" ).change(function() {
-            disableValidaionWarning($(this)["0"]["id"]);
-            removeRedBorder($(this)["0"]["id"], 1);
-            //getCommercialnames();
-
-        });
-
-
-
-        $( "#commercial_name" ).change(function() {
-            disableValidaionWarning('commercial_name_empty');
-            disableValidaionWarning('commercial_name_length');
-            disableValidaionWarning('commercial_name_exist');
-            removeRedBorder($(this)["0"]["id"]);
-
-        });
-
-
-
-        $('.datepicker').datetimepicker({
-            <?php $datetimepicker_timepicker = false; ?>
-            <?php $datetimepicker_showseconds = false; ?>
-            <?php $datetimepicker_formatInput = true; ?>
-            <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
-            <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
-        });
-
-        var is_edit='<?php echo $is_edit ?>';
-
-        var data={
-            "test_date":"<?php echo $data['test_date'] ?>",
-            "test_type":"<?php echo $data['test_type'] ?>",
-            "result":"<?php echo $data['result'] ?>",
-            "genotype":"<?php echo $data['genotype'] ?>",
-            "fibrotest":"<?php echo $data['fibrotest'] ?>",
-            "comment":"<?php echo str_replace("\"","\\\"",preg_replace("/[\x0d\x0a]/i","",$data['comment'])) ?>"
-        };
-        var row_id='<?php echo $row_id ?>';
-
-        $("#go_back").on( "click",function(e) {goBack(e)});
-        $("#save").on( "click",function(e) {saveRecord(e,is_edit,row_id)});
-
-        <?php if($is_edit): ?>
-        $('#vaccine_name').on('change', function () {
-           $.ajax({
-               url:'<?php echo $this->basePath()?>/vaccines-management/is-vaccine-active-ajax',
-               data:{vaccineId: $('#vaccine_name').val()},
-               method:'post',
-               dataType:'json'
-           }).done(function (data) {
-               if(data.output) {
-                   $('#alert-inactive-vaccine').hide();
-               } else {
-                   $('#alert-inactive-vaccine').show();
-               }
-           });
-        });
-        <?php endif; ?>
-
-
-    });
-
-</script>
-
-
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
index c5037d1..2116072 100644
--- a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
@@ -183,14 +183,37 @@ $headers = new ClinikalHeaders();
         return data;
     }
 
-    function goToAddNewBatch(e,row_id) {
-        e.preventDefault();
+    function goToAssignTemplate(e, queryParametersObj) {
         //console.log(document.URL);
-        var url= "<?php echo $this->basePath() ?>"+"/commercial-names-management/add-edit-commercial?row_id="+row_id;
+        var url= "<?php echo $this->basePath() ?>"+"/templates-management/assign-template";
+        if (typeof queryParametersObj !== 'undefined') {
+            url += '?edit=1&' + queryStringParameters(queryParametersObj)
+        }
         top.restoreSession();
         window.location=url;
     }
 
+    function queryStringParameters(obj) {
+        var str = [];
+        for (var p in obj)
+            if (obj.hasOwnProperty(p)) {
+                str.push(encodeURIComponent(p) + "=" + encodeURIComponent(obj[p]));
+            }
+        return str.join("&");
+    }
+
+    function gotoEdit(form, field, serviceType, reasonCode, template) {
+
+        var recordDtails = {
+            form_id: form,
+            field_id: field,
+            service_type:serviceType,
+            reason_code: reasonCode,
+            template: template
+        }
+        return goToAssignTemplate(null, recordDtails);
+    }
+
     $( document ).ready(function() {
 
         $('#reason_codes, #templates').select2({
@@ -244,6 +267,7 @@ $headers = new ClinikalHeaders();
         $("#filter").on( "click",filterData);
         $("#form_name").on( "change",loadFields);
         $("#service_type").on( "change",loadReasonCodes);
+        $("#assign_template").on( "click",goToAssignTemplate);
 
     });
 </script>
diff --git a/modules/ClinikalAPI/view/layout/layout.phtml b/modules/ClinikalAPI/view/layout/layout.phtml
index 7975765..5229c97 100644
--- a/modules/ClinikalAPI/view/layout/layout.phtml
+++ b/modules/ClinikalAPI/view/layout/layout.phtml
@@ -38,6 +38,11 @@ use OpenEMR\Core\Header;
                 width: 130px !important;
             }
 
+            nav .center-buttons{
+                padding: 10px;
+                margin-right: 5px;
+            }
+
 
         </style>
 
diff --git a/modules/GenericTools/src/GenericTools/Controller/BaseController.php b/modules/GenericTools/src/GenericTools/Controller/BaseController.php
index 3234d20..66425f0 100644
--- a/modules/GenericTools/src/GenericTools/Controller/BaseController.php
+++ b/modules/GenericTools/src/GenericTools/Controller/BaseController.php
@@ -1068,4 +1068,11 @@ public function getTitleOfValueSet($value,$valueSet){
         $where=array ('filter' => array (0 => array ('value' => $value, 'operator' => '=',),),);
         return $valueSetsTable->getValueSetById($valueSet,$where);
     }
+
+    protected function getConnectedUserId()
+    {
+        return $_SESSION['authUserID'];
+    }
+
+
 }
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php b/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
index e6fbed4..c3b6471 100644
--- a/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
+++ b/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
@@ -17,18 +17,18 @@ public function singleTitle()
     public function titleWithButtons($title, array $buttons = array(),array $leftButtons = array())
     {
         $html = $this->openTags();
-        $html .= '<li role="presentation" class="active"><a class="oe-bold-black">' . xlt($title) . '</a></li>';
+        $html .= '<li role="presentation" class="active"><a class="oe-bold-black fa-lg ">' . xlt($title) . '</a></li>';
         if (!empty($buttons)) {
         $html .= '<li class="center-buttons">';
                 foreach ($buttons as $button) {
-                    $html .= '<button type="button" id ="' . text($button['id']) . '" class="btn btn-info">' . xlt($button['title']) . '</button>';
+                    $html .= '<button type="button" id ="' . text($button['id']) . '" class="btn btn-info" style="margin-left:10px">' . xlt($button['title']) . '</button>';
                 }
             $html .= '</li>';
         }
         if (!empty($leftButtons)) {
             $html .= '<li class="left-buttons">';
             foreach ($leftButtons as $button) {
-                $html .= '<button type="button" id ="' . text($button['id']) . '" class="btn btn-info">' . xlt($button['title']) . '</button>';
+                $html .= '<button type="button" id ="' . text($button['id']) . '" class="btn btn-info" >' . xlt($button['title']) . '</button>';
             }
             $html .= '</li>';
         }
@@ -43,8 +43,8 @@ public function tabsMenu()
 
     private function openTags()
     {
-        $html = '<div id="header" class="row">';
-        $html .= '   <nav class="navbar navbar-default navbar-static-top">';
+        $html = '<div id="header" class="row mb-3">';
+        $html .= '   <nav class="navbar navbar-light navbar-expand-lg list-group-item-primary w-100 ">';
         $html .= '        <div class="container-fluid">';
         $html .= '            <ul id="header-links" class="nav navbar-nav col-md-12">';
         return $html;

From 4c205ec362eb5622565e04b0952a91231e7270df Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 7 Feb 2021 13:12:18 +0200
Subject: [PATCH 16/37] add/edit template screen

---
 .../FormTemplatesManagementController.php     | 221 +++++++++-----
 .../Model/GetTemplatesServiceTable.php        |   9 +-
 .../add-edit-template.phtml                   | 287 ++++++++++++++++++
 .../assign-template.phtml                     | 146 ++++-----
 .../templates-management-index.phtml          |  10 +-
 .../src/GenericTools/Model/Lists.php          |   2 +-
 .../src/GenericTools/Model/ListsTable.php     |  17 +-
 7 files changed, 516 insertions(+), 176 deletions(-)
 create mode 100644 modules/ClinikalAPI/view/clinikal-api/form-templates-management/add-edit-template.phtml

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
index d3abdf9..81108ae 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
@@ -10,6 +10,7 @@
 
 use GenericTools\Controller\BaseController;
 use GenericTools\Model\LangLanguagesTable;
+use GenericTools\Model\Lists;
 use GenericTools\Model\ListsTable;
 use Interop\Container\ContainerInterface;
 use ClinikalAPI\Model\GetTemplatesServiceTable;
@@ -18,7 +19,8 @@
 class FormTemplatesManagementController extends BaseController
 
 {
-    const TITLE = "templates Managment";
+    const TITLE = "Templates management";
+    const TEMPLATES_LIST = 'clinikal_templates';
     private $forms;
     private $fileds;
     private $serviceTypes;
@@ -56,57 +58,6 @@ public function templatesManagementIndexAction()
         return $parameters;
     }
 
-    private function loadClientSideForms()
-    {
-        $this->forms = $this->container->get(RegistryTable::class)->getFormsKeyDirectoryValueName(['category' => 'React form']);
-    }
-
-    private function loadFormFileds($formId = null)
-    {
-        $this->fileds = is_null($formId)
-            ?
-            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_form_fields_templates', true)
-            :
-            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_form_fields_templates', true, ['notes' => $formId]);
-    }
-
-    private function loadServiceTypes()
-    {
-        $this->serviceTypes = $this->container->get(ListsTable::class)->getListForViewForm('clinikal_service_types', true);
-    }
-
-    private function loadReasonCodes($serviceType = null)
-    {
-        $this->reasonCodes = is_null($serviceType)
-            ?
-            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_reason_codes', true)
-            :
-            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_reason_codes', true, ['notes' =>  $serviceType]);
-    }
-
-    private function loadtemplates()
-    {
-        $this->templates = $this->container->get(ListsTable::class)->getListForViewForm('clinikal_templates', true);
-    }
-
-    private function normalizeDataForTable($dbMapping)
-    {
-        $results = [];
-        foreach ($dbMapping as $item) {
-            $results[] = [
-                $item['form'],
-                $item['field'],
-                $item['service_type'],
-                $item['reason_code'],
-                $item['template'],
-                (intval($item['active']) === 1) ? "<i style='color: green;font-size: 1.7em;' class='fas fa-check-circle'></i>" : "<i style='color: red;  font-size: 1.7em;' class='fas fa-times-circle'></i>",
-                '<button onclick="gotoEdit(' . "'{$item['form_id']}','{$item['field_id']}','{$item['service_type_id']}','{$item['reason_code_id']}','{$item['template_id']}'" . ')">' . xlt('Edit') . '</button>'
-            ];
-        }
-        return $results;
-    }
-
-
     public function templatesManagementAjaxAction()
     {
         $queryFilters = [];
@@ -230,6 +181,144 @@ public function saveAssignTemplateAction()
         return $this->responseWithNoLayout(false, 500);
     }
 
+    public function deleteAssignTemplateAction()
+    {
+        $data = $this->params()->fromPost('data');
+
+        if ($this->validateData($data)) {
+            unset($data['seq'], $data['active']);
+
+            $valid = $this->container->get(GetTemplatesServiceTable::class)->delete($data);
+
+            return $this->responseWithNoLayout($valid ? true : false, true);
+        }
+        return $this->responseWithNoLayout(false, 500);
+    }
+
+    public function addEditTemplateAction()
+    {
+        $templates = $this->container->get(ListsTable::class)->getAllList('clinikal_templates', 'title');;
+        $this->layout('clinikalApi/layout/layout');
+        return ['templates' => $templates];
+    }
+
+     public function saveNewTemplateAction()
+     {
+         $template = trim($this->params()->fromPost('template'));
+
+         $found = $this->container->get(ListsTable::class)->getListForViewForm(self::TEMPLATES_LIST, false, ['title' => $template], false);
+         if (!empty($found)) {
+             return $this->responseWithNoLayout('data_conflict', true, 409);
+         }
+
+         $listObj = new Lists();
+         $listObj->exchangeArray([
+            'list_id' => self::TEMPLATES_LIST,
+            'option_id' => bin2hex(random_bytes(3)),
+            'title' => $template,
+            'activity' => 1,
+         ]);
+
+         $insert = $this->container->get(ListsTable::class)->insert($listObj);
+         return $this->responseWithNoLayout($insert ? true : false);
+
+     }
+
+    public function updateTemplateAction()
+    {
+        $templateId = $this->params()->fromPost('id');
+        $templateText = trim($this->params()->fromPost('text'));
+        $activity = $this->params()->fromPost('activity');
+        $oldText = trim($this->params()->fromPost('old_text'));
+        $oldActivity = $this->params()->fromPost('old_activity');
+
+        if ($templateText !== $oldText) {
+
+            $found = $this->container->get(ListsTable::class)->getListForViewForm(self::TEMPLATES_LIST, false, ['title' => $templateText], false);
+            if (!empty($found)) {
+                return $this->responseWithNoLayout('data_conflict', true, 409);
+            }
+        }
+
+        $update = $this->container->get(ListsTable::class)->update(
+            ['title' => $templateText, 'activity' => $activity],
+            ['list_id' => self::TEMPLATES_LIST, 'option_id' => $templateId]
+        );
+
+       if ($activity == 0 && $oldActivity == 1) {
+           $this->container->get(GetTemplatesServiceTable::class)->update(['active' => 0], ['message_id' => $templateId]);
+       }
+
+        return $this->responseWithNoLayout($update ? true : false);
+
+    }
+
+    public function deleteTemplateAction()
+    {
+        $templateId = $this->params()->fromPost('id');
+
+        $delete = $this->container->get(ListsTable::class)->delete(
+            ['list_id' => self::TEMPLATES_LIST, 'option_id' => $templateId]
+        );
+
+        if ($delete) {
+            $delete = $this->container->get(GetTemplatesServiceTable::class)->delete(['message_id' => $templateId]);
+        }
+        return $this->responseWithNoLayout($delete ? true : false);
+    }
+
+    private function loadClientSideForms()
+    {
+        $this->forms = $this->container->get(RegistryTable::class)->getFormsKeyDirectoryValueName(['category' => 'React form']);
+    }
+
+    private function loadFormFileds($formId = null)
+    {
+        $this->fileds = is_null($formId)
+            ?
+            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_form_fields_templates', true)
+            :
+            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_form_fields_templates', true, ['notes' => $formId]);
+    }
+
+    private function loadServiceTypes()
+    {
+        $this->serviceTypes = $this->container->get(ListsTable::class)->getListForViewForm('clinikal_service_types', true);
+    }
+
+    private function loadReasonCodes($serviceType = null)
+    {
+        $this->reasonCodes = is_null($serviceType)
+            ?
+            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_reason_codes', true)
+            :
+            $this->container->get(ListsTable::class)->getListForViewForm('clinikal_reason_codes', true, ['notes' =>  $serviceType]);
+    }
+
+    private function loadtemplates()
+    {
+        $this->templates = $this->container->get(ListsTable::class)->getListForViewForm('clinikal_templates', true, [], false);
+    }
+
+    private function normalizeDataForTable($dbMapping)
+    {
+        $results = [];
+        foreach ($dbMapping as $item) {
+            $results[] = [
+                $item['form'],
+                $item['field'],
+                $item['service_type'],
+                $item['reason_code'],
+                $item['template'],
+                (intval($item['active']) === 1) ? "<i style='color: green;font-size: 1.7em;' class='fas fa-check-circle'></i>" : "<i style='color: red;  font-size: 1.7em;' class='fas fa-times-circle'></i>",
+                '<button class="btn btn-secondary btn-sm btn-edit" onclick="gotoEdit(' . "'{$item['form_id']}','{$item['field_id']}','{$item['service_type_id']}','{$item['reason_code_id']}','{$item['template_id']}'" . ')">' . xlt('Edit') . '</button>'
+            ];
+        }
+        return $results;
+    }
+
+
+
     private function validateData($data)
     {
         $requiredFileds = ['form_id','form_field','service_type','reason_code','message_id','seq','active'];
@@ -250,32 +339,4 @@ private function primaryKeysNotChanged($data, $oldData)
         return true;
     }
 
-
-    /**
-     * @return \Zend\Stdlib\ResponseInterface
-     */
-    public function deleteAssignTempleteAjaxAction()
-    {
-        $request = $this->getRequest();
-        if ($request->isPost()) {
-            $id = $request->getPost()['id'];
-            $status = $this->getVacListMailsTable()->deleteRow($id);
-            return $this->ajaxOutPut( ($status ? 'success' : 'false') );
-        }
-    }
-
-
-
-    function getRecordsByField($data, $field_name)
-    {
-        $result = false;
-        if (is_array($data) && strlen($field_name) > 0) {
-            foreach ($data as $row) {
-                if (array_key_exists($field_name, $row) && strlen($row[$field_name]) > 0 ) {
-                    $result[] = $row[$field_name];
-                }
-            }
-        }
-        return (is_array($result) ? array_unique($result) : $result);
-    }
 }
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
index da40a5d..c9f120e 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Model/GetTemplatesServiceTable.php
@@ -37,7 +37,7 @@ public function getTemplatesForForm($form_id=null,$form_field=null,$service_type
         $joinExp= new Expression("clinikal_templates_map.message_id = list.option_id AND list.list_id = 'clinikal_templates' ");
         $select->join(array ("list"=>"list_options") , $joinExp, $this->listArr, self::LEFT_JOIN);
         $where = new Where();
-
+        $where->equalTo("active", 1);
 
         if(!is_null($service_type)){
             $where->equalTo("service_type",$service_type)->AND->
@@ -51,7 +51,7 @@ public function getTemplatesForForm($form_id=null,$form_field=null,$service_type
 
         $select->where($where);
         $select->order(array('clinikal_templates_map.seq ASC'));
-        //$debug = $select->getSqlString();
+       // $debug = $select->getSqlString();
         //echo $debug;die;
         $rs = $this->tableGateway->selectWith($select);
         foreach ($rs as $r) {
@@ -129,4 +129,9 @@ public function insert($data) {
     public function delete($data) {
         return $this->tableGateway->delete($data) ? true : false;
     }
+
+    public function update($set, $where)
+    {
+        return $this->tableGateway->update($set, $where) ? true : false;
+    }
 }
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/add-edit-template.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/add-edit-template.phtml
new file mode 100644
index 0000000..474588e
--- /dev/null
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/add-edit-template.phtml
@@ -0,0 +1,287 @@
+<?php
+
+use GenericTools\Library\UiComponents\Header\ClinikalHeaders;
+$headers = new ClinikalHeaders();
+$menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
+?>
+<style>
+
+    #alredy-exists{
+        display: none;
+    }
+    #general-error{
+        display: none;
+    }
+
+</style>
+<div id="add-edit-template" class="container">
+
+    <?php echo $headers->titleWithButtons("Add/edit template" , $menuBottons);  ?>
+    <div class="row">
+        <div class="col-md-6 text-center">
+            <div id="alredy-exists" class="alert alert-danger" role="alert">
+                <?php echo xlt('This template already exists')?>
+            </div>
+            <div id="general-error" class="alert alert-danger" role="alert">
+                <?php echo xlt('Error ouccored')?>
+            </div>
+        </div>
+    </div>
+    <div class="row row_padded">
+        <div class="col-xs-12 col-md-12">
+            <h3><?php echo xlt('Add a new template') ?></h3>
+        </div>
+        <div class="col-xs-12 col-md-8">
+            <textarea id="new-template" class="form-control"></textarea>
+        </div>
+        <div class="col-xs-12 col-md-4">
+            <button class="btn btn-secondary btn-sm btn-edit" id="save-new"><?php echo xlt('Save'); ?></button>
+        </div>
+    </div>
+    <hr />
+    <div class="row row_padded">
+        <div class="col-xs-12 col-md-12">
+            <h3><?php echo xlt('Edit template') ?></h3>
+        </div>
+        <div class="col-xs-12 col-md-8">
+            <label for="templates" class="control-label"><?php echo xlt("Selelct template").":"; ?></label>
+            <select class="selectpicker form-control" id="templates" data-show-subtext="true" data-live-search="true">
+                <option data-tokens="" value=""><?php echo xlt("Choose"); ?></option>
+                <?php foreach ($templates as $templateId => $template): ?>
+                    <option data-tokens="" data-active="<?php echo attr($template['activity'])?>" value="<?php echo attr($templateId)?>"><?php echo xlt($template['title']); ?></option>
+                <?php endforeach; ?>
+            </select>
+            <span id="templates_error" class="error-message" style="display: none"> <?php echo xlt("Value is required"); ?> </span>
+        </div>
+    </div>
+    <div class="row  row_padded">
+        <div class="col-xs-10 col-md-8">
+            <textarea class="form-control" id="update-box" name="update_box" disabled></textarea>
+        </div>
+        <div class="col-xs-2 col-md-2">
+            <div class="col-xs-2 col-md-5">
+                <label for="active" class="control-label"><?php echo xlt("Active").":"; ?></label>
+            </div>
+            <div id="active" class="col-xs-2 col-md-7">
+                <label class="radio-inline fix_inline_radio"><input  id="active-yes" disabled="true" type="radio" value="1" name="optradio"><?php echo xlt("Yes"); ?></label>
+                <label   class="radio-inline fix_inline_radio"><input id="active-no"  disabled="true" type="radio" value="0"name="optradio" ><?php echo xlt("No"); ?></label>
+            </div>
+
+        </div>
+        <div class="col-xs-12 col-md-2">
+            <button class="btn btn-secondary btn-sm btn-edit" id="update-template" disabled ><?php echo xlt('update'); ?></button>
+            <button class="btn btn-secondary btn-sm btn-edit" id="delete-template" disabled ><?php echo xlt('Delete'); ?></button>
+        </div>
+    </div>
+</div>
+<div id="inactive-alert" class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title"><?php echo xlt('System notification') ?></h5>
+                <button type="button" class="close close-popup" data-dismiss="modal" aria-label="Close" >
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <p><?php echo xlt('Are you sure you want to mark this template as inactive') ?>?</p>
+                <p><?php echo xlt('In the action all the form fields are assigned of this template will be marked as inactive also') ?>.</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" id="run-update" class="btn btn-primary"><?php echo xlt('Yes, update') ?></button>
+                <button type="button" class="btn btn-secondary close-popup" data-dismiss="modal"><?php echo xlt('Cancel') ?></button>
+            </div>
+        </div>
+    </div>
+</div>
+<div id="delete-alert" class="modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title"><?php echo xlt('System notification') ?></h5>
+                <button type="button" class="close close-popup" data-dismiss="modal" aria-label="Close" >
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <p><?php echo xlt('Are you sure you want to delete the template') ?>?</p>
+                <p><?php echo xlt('In the action all the form fields are assigned to this template will be deleted also') ?>.</p>
+            </div>
+            <div class="modal-footer">
+                <button type="button" id="run-delete" class="btn btn-primary"><?php echo xlt('Yes, delete') ?></button>
+                <button type="button" class="btn btn-secondary close-popup" data-dismiss="modal"><?php echo xlt('Cancel') ?></button>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+
+    $('#templates').select2({
+        <?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
+    });
+
+    $('#templates').on('change', function () {
+        $('#update-box').val($('#templates>option:selected').text());
+        $('#update-box').prop('disabled', false);
+        $('#update-template').prop('disabled', false);
+        $('#delete-template').prop('disabled', false);
+        if ($('#templates>option:selected').data('active') == 1) {
+            $('#active-yes').prop('checked', true);
+            $('#active-no').prop('checked', false);
+        } else {
+            $('#active-yes').prop('checked', false);
+            $('#active-no').prop('checked', true);
+        }
+        $('#active-yes').prop('disabled', false);
+        $('#active-no').prop('disabled', false);
+    });
+
+
+    function save()
+    {
+        hideErrors();
+        var newTemplate = $('#new-template').val();
+        if(newTemplate.length === 0) {
+            return showError('new-template')
+        }
+
+        var url= '<?php echo $this->basePath()?>/templates-management';
+        var action="save-new-template";
+
+        $.ajax({
+            url: url+"/"+action,
+            data: {
+               template: newTemplate
+            },
+            error: function(data) {
+                if (data.status = 409) {
+                    $('#alredy-exists').show();
+                } else {
+                    $('#general-error').show();
+                }
+            },
+            dataType: 'json',
+            success: function(data) {
+
+                console.log(data);
+                top.restoreSession();
+                window.location=url;
+
+            },
+            type: 'POST'
+        });
+    }
+
+    function update(){
+        hideErrors();
+        var newTemplate = $('#update-box').val();
+        if(newTemplate.length === 0) {
+            return showError('update-box')
+        }
+
+        if($('#active input:radio:checked').val() == 0) {
+            return  $('#inactive-alert').show();
+        }
+        updateTemplate();
+    }
+
+    function updateTemplate() {
+        $('#inactive-alert').hide();
+        var data = {
+            id:$('#templates>option:selected').val(),
+            text: $('#update-box').val(),
+            activity: $('#active input:radio:checked').val(),
+            old_text: $('#templates>option:selected').text(),
+            old_activity: $('#templates>option:selected').data('active')
+        }
+
+        var url= '<?php echo $this->basePath()?>/templates-management';
+        var action="update-template";
+
+        $.ajax({
+            url: url+"/"+action,
+            data: data,
+            error: function(data) {
+                if (data.status = 409) {
+                    $('#alredy-exists').show();
+                } else {
+                    $('#general-error').show();
+                }
+            },
+            dataType: 'json',
+            success: function(data) {
+                top.restoreSession();
+                window.location=url;
+            },
+            type: 'POST'
+        });
+    }
+
+    function deleteTemplate() {
+        $('#inactive-alert').hide();
+        var data = {
+            id:$('#templates>option:selected').val(),
+        }
+
+        var url= '<?php echo $this->basePath()?>/templates-management';
+        var action="delete-template";
+
+        $.ajax({
+            url: url+"/"+action,
+            data: data,
+            error: function(data) {
+                $('#general-error').show();
+            },
+            dataType: 'json',
+            success: function(data) {
+                top.restoreSession();
+                window.location=url;
+            },
+            type: 'POST'
+        });
+    }
+
+
+    function showError(id)
+    {
+        $('#' + id + '_error').css('display','block');
+        $('#' + id).css('border', 'solid 1px red');
+    }
+
+    function showSelect2Error(id)
+    {
+        $('#' + id + '_error').css('display','block');
+        $('#select2-' + id + '-container').parent().css('border', 'solid 1px red');
+    }
+
+    function hideErrors()
+    {
+        $('select').css('border', '1px solid #ced4da');
+        $('.select2-selection').css('border', '1px solid #ced4da');
+        $('[id$="_error"]').css('display','none');
+        $('#alredy-exists').hide();
+        $('#general-error').hide();
+    }
+
+    function goBack(e) {
+        e.preventDefault();
+        var url=  '<?php echo $this->basePath()?>'+'/templates-management';
+        top.restoreSession();
+        window.location=url;
+    }
+
+    $('#save-new').click(save)
+    $('#update-template').click(update)
+    $('#delete-template').click(function (){
+        $('#delete-alert').show()
+    })
+    $('#run-update').click(updateTemplate)
+    $('#run-delete').click(deleteTemplate)
+
+    $('.close-popup').on('click', function () {
+        $('#inactive-alert').hide();
+        $('#delete-alert').hide();
+    })
+    $("#go_back").on( "click",function(e) {goBack(e)});
+
+</script>
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
index 28c9a24..d5db9b1 100644
--- a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
@@ -3,6 +3,11 @@
 use ClinikalAPI\Model\GetTemplatesServiceTable;
 use GenericTools\Library\UiComponents\Header\ClinikalHeaders;
 $headers = new ClinikalHeaders();
+$menuBottons[] = array('id' => 'save', 'title' => 'Save');
+if ($is_edit) {
+    $menuBottons[] = array('id' => 'delete', 'title' => 'Delete assigned');
+}
+$menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
 ?>
 <style>
 
@@ -19,13 +24,13 @@ $headers = new ClinikalHeaders();
 </style>
 <div id="add-edit-batch" class="container">
 
-    <?php echo $headers->titleWithButtons($is_edit? "Update assignment" : "Assign template" , array(array('id' => 'save', 'title' => 'Save'), array('id' => 'go_back', 'title' => 'cancel')));  ?>
+    <?php echo $headers->titleWithButtons($is_edit? "Update assigned" : "Assign template" , $menuBottons);  ?>
 
     <div id="template-form-container" class="">
         <div class="row">
             <div class="col-md-6 text-center">
                 <div id="alredy-exists" class="alert alert-danger" role="alert">
-                    <?php echo xlt('This assigment already exists')?>
+                    <?php echo xlt('This assigned already exists')?>
                 </div>
                 <div id="general-error" class="alert alert-danger" role="alert">
                     <?php echo xlt('Error ouccored')?>
@@ -77,7 +82,7 @@ $headers = new ClinikalHeaders();
                 <label for="reason_code" class="control-label"><?php echo xlt("Reason code").":"; ?></label>
                 <select class="selectpicker form-control" id="reason_code" data-show-subtext="true" data-live-search="true" <?php if (!$is_edit) echo 'disabled';?>>
                     <?php if($is_edit): ?>
-                        <option value="all" <?php if ($record['reason_code'] == GetTemplatesServiceTable::ALL_REASON_CODE) echo 'selected';?>><?php echo xlt(GetTemplatesServiceTable::ALL_REASON_CODE_STRING); ?></option>
+                        <option value="<?php echo attr(GetTemplatesServiceTable::ALL_REASON_CODE) ?>" <?php if ($record['reason_code'] == GetTemplatesServiceTable::ALL_REASON_CODE) echo 'selected';?>><?php echo xlt(GetTemplatesServiceTable::ALL_REASON_CODE_STRING); ?></option>
                         <?php foreach ($reasonCode as $reasonCodeId => $reasonCodeName): ?>
                             <option value="<?php echo attr($reasonCodeId)?>" <?php if ($reasonCodeId == $record['reason_code']) echo 'selected';?>><?php echo xlt($reasonCodeName); ?></option>
                         <?php endforeach; ?>
@@ -116,7 +121,7 @@ $headers = new ClinikalHeaders();
                 </div>
                 <div id="active" class="col-xs-2 col-md-7">
                     <label class="radio-inline fix_inline_radio"><input type="radio" value="1" name="optradio" <?php echo (!$is_edit||isset($record['active'])&&$record['active']=="1")? "checked" : ""; ?>><?php echo xlt("Yes"); ?></label>
-                    <label class="radio-inline fix_inline_radio"><input type="radio" value="0"name="optradio" <?php echo (isset($record['active'])&&$record['active']=="0")? "checked" : ""; ?>><?php echo xlt("No"); ?></label>
+                    <label class="radio-inline fix_inline_radio"><input type="radio" value="0"name="optradio" <?php echo ($is_edit && empty($record['active']))? "checked" : ""; ?>><?php echo xlt("No"); ?></label>
                 </div>
 
             </div>
@@ -178,23 +183,6 @@ $headers = new ClinikalHeaders();
         window.location=url;
     }
 
-    /*function renderOptions(mySelect,myOptions){
-
-
-        var selected=mySelect.find(":selected").val();
-
-        mySelect.empty();
-        mySelect.append(
-            $('<option></option>').val("").html("<?php echo xlt('ALL')?>")
-        );
-
-        $.each(myOptions, function(val, text) {
-            mySelect.append(
-                $('<option></option>').val(val).html(text)
-            );
-        });
-
-    }*/
 
     function loadList(action, filter, selectElement)
     {
@@ -281,10 +269,7 @@ $headers = new ClinikalHeaders();
             showSelect2Error('templates')
         }
 
-        if(flag) {
-
-            sendToServer(formData);
-        }
+        return flag;
 
     }
 
@@ -341,13 +326,55 @@ $headers = new ClinikalHeaders();
         });
     }
 
+    function deleteInServer(formData) {
+
+        var url= '<?php echo $this->basePath()?>/templates-management';
+        var action="delete-assign-template";
+        $.ajax({
+            url: url+"/"+action,
+            data: {
+                data:formData,
+            },
+            error: function(data) {
+                $('#general-error').show();
+            },
+            dataType: 'json',
+            success: function(data) {
+
+                top.restoreSession();
+                window.location=url;
+
+            },
+            type: 'POST'
+        });
+    }
+
     function saveRecord(e,is_edit) {
 
         e.preventDefault();
+        var collectedData = collectData();
+        var valid = ValidateForm(collectedData);
 
+        if(valid) {
+            sendToServer(collectedData);
+        }
+
+    }
 
-        /****************************/
-        collectedData = {
+    function deleteRecord(e,is_edit) {
+        if (is_edit) {
+            e.preventDefault();
+            var collectedData = collectData();
+            var valid = ValidateForm(collectedData);
+
+            if(valid) {
+                deleteInServer(collectedData);
+            }
+        }
+    }
+
+    function collectData() {
+        return {
             form_id :$("#form_name").val().trim(),
             form_field :$("#field_name").val(),
             service_type:$("#service_type").val(),
@@ -356,11 +383,6 @@ $headers = new ClinikalHeaders();
             seq:$("#seq").val(),
             active : $('#active input:radio:checked').val()
         }
-
-        /****************************/
-
-        ValidateForm(collectedData);
-
     }
 
     function renderOptions(mySelect,myOptions){
@@ -412,70 +434,12 @@ $headers = new ClinikalHeaders();
 
     $( document ).ready(function() {
 
-        $('#vaccine_name,#manufacturer_name').select2({
-            <?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
-        });
-
-
-
         $("#tab_title").html('<?php echo $title ?>');
 
-        $( "#vaccine_name" ).change(function() {
-            disableValidaionWarning($(this)["0"]["id"]);
-            removeRedBorder($(this)["0"]["id"], 1);
-            //getCommercialnames();
-
-        });
-
-        $( "#manufacturer_name" ).change(function() {
-            disableValidaionWarning($(this)["0"]["id"]);
-            removeRedBorder($(this)["0"]["id"], 1);
-            //getCommercialnames();
-
-        });
-
-
-
-        $( "#commercial_name" ).change(function() {
-            disableValidaionWarning('commercial_name_empty');
-            disableValidaionWarning('commercial_name_length');
-            disableValidaionWarning('commercial_name_exist');
-            removeRedBorder($(this)["0"]["id"]);
-
-        });
-
-
-
-        $('.datepicker').datetimepicker({
-            <?php $datetimepicker_timepicker = false; ?>
-            <?php $datetimepicker_showseconds = false; ?>
-            <?php $datetimepicker_formatInput = true; ?>
-            <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
-            <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
-        });
-
-
-
 
         $("#go_back").on( "click",function(e) {goBack(e)});
         $("#save").on( "click",function(e) {saveRecord(e,is_edit)});
-
-        <?php if($is_edit): ?>
-        $('#vaccine_name').on('change', function () {
-           $.ajax({
-               url:'<?php echo $this->basePath()?>/vaccines-management/is-vaccine-active-ajax',
-               data:{vaccineId: $('#vaccine_name').val()},
-               method:'post',
-               dataType:'json'
-           }).done(function (data) {
-               if(data.output) {
-                   $('#alert-inactive-vaccine').hide();
-               } else {
-                   $('#alert-inactive-vaccine').show();
-               }
-           });
-        });
-        <?php endif; ?>
+        $("#delete").on( "click",function(e) {deleteRecord(e,is_edit)});
 
 
     });
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
index 2116072..87171f5 100644
--- a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
@@ -24,7 +24,7 @@ $headers = new ClinikalHeaders();
 
     <?php echo $headers->titleWithButtons('Templates management', array(
         array('id' => 'assign_template', 'title' => 'Assign template' ),
-        array('id' => 'add_template', 'title' => 'add/edit template' ),
+        array('id' => 'add_template', 'title' => 'Add/edit template' ),
         )); ?>
 
     <div id="filters-container">
@@ -193,6 +193,13 @@ $headers = new ClinikalHeaders();
         window.location=url;
     }
 
+    function goToAddTemplate()
+    {
+        var url= "<?php echo $this->basePath() ?>"+"/templates-management/add-edit-template";
+        top.restoreSession();
+        window.location=url;
+    }
+
     function queryStringParameters(obj) {
         var str = [];
         for (var p in obj)
@@ -268,6 +275,7 @@ $headers = new ClinikalHeaders();
         $("#form_name").on( "change",loadFields);
         $("#service_type").on( "change",loadReasonCodes);
         $("#assign_template").on( "click",goToAssignTemplate);
+        $("#add_template").on( "click",goToAddTemplate);
 
     });
 </script>
diff --git a/modules/GenericTools/src/GenericTools/Model/Lists.php b/modules/GenericTools/src/GenericTools/Model/Lists.php
index 6eca8e7..86c3bd9 100644
--- a/modules/GenericTools/src/GenericTools/Model/Lists.php
+++ b/modules/GenericTools/src/GenericTools/Model/Lists.php
@@ -20,7 +20,7 @@ public function exchangeArray($data)
         $this->option_id = (!empty($data['option_id'])) ? $data['option_id'] : null;
         $this->title = (!empty($data['title'])) ? $data['title'] : null;
         $this->activity = (!empty($data['activity'])) ? $data['activity'] : null;
-        $this->subtype = (!empty($data['subtype'])) ? $data['subtype'] : null;
+        $this->subtype = (!empty($data['subtype'])) ? $data['subtype'] : '';
         $this->notes = (!empty($data['notes'])) ? $data['notes'] : null;
 
     }
diff --git a/modules/GenericTools/src/GenericTools/Model/ListsTable.php b/modules/GenericTools/src/GenericTools/Model/ListsTable.php
index 12d2766..a3cbab6 100644
--- a/modules/GenericTools/src/GenericTools/Model/ListsTable.php
+++ b/modules/GenericTools/src/GenericTools/Model/ListsTable.php
@@ -191,7 +191,7 @@ public function getAllList($listId,$orderBy = null,$typeOfOrder = null)
 
             $where = new Where();
             $where->equalTo('list_id', $listId);
-
+            $select->where($where);
             $order=$orderBy . " " . (!$typeOfOrder ? "ASC" : $typeOfOrder);
             $select->order($order);
 
@@ -272,4 +272,19 @@ public function getListForViewFormNoTranslation($listId,  $params = array(), $on
 
         return $results;
     }
+
+    public function insert(Lists $listObj)
+    {
+        return $this->tableGateway->insert((get_object_vars($listObj))) ? true : false;
+    }
+
+    public function update($set, $where)
+    {
+        return $this->tableGateway->update($set, $where) ? true : false;
+    }
+
+    public function delete($data) {
+        return $this->tableGateway->delete($data) ? true : false;
+    }
+
 }

From 324d50c1284aa90fe8b61ecd68ee06f592f9bc45 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 7 Feb 2021 15:37:21 +0200
Subject: [PATCH 17/37] last fixes

---
 .../FormTemplatesManagementController.php     | 10 +++++++++-
 .../add-edit-template.phtml                   | 20 ++++++++++++++-----
 .../assign-template.phtml                     | 17 +++++++++++-----
 .../templates-management-index.phtml          |  2 +-
 .../DataTableExtended/DataTableExtended.php   |  2 +-
 .../UiComponents/Header/ClinikalHeaders.php   |  2 +-
 6 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
index 81108ae..0e2f82a 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
@@ -117,6 +117,10 @@ public function assignTemplateAction()
             $parameters['is_edit'] = true;
         }
 
+        if ($this->params()->fromQuery('success_msg')) {
+            $parameters['showSuccessMsg'] = true;
+        }
+
         $this->layout('clinikalApi/layout/layout');
         return $parameters;
 
@@ -199,7 +203,11 @@ public function addEditTemplateAction()
     {
         $templates = $this->container->get(ListsTable::class)->getAllList('clinikal_templates', 'title');;
         $this->layout('clinikalApi/layout/layout');
-        return ['templates' => $templates];
+        return [
+            'templates' => $templates,
+            'title' => xlt(self::TITLE),
+            'showSuccessMsg' => ($this->params()->fromQuery('success_msg')) ? true : false
+            ];
     }
 
      public function saveNewTemplateAction()
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/add-edit-template.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/add-edit-template.phtml
index 474588e..0e646d5 100644
--- a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/add-edit-template.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/add-edit-template.phtml
@@ -19,6 +19,11 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
     <?php echo $headers->titleWithButtons("Add/edit template" , $menuBottons);  ?>
     <div class="row">
         <div class="col-md-6 text-center">
+            <?php if($showSuccessMsg): ?>
+                <div id="success-msg" class="alert alert-success" role="alert">
+                    <?php echo xlt('The action completed successfully')?>
+                </div>
+            <?php endif; ?>
             <div id="alredy-exists" class="alert alert-danger" role="alert">
                 <?php echo xlt('This template already exists')?>
             </div>
@@ -35,7 +40,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
             <textarea id="new-template" class="form-control"></textarea>
         </div>
         <div class="col-xs-12 col-md-4">
-            <button class="btn btn-secondary btn-sm btn-edit" id="save-new"><?php echo xlt('Save'); ?></button>
+            <button class="btn btn-secondary btn-sm btn-save" id="save-new"><?php echo xlt('Save'); ?></button>
         </div>
     </div>
     <hr />
@@ -70,7 +75,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
         </div>
         <div class="col-xs-12 col-md-2">
             <button class="btn btn-secondary btn-sm btn-edit" id="update-template" disabled ><?php echo xlt('update'); ?></button>
-            <button class="btn btn-secondary btn-sm btn-edit" id="delete-template" disabled ><?php echo xlt('Delete'); ?></button>
+            <button class="btn btn-secondary btn-sm btn-cancel" id="delete-template" disabled ><?php echo xlt('Delete'); ?></button>
         </div>
     </div>
 </div>
@@ -147,6 +152,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
 
         var url= '<?php echo $this->basePath()?>/templates-management';
         var action="save-new-template";
+        var success_redirect=url+'/add-edit-template?success_msg=1';
 
         $.ajax({
             url: url+"/"+action,
@@ -165,7 +171,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
 
                 console.log(data);
                 top.restoreSession();
-                window.location=url;
+                window.location=success_redirect;
 
             },
             type: 'POST'
@@ -197,6 +203,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
 
         var url= '<?php echo $this->basePath()?>/templates-management';
         var action="update-template";
+        var success_redirect=url+'/add-edit-template?success_msg=1';
 
         $.ajax({
             url: url+"/"+action,
@@ -211,7 +218,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
             dataType: 'json',
             success: function(data) {
                 top.restoreSession();
-                window.location=url;
+                window.location=success_redirect;
             },
             type: 'POST'
         });
@@ -225,6 +232,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
 
         var url= '<?php echo $this->basePath()?>/templates-management';
         var action="delete-template";
+        var success_redirect=url+'/add-edit-template?success_msg=1';
 
         $.ajax({
             url: url+"/"+action,
@@ -235,7 +243,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
             dataType: 'json',
             success: function(data) {
                 top.restoreSession();
-                window.location=url;
+                window.location=success_redirect;
             },
             type: 'POST'
         });
@@ -261,6 +269,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
         $('[id$="_error"]').css('display','none');
         $('#alredy-exists').hide();
         $('#general-error').hide();
+        $('#success-msg').hide();
     }
 
     function goBack(e) {
@@ -284,4 +293,5 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
     })
     $("#go_back").on( "click",function(e) {goBack(e)});
 
+    $("#tab_title").html(<?php echo js_escape($title) ?>);
 </script>
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
index d5db9b1..26fe6b9 100644
--- a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/assign-template.phtml
@@ -29,6 +29,11 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
     <div id="template-form-container" class="">
         <div class="row">
             <div class="col-md-6 text-center">
+                <?php if($showSuccessMsg): ?>
+                <div id="success-msg" class="alert alert-success" role="alert">
+                    <?php echo xlt('The action completed successfully')?>
+                </div>
+                <?php endif; ?>
                 <div id="alredy-exists" class="alert alert-danger" role="alert">
                     <?php echo xlt('This assigned already exists')?>
                 </div>
@@ -199,7 +204,6 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
                 renderOptions(selectElement,data);
                 selectElement.prop('disabled', false);
 
-
             },
             type: 'GET'
         });
@@ -292,6 +296,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
         $('[id$="_error"]').css('display','none');
         $('#alredy-exists').hide();
         $('#general-error').hide();
+        $('#success-msg').hide();
     }
 
     function sendToServer(formData) {
@@ -299,7 +304,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
         var url= '<?php echo $this->basePath()?>/templates-management';
         var action="saveAssignTemplate";
         var is_edit='<?php echo $is_edit?>';
-
+        var success_redirect=url+'/assign-template?success_msg=1';
         $.ajax({
             url: url+"/"+action,
             data: {
@@ -319,7 +324,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
 
                 console.log(data);
                 top.restoreSession();
-                window.location=url;
+                window.location=success_redirect;
 
             },
             type: 'POST'
@@ -330,6 +335,8 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
 
         var url= '<?php echo $this->basePath()?>/templates-management';
         var action="delete-assign-template";
+        var success_redirect=url+'/assign-template?success_msg=1';
+
         $.ajax({
             url: url+"/"+action,
             data: {
@@ -342,7 +349,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
             success: function(data) {
 
                 top.restoreSession();
-                window.location=url;
+                window.location=success_redirect;
 
             },
             type: 'POST'
@@ -443,7 +450,7 @@ $menuBottons[] = array('id' => 'go_back', 'title' => 'cancel');
 
 
     });
-
+    $("#tab_title").html(<?php echo js_escape($title) ?>);
 </script>
 
 
diff --git a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
index 87171f5..cc9fb6c 100644
--- a/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/form-templates-management/templates-management-index.phtml
@@ -227,7 +227,7 @@ $headers = new ClinikalHeaders();
             <?php require($GLOBALS['srcdir'] . '/js/xl/select2.js.php'); ?>
         });
 
-        $("#tab_title").html('<?php echo $title ?>');
+        $("#tab_title").html(<?php echo js_escape($title) ?>);
 
        /* DATATABLE */
         <?php $table_handler->setUiSettings(false, false);?>
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php b/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php
index 14ef09d..48453b9 100644
--- a/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php
+++ b/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php
@@ -31,7 +31,7 @@ public function echoBaseHTML()
             exit();
         }
 
-        $table_html_string='<table id="'.$tableId.'" class="table">';
+        $table_html_string='<table style="width:100%" id="'.$tableId.'" class="table">';
         $table_html_string.='<thead>';
         //$table_html_string.='<tr>';
 
diff --git a/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php b/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
index c3b6471..96ef5ac 100644
--- a/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
+++ b/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php
@@ -17,7 +17,7 @@ public function singleTitle()
     public function titleWithButtons($title, array $buttons = array(),array $leftButtons = array())
     {
         $html = $this->openTags();
-        $html .= '<li role="presentation" class="active"><a class="oe-bold-black fa-lg ">' . xlt($title) . '</a></li>';
+        $html .= '<li role="presentation" class="active"><p style="margin-top: 18px;" class="oe-bold-black fa-lg ">' . xlt($title) . '</p></li>';
         if (!empty($buttons)) {
         $html .= '<li class="center-buttons">';
                 foreach ($buttons as $button) {

From fc85cf4f928cdeddf34b666b49e693e7a8ef673e Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 7 Feb 2021 16:14:21 +0200
Subject: [PATCH 18/37] add acl

---
 modules/ClinikalAPI/acl/acl_setup.php                         | 1 +
 modules/ClinikalAPI/acl/acl_upgrade.php                       | 3 +++
 .../Controller/FormTemplatesManagementController.php          | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/modules/ClinikalAPI/acl/acl_setup.php b/modules/ClinikalAPI/acl/acl_setup.php
index c6978c8..4e44c93 100644
--- a/modules/ClinikalAPI/acl/acl_setup.php
+++ b/modules/ClinikalAPI/acl/acl_setup.php
@@ -15,6 +15,7 @@
 AclExtended::addObjectAcl('client_app', 'Client Application', 'SearchPatient','Search Patient');
 AclExtended::addObjectAcl('client_app', 'Client Application', 'Calendar','Calendar');
 AclExtended::addObjectAcl('client_app', 'Client Application', 'AppointmentDetails','Appointment Details');
+AclExtended::addObjectAcl('client_app', 'Client Application', 'ManageTemplates','Manage Templates');
 
 AclExtended::addObjectSectionAcl('clinikal_api', 'Clinikal API');
 AclExtended::addObjectAcl('clinikal_api', 'Clinikal API', 'general_settings','General settings');
diff --git a/modules/ClinikalAPI/acl/acl_upgrade.php b/modules/ClinikalAPI/acl/acl_upgrade.php
index b8e0ae5..0bbe648 100644
--- a/modules/ClinikalAPI/acl/acl_upgrade.php
+++ b/modules/ClinikalAPI/acl/acl_upgrade.php
@@ -18,5 +18,8 @@
         AclExtended::addObjectSectionAcl('clinikal_api', 'Clinikal API');
         AclExtended::addObjectAcl('clinikal_api', 'Clinikal API', 'general_settings','General settings');
         AclExtended::addObjectAcl('clinikal_api', 'Clinikal API', 'lists','Lists');
+    },
+    '2.0.0' => function() {
+        AclExtended::addObjectAcl('client_app', 'Client Application', 'ManageTemplates','Manage Templates');
     }
 );
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
index 0e2f82a..c279e3b 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
@@ -15,6 +15,7 @@
 use Interop\Container\ContainerInterface;
 use ClinikalAPI\Model\GetTemplatesServiceTable;
 use GenericTools\Model\RegistryTable;
+use OpenEMR\Common\Acl\AclMain;
 
 class FormTemplatesManagementController extends BaseController
 
@@ -31,6 +32,9 @@ public function __construct(ContainerInterface $container)
     {
         parent::__construct($container);
         $this->container = $container;
+        if(!AclMain::aclCheckCore('client_app', 'ManageTemplates')){
+            exit('Access denied');
+        }
     }
 
     public function templatesManagementIndexAction()

From 84741da4f2a0baa2d23dbbb99be082a0299f499d Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 7 Feb 2021 16:22:46 +0200
Subject: [PATCH 19/37] cleanup

---
 modules/ClinikalAPI/Module.php                                | 4 ----
 .../Controller/FormTemplatesManagementController.php          | 3 ---
 modules/ReportTool/sql/install.sql                            | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/modules/ClinikalAPI/Module.php b/modules/ClinikalAPI/Module.php
index cc61337..80f7dd6 100644
--- a/modules/ClinikalAPI/Module.php
+++ b/modules/ClinikalAPI/Module.php
@@ -174,10 +174,6 @@ public function init(ModuleManager $manager)
             //global variable of language direction
             $controller->layout()->setVariable('language_direction', $_SESSION['language_direction']);
 
-            // autoloader for ui-components from clinikal folder.
-            /*spl_autoload_register(function ($class) {
-                require_once $GLOBALS['fileroot'].'/clinikal/ui-components/' . str_replace("\\", '/', $class) . '.php';
-            });*/
         }, 100);
     }
 
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
index c279e3b..d5c1702 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/FormTemplatesManagementController.php
@@ -40,9 +40,6 @@ public function __construct(ContainerInterface $container)
     public function templatesManagementIndexAction()
     {
 
-//        if (!acl_check('modules', 'warnings_and_contraindications_management', '', 'write')) {
-//            $this->redirect()->toRoute('errors', array('action' => 'access-denied'));
-//        }
         $this->loadClientSideForms();
         $this->loadServiceTypes();
         $this->loadtemplates();
diff --git a/modules/ReportTool/sql/install.sql b/modules/ReportTool/sql/install.sql
index aeca588..d38c3ad 100644
--- a/modules/ReportTool/sql/install.sql
+++ b/modules/ReportTool/sql/install.sql
@@ -34,7 +34,7 @@ BEGIN
 
    DECLARE v_title varchar(255);
 
-    select ifnull(d.definition,v_title)
+    select d.definition
     INTO v_title
 	from lang_constants c
 	join lang_definitions d on d.cons_id = c.cons_id and lang_id= (select lang_id from lang_languages where lang_code = 'he')

From 5cfd02b824fbb6a4ca182296b051904f1be66020 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 28 Feb 2021 11:37:00 +0200
Subject: [PATCH 20/37] add new queries to commitmrnt questionarie and ix
 report bug

---
 .../sql/1_0_0-to-2_0_0_upgrade.sql            | 25 +++++++++++++++++++
 modules/ClinikalAPI/sql/install.sql           | 14 ++++++++++-
 modules/ReportTool/view/layout/layout.phtml   |  5 ++--
 .../view/report-tool/reports/header.phtml     |  3 ++-
 4 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
index d1f2120..56eb7f9 100644
--- a/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
+++ b/modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -101,3 +101,28 @@ ALTER TABLE `clinikal_templates_map` ADD `update_by` int(11)  NOT NULL;
 #IfMissingColumn clinikal_templates_map update_date
 ALTER TABLE `clinikal_templates_map` ADD `update_date` datetime NOT NULL DEFAULT current_timestamp;
 #EndIf
+
+
+#IfNotRow2D questionnaires_schemas form_name commitment_questionnaire qid 9
+INSERT INTO `questionnaires_schemas` (`qid`, `form_name`,`form_table`, `column_type`, `question`)
+VALUES
+('9', 'commitment_questionnaire','form_commitment_questionnaire', 'string', 'Exemption reason'),
+('10', 'commitment_questionnaire','form_commitment_questionnaire', 'string', 'Comment');
+#EndIf
+
+#IfNotRow2D list_options list_id lists option_id clinikal_no_payment_reason
+INSERT INTO `list_options` (`list_id`, `option_id`, `title`, `seq`, `activity`) VALUES
+('lists', 'clinikal_no_payment_reason', 'Reasons for encounter without payment', 0, 1),
+('clinikal_no_payment_reason', 'personal', 'Personal', 20, 1),
+('clinikal_no_payment_reason', 'followup_encounter', 'Follow up encounter', 30, 1);
+#EndIf
+
+#IfNotRow fhir_value_sets id no_payment_reasons
+INSERT INTO `fhir_value_sets` (`id`, `title`)
+VALUES ('no_payment_reasons', 'Reasons for encounter without payment');
+#EndIf
+
+#IfNotRow2D fhir_value_set_systems vs_id no_payment_reasons system clinikal_no_payment_reason
+INSERT INTO `fhir_value_set_systems` (`vs_id`, `system`, `type`,`filter`)
+VALUES ('no_payment_reasons', 'clinikal_no_payment_reason', 'All', NULL);
+#EndIf
diff --git a/modules/ClinikalAPI/sql/install.sql b/modules/ClinikalAPI/sql/install.sql
index f2a664f..6338a02 100644
--- a/modules/ClinikalAPI/sql/install.sql
+++ b/modules/ClinikalAPI/sql/install.sql
@@ -137,7 +137,9 @@ VALUES
 ('5', 'commitment_questionnaire','form_commitment_questionnaire', 'integer', 'doctor license number'),
 ('6', 'commitment_questionnaire','form_commitment_questionnaire', 'string', 'Payment amount'),
 ('7', 'commitment_questionnaire','form_commitment_questionnaire', 'string', 'Payment method'),
-('8', 'commitment_questionnaire','form_commitment_questionnaire', 'string', 'Receipt number');
+('8', 'commitment_questionnaire','form_commitment_questionnaire', 'string', 'Receipt number'),
+('9', 'commitment_questionnaire','form_commitment_questionnaire', 'string', 'Exemption reason'),
+('10', 'commitment_questionnaire','form_commitment_questionnaire', 'string', 'Comment');
 
 
 INSERT INTO `fhir_value_sets` (`id`, `title`)
@@ -162,3 +164,13 @@ CREATE TABLE manage_templates_letters(
 INSERT INTO `list_options` (`list_id`, `option_id`, `title`, `seq`, `is_default`, `option_value`, `mapping`, `notes`, `codes`, `toggle_setting_1`, `toggle_setting_2`, `activity`, `subtype`, `edit_options`) VALUES
 ('lists', 'clinikal_form_fields_templates', 'Form fields that use templates', 0, 0, 0, '', '', '', 0, 0, 1, '', 1);
 
+INSERT INTO `list_options` (`list_id`, `option_id`, `title`, `seq`, `activity`) VALUES
+('lists', 'clinikal_no_payment_reason', 'Reasons for encounter without payment', 0, 1),
+('clinikal_no_payment_reason', 'personal', 'Personal', 20, 1),
+('clinikal_no_payment_reason', 'followup_encounter', 'Follow up encounter', 30, 1);
+
+INSERT INTO `fhir_value_sets` (`id`, `title`)
+VALUES ('no_payment_reasons', 'Reasons for encounter without payment');
+
+INSERT INTO `fhir_value_set_systems` (`vs_id`, `system`, `type`,`filter`)
+VALUES ('no_payment_reasons', 'clinikal_no_payment_reason', 'All', NULL);
diff --git a/modules/ReportTool/view/layout/layout.phtml b/modules/ReportTool/view/layout/layout.phtml
index 41b755d..afe4011 100644
--- a/modules/ReportTool/view/layout/layout.phtml
+++ b/modules/ReportTool/view/layout/layout.phtml
@@ -1,15 +1,14 @@
 <?php
 use OpenEMR\Core\Header;
 /*require_once $GLOBALS['fileroot'].'/clinikal/ui-components/ValidateJS/ValidateJsFunctions.php';*/
-require_once $GLOBALS['fileroot'].'/vendor/clinikal/clinikal-backend/modules/GenericTools/src/GenericTools/Library/UiComponents/DataTableExtended/DataTableExtended.php';
-?>
+use GenericTools\Library\UiComponents\DataTableExtended\DataTableExtended;?>
 <!-- Layout -->
 <html>
 <head>
 
    <?php Header::setupHeader(['jquery','bootstrap','datetime-picker','main-theme', 'fontawesome', 'select2', 'sumoselect','moment','tooltipster']); ?>
     <script><?php require($GLOBALS['srcdir'] . '/formatting_DateToYYYYMMDD_js.js.php'); ?></script>
-    <?php  $table_handler= new DataTableExtended\DataTableExtended($table_id,$table_col_names);?>
+    <?php  $table_handler= new DataTableExtended($table_id,$table_col_names);?>
     <?php  $table_handler->LoadEssentialCssJs();?>
     <title><?php echo xlt($this->title) ?></title>
 
diff --git a/modules/ReportTool/view/report-tool/reports/header.phtml b/modules/ReportTool/view/report-tool/reports/header.phtml
index 34b6d72..865b0f2 100644
--- a/modules/ReportTool/view/report-tool/reports/header.phtml
+++ b/modules/ReportTool/view/report-tool/reports/header.phtml
@@ -1,5 +1,6 @@
 <?php
-require_once $GLOBALS['fileroot'].'/vendor/clinikal/clinikal-backend/modules/GenericTools/src/GenericTools/Library/UiComponents/Header/ClinikalHeaders.php';
+
+use GenericTools\Library\UiComponents\Header\ClinikalHeaders;
 $headers = new ClinikalHeaders();
 echo $headers->titleWithButtons($title);
 ?>

From 9133a0b300cd0b30b6f169356774ac1e5001a74f Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Wed, 3 Mar 2021 21:52:30 +0200
Subject: [PATCH 21/37] add language parameter to valueset

---
 modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql              | 4 ++++
 modules/FhirAPI/sql/install.sql                             | 1 +
 .../StrategyElement/ValueSet/FhirValueSetMapping.php        | 4 ++++
 .../GenericTools/src/GenericTools/Model/ValueSetsTable.php  | 6 ++++--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
index 4790d2b..129ff69 100644
--- a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
+++ b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -106,3 +106,7 @@ REPLACE INTO `list_options` (`list_id`, `option_id`, `title`, `seq`,`mapping` ,`
 ('loinc_org', '9303-9', 'Respiratory rate --resting', 130,'respiration','{"label": "Breaths per minute","mask": "__"}', 1,'BPM'),
 ('loinc_org', '72514-3', 'Pain severity - 0-10 verbal numeric rating [Score] - Reported', 140,'pain_severity','{"label": "Pain level","mask": "__"}', 1,''),
 ('loinc_org', '74774-1', 'Glucose [Mass/volume] in Serum, Plasma or Blood', 150,'glucose','{"label": "Blood sugar","mask": "___"}', 1,'mg/dL');
+
+#IfMissingColumn fhir_value_sets language
+ALTER TABLE fhir_value_sets ADD `language` VARCHAR(3) NOT NULL DEFAULT 'en';
+#EndIf
diff --git a/modules/FhirAPI/sql/install.sql b/modules/FhirAPI/sql/install.sql
index de3b81a..442721f 100644
--- a/modules/FhirAPI/sql/install.sql
+++ b/modules/FhirAPI/sql/install.sql
@@ -69,6 +69,7 @@ CREATE TABLE `fhir_value_sets` (
     `id` VARCHAR(125) NOT NULL,
     `title` VARCHAR(125) NOT NULL,
     `status` ENUM('active', 'retired') NOT NULL DEFAULT 'active',
+    `language` VARCHAR(3) NOT NULL DEFAULT 'en',
     PRIMARY KEY(`id`)
 ) ENGINE=INNODB DEFAULT CHARSET=UTF8;
 
diff --git a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/ValueSet/FhirValueSetMapping.php b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/ValueSet/FhirValueSetMapping.php
index 41e0968..2787b85 100644
--- a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/ValueSet/FhirValueSetMapping.php
+++ b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/ValueSet/FhirValueSetMapping.php
@@ -33,6 +33,7 @@ public function DBToFhir(...$params){
         $FHIRValueSet->getId()->setValue($data[0]['vs_id']);
         $FHIRValueSet->getTitle()->setValue($data[0]['vs_title']);
         $FHIRValueSet->getStatus()->setValue($data[0]['vs_status']);
+        $FHIRValueSet->getLanguage()->setValue($data[0]['vs_lang']);
 
         $operations = $params[1];
 
@@ -80,6 +81,9 @@ public function initFhirObject()
         $FHIRString= $this->createFHIRString(null);
         $FHIRValueSet->setTitle($FHIRString);
 
+        $FHIRCode = $this->createFHIRCode(null);
+        $FHIRValueSet->setLanguage($FHIRCode);
+
         $FHIRPublicationStatus=$this->createFHIRPublicationStatus(null);
         $FHIRValueSet->setStatus($FHIRPublicationStatus);
 
diff --git a/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php b/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
index 8f3cb2b..5581065 100644
--- a/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
+++ b/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
@@ -24,10 +24,11 @@ public function getValueSetById($id,$where = array())
 
         $type = $this->getValueSetType($id);
         if ($type !== 'Codes') {
-            $sql = "SELECT  
+            $sql = "SELECT
                     fvs.id AS vs_id,
                     fvs.title AS vs_title,
                     fvs.status AS vs_status,
+                    fvs.language AS vs_lang,
                     fvss.system AS system,
                     lo.option_id AS code,
                     lo.title AS display
@@ -54,10 +55,11 @@ public function getValueSetById($id,$where = array())
                 WHERE
                     fvs.id = ? ";
         } else {
-            $sql = "SELECT 
+            $sql = "SELECT
                     fvs.id AS vs_id,
                     fvs.title AS vs_title,
                     fvs.status AS vs_status,
+                    fvs.language AS vs_lang,
                     fvss.system AS system,
                     co.code AS code,
                     co.code_text AS display

From adba0da5c39f75cc88456711925c25103bc36d9d Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Wed, 3 Mar 2021 22:39:24 +0200
Subject: [PATCH 22/37] add forms settings

---
 modules/ClinikalAPI/src/ClinikalAPI/Service/Settings.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Service/Settings.php b/modules/ClinikalAPI/src/ClinikalAPI/Service/Settings.php
index c1cf1d9..2896193 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Service/Settings.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Service/Settings.php
@@ -58,8 +58,15 @@ public function getGlobalsSettings($uname)
                     "clinikal_pa_arrival_way" =>$GLOBALS['clinikal_pa_arrival_way'],
                     "clinikal_pa_next_enc_status" =>$GLOBALS['clinikal_pa_next_enc_status'],
                 ),
+                "forms" => array(
                 )
+            )
         );
+        foreach ($GLOBALS as $key => $value) {
+            if (substr( $key, 0, 14 ) === "clinikal_forms") {
+                $settings['clinikal']['forms'][$key] = $value;
+            }
+        }
 
         return RestControllerHelper::responseHandler($settings, null, 200);
     }

From 418b1d05181700df012845bba417f02913566320 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Thu, 11 Mar 2021 16:07:45 +0200
Subject: [PATCH 23/37] add method for valueset

---
 .../GenericTools/src/GenericTools/Model/ValueSets.php  |  2 ++
 .../src/GenericTools/Model/ValueSetsTable.php          | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/modules/GenericTools/src/GenericTools/Model/ValueSets.php b/modules/GenericTools/src/GenericTools/Model/ValueSets.php
index 52198ad..9cfdc78 100644
--- a/modules/GenericTools/src/GenericTools/Model/ValueSets.php
+++ b/modules/GenericTools/src/GenericTools/Model/ValueSets.php
@@ -9,11 +9,13 @@ class ValueSets
     public $id;
     public $title;
     public $active;
+    public $language;
 
     public function exchangeArray($data)
     {
         $this->id = (!empty($data['id'])) ? $data['id'] : null;
         $this->title = (!empty($data['title'])) ? $data['title'] : null;
         $this->active = (!empty($data['active'])) ? $data['active'] : null;
+        $this->language = (!empty($data['language'])) ? $data['language'] : null;
     }
 }
diff --git a/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php b/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
index 5581065..0444b32 100644
--- a/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
+++ b/modules/GenericTools/src/GenericTools/Model/ValueSetsTable.php
@@ -193,4 +193,14 @@ public function getValueSetType($valueSetId)
         }
     }
 
+    public function getValueSetInfo($valueSetId)
+    {
+        $rsArray=array();
+        $rs =$this->tableGateway->select(['id' => $valueSetId]);
+        foreach($rs as $r) {
+            $rsArray[]=get_object_vars($r);
+        }
+        return $rsArray;
+    }
+
 }

From 54780017363cd4cea9a4889f9185759404e8a202 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 21 Mar 2021 11:18:59 +0200
Subject: [PATCH 24/37] cahnges in the indicator settings

---
 .../Controller/PdfBaseController.php          |  8 +++++++-
 .../Service/IndicatorSettingsService.php      | 20 +++++++++++++++++--
 .../FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql    | 20 +++++++++----------
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
index e8b211f..75d45d8 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
@@ -83,7 +83,13 @@ public function getListsOpenEMRInfo($type=null,$pid,$encounter,$outcome)
     {
         if (!is_null($type)) {
             $info = $this->container->get('GenericTools\Model\ListsOpenEmrTable')->getListWithTheType($type,$pid,$encounter,$outcome);
-            return $info;
+            $result = [];
+            foreach ($info as $item) {
+                if(!in_array($item, $result)) {
+                    $result[] = $item;
+                }
+            }
+            return $result;
 
         } else {
             return array();
diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Service/IndicatorSettingsService.php b/modules/ClinikalAPI/src/ClinikalAPI/Service/IndicatorSettingsService.php
index 5c61472..d60c981 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Service/IndicatorSettingsService.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Service/IndicatorSettingsService.php
@@ -40,7 +40,15 @@ public function getIndicatorSettings($indicator)
                     if($val['notes']!=='') {
                         $notes = json_decode($val['notes']);
                         $arrTemp['label'] =  $notes->label;
-                        $arrTemp['mask'] = $notes->mask;
+                        if (isset($notes->mask)) {
+                            $arrTemp['mask'] = $notes->mask;
+                        }
+                        if (isset($notes->placeholder)) {
+                            $arrTemp['placeholder'] = $notes->placeholder;
+                        }
+                        if (isset($notes->symbol)) {
+                            $arrTemp['symbol'] = $notes->symbol;
+                        }
                         $indicators['variant'][$key]=$arrTemp;
                     }else{
                         $arrTemp['label'] = $val['mapping'];
@@ -56,7 +64,15 @@ public function getIndicatorSettings($indicator)
                 if($val['notes']!=='') {
                     $notes = json_decode($val['notes']);
                     $arrTemp['label'] =  $notes->label;
-                    $arrTemp['mask'] = $notes->mask;
+                    if (isset($notes->mask)) {
+                        $arrTemp['mask'] = $notes->mask;
+                    }
+                    if (isset($notes->placeholder)) {
+                        $arrTemp['placeholder'] = $notes->placeholder;
+                    }
+                    if (isset($notes->symbol)) {
+                        $arrTemp['symbol'] = $notes->symbol;
+                    }
                     $indicators['constant'][$key]=$arrTemp;
                 }else{
                     $arrTemp['label'] = $val['mapping'];
diff --git a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
index 129ff69..4bf62eb 100644
--- a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
+++ b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -91,21 +91,21 @@
 --    behavior: can take a long time.
 
 REPLACE INTO `list_options` (`list_id`, `option_id`, `title`, `seq`,`mapping` ,`notes`, `activity`,`subtype`) VALUES
-('loinc_org', '8480-6', 'Systolic blood pressure', 10,'bps','{"mask": "___","label":"Blood pressure"}', 1,'mmHg'),
-('loinc_org', '8462-4', 'Diastolic blood pressure', 20,'bpd','{"mask": "___","label":"Blood pressure"}', 1,'mmHg'),
-('loinc_org', '8308-9', 'Body height --standing', 30,'height','{"label": "Height","mask":"___"}', 1,'cm'),
-('loinc_org', '8335-2', 'Body weight Estimated', 40,'weight','{"label": "Weight","mask":"___._"}', 1,'Kg'),
-('loinc_org', '69000-8','Heart rate --sitting', 50,'pulse','{"label": "Pulse","mask": "___"}', 1,'PRA'),
-('loinc_org', '8310-5', 'Body temperature', 60,'temperature','{"label": "Fever","mask": "__._"}', 1,'C'),
+('loinc_org', '8480-6', 'Systolic blood pressure', 10,'bps','{"placeholder": "___" ,"label":"Blood pressure"}', 1,'mmHg'),
+('loinc_org', '8462-4', 'Diastolic blood pressure', 20,'bpd','{"placeholder": "___","label":"Blood pressure"}', 1,'mmHg'),
+('loinc_org', '8308-9', 'Body height --standing', 30,'height','{"label": "Height","placeholder":"___"}', 1,'cm'),
+('loinc_org', '8335-2', 'Body weight Estimated', 40,'weight','{"label": "Weight","placeholder":"___._"}', 1,'Kg'),
+('loinc_org', '69000-8','Heart rate --sitting', 50,'pulse','{"label": "Pulse","placeholder": "___"}', 1,'PRA'),
+('loinc_org', '8310-5', 'Body temperature', 60,'temperature','{"label": "Fever","placeholder": "__._","mask": "##.#"}', 1,'C'),
 ('loinc_org', '8327-9', 'Body temperature measurement site', 70,'temp_method','', 1,''),
-('loinc_org', '20564-1', 'Oxygen saturation in Blood', 80,'oxygen_saturation','{"label": "Saturation","mask": "___%"}', 1,'%'),
+('loinc_org', '20564-1', 'Oxygen saturation in Blood', 80,'oxygen_saturation','{"label": "Saturation","placeholder": "___", "symbol": "%"}', 1,'%'),
 ('loinc_org', '39156-5', 'Body mass index (BMI) [Ratio]', 90,'BMI','', 1,'kg/m2'),
 ('loinc_org', '59574-4', 'Body mass index (BMI) [Percentile]', 100,'BMI_status','', 1,''),
 ('loinc_org', '8280-0', 'Waist Circumference at umbilicus by Tape measure', 110,'waist_circ','', 1,'cm'),
 ('loinc_org', '8287-5', 'Head Occipital-frontal circumference by Tape measure', 120,'head_circ','', 1,'cm'),
-('loinc_org', '9303-9', 'Respiratory rate --resting', 130,'respiration','{"label": "Breaths per minute","mask": "__"}', 1,'BPM'),
-('loinc_org', '72514-3', 'Pain severity - 0-10 verbal numeric rating [Score] - Reported', 140,'pain_severity','{"label": "Pain level","mask": "__"}', 1,''),
-('loinc_org', '74774-1', 'Glucose [Mass/volume] in Serum, Plasma or Blood', 150,'glucose','{"label": "Blood sugar","mask": "___"}', 1,'mg/dL');
+('loinc_org', '9303-9', 'Respiratory rate --resting', 130,'respiration','{"label": "Breaths per minute","placeholder": "__"}', 1,'BPM'),
+('loinc_org', '72514-3', 'Pain severity - 0-10 verbal numeric rating [Score] - Reported', 140,'pain_severity','{"label": "Pain level","placeholder": "__"}', 1,''),
+('loinc_org', '74774-1', 'Glucose [Mass/volume] in Serum, Plasma or Blood', 150,'glucose','{"label": "Blood sugar","placeholder": "___"}', 1,'mg/dL');
 
 #IfMissingColumn fhir_value_sets language
 ALTER TABLE fhir_value_sets ADD `language` VARCHAR(3) NOT NULL DEFAULT 'en';

From 628a974462f8d440c25ad1f47b7d990a17fa3d4e Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Wed, 7 Apr 2021 09:27:14 +0300
Subject: [PATCH 25/37] enable pain sevirity 0

---
 .../Observation/FhirObservationMapping.php                | 8 ++++----
 modules/FhirAPI/src/FhirAPI/Service/FhirBaseMapping.php   | 2 +-
 .../GenericTools/src/GenericTools/Model/FormVitals.php    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
index 9246536..9cdabc4 100644
--- a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
+++ b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
@@ -190,8 +190,8 @@ public function fhirToDb($FHIRObservation)
                 $dbObservation[$LonicToDbMappig[$lonicCode]]=$codeVal;
             }
 
-            $Quantity=$comp->getValueQuantity()->getValue();
-            $QuantityVal=str_replace('_', '', $Quantity->getValue());
+            $Quantity=$comp->getValueQuantity()->getValue();q
+            $QuantityVal=$Quantity->getValue();
             if(!is_null($QuantityVal)){
                 $lonicCode=$comp->getValueQuantity()->getCode()->getValue();
                 $dbObservation[$LonicToDbMappig[$lonicCode]]=$QuantityVal;
@@ -305,8 +305,8 @@ public function DBToFhir(...$params)
 
             $firstComp=true;
             foreach ($DbToLonicMappig as $dbField => $code){
-                if(is_numeric($observationDataFromDb[$dbField])){
-                    $FHIRElm=$this->createFHIRQuantity(array("code"=>$code,"value"=>$observationDataFromDb[$dbField],"system"=>self::LONIC_SYSTEM));
+                if(is_numeric($observationDataFromDb[$dbField]) ){                 // 0.00 is default empty for several columns in openemr db
+                    $FHIRElm=$this->createFHIRQuantity(array("code"=>$code,"value"=> $observationDataFromDb[$dbField] !== '0.00' ? $observationDataFromDb[$dbField] : null,"system"=>self::LONIC_SYSTEM));
                 }else{
                     $FHIRElm=$this->createFHIRCodeableConcept(array("code"=>$observationDataFromDb[$dbField],"system"=>self::LONIC_SYSTEM."/".$code));
                 }
diff --git a/modules/FhirAPI/src/FhirAPI/Service/FhirBaseMapping.php b/modules/FhirAPI/src/FhirAPI/Service/FhirBaseMapping.php
index f1de1a1..a94574f 100644
--- a/modules/FhirAPI/src/FhirAPI/Service/FhirBaseMapping.php
+++ b/modules/FhirAPI/src/FhirAPI/Service/FhirBaseMapping.php
@@ -1254,7 +1254,7 @@ public function createFHIRDecimal($value)
     {
         $FHIRDecimal = new FHIRDecimal;
 
-        if (empty($value)) {
+        if (!is_numeric($value)) {
             return $FHIRDecimal;
         }
 
diff --git a/modules/GenericTools/src/GenericTools/Model/FormVitals.php b/modules/GenericTools/src/GenericTools/Model/FormVitals.php
index 270ca9e..7557d9c 100644
--- a/modules/GenericTools/src/GenericTools/Model/FormVitals.php
+++ b/modules/GenericTools/src/GenericTools/Model/FormVitals.php
@@ -55,7 +55,7 @@ public function exchangeArray($data)
         $this->head_circ = (!empty($data['head_circ'])) ? $data['head_circ'] : null;
         $this->oxygen_saturation = (!empty($data['oxygen_saturation'])) ? $data['oxygen_saturation'] : null;
         $this->glucose = (!empty($data['glucose'])) ? $data['glucose'] : null;
-        $this->pain_severity = (!empty($data['pain_severity'])) ? $data['pain_severity'] : null;
+        $this->pain_severity = (!is_null($data['pain_severity'])) ? $data['pain_severity'] : null;
         $this->eid = (!empty($data['eid'])) ? $data['eid'] : null;
         $this->category = (!empty($data['category'])) ? $data['category'] : null;
     }

From 60b3077df6286253fe34fd0fddea953a02626ab3 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Wed, 7 Apr 2021 10:18:14 +0300
Subject: [PATCH 26/37] fix

---
 .../StrategyElement/Observation/FhirObservationMapping.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
index 9cdabc4..5f5b3b3 100644
--- a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
+++ b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
@@ -190,7 +190,7 @@ public function fhirToDb($FHIRObservation)
                 $dbObservation[$LonicToDbMappig[$lonicCode]]=$codeVal;
             }
 
-            $Quantity=$comp->getValueQuantity()->getValue();q
+            $Quantity=$comp->getValueQuantity()->getValue();
             $QuantityVal=$Quantity->getValue();
             if(!is_null($QuantityVal)){
                 $lonicCode=$comp->getValueQuantity()->getCode()->getValue();

From 3cb3a54b97560e2e72f6b9ab0632f0199c7ab60c Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Thu, 8 Apr 2021 11:52:51 +0300
Subject: [PATCH 27/37] add trim funtion

---
 .../StrategyElement/Observation/FhirObservationMapping.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
index 5f5b3b3..ae6a9fd 100644
--- a/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
+++ b/modules/FhirAPI/src/FhirAPI/FhirRestApiBuilder/Parts/Strategy/StrategyElement/Observation/FhirObservationMapping.php
@@ -194,7 +194,7 @@ public function fhirToDb($FHIRObservation)
             $QuantityVal=$Quantity->getValue();
             if(!is_null($QuantityVal)){
                 $lonicCode=$comp->getValueQuantity()->getCode()->getValue();
-                $dbObservation[$LonicToDbMappig[$lonicCode]]=$QuantityVal;
+                $dbObservation[$LonicToDbMappig[$lonicCode]]=trim($QuantityVal);
             }
         }
 
@@ -305,8 +305,8 @@ public function DBToFhir(...$params)
 
             $firstComp=true;
             foreach ($DbToLonicMappig as $dbField => $code){
-                if(is_numeric($observationDataFromDb[$dbField]) ){                 // 0.00 is default empty for several columns in openemr db
-                    $FHIRElm=$this->createFHIRQuantity(array("code"=>$code,"value"=> $observationDataFromDb[$dbField] !== '0.00' ? $observationDataFromDb[$dbField] : null,"system"=>self::LONIC_SYSTEM));
+                if(is_numeric(trim($observationDataFromDb[$dbField])) ){                 // 0.00 is default empty for several columns in openemr db
+                    $FHIRElm=$this->createFHIRQuantity(array("code"=>$code,"value"=> $observationDataFromDb[$dbField] !== '0.00' ? trim($observationDataFromDb[$dbField]) : null,"system"=>self::LONIC_SYSTEM));
                 }else{
                     $FHIRElm=$this->createFHIRCodeableConcept(array("code"=>$observationDataFromDb[$dbField],"system"=>self::LONIC_SYSTEM."/".$code));
                 }

From 75ec1fd8136f0e47cb0240a62959d1da654b708b Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Thu, 8 Apr 2021 11:56:04 +0300
Subject: [PATCH 28/37] add mask for blood pressure

---
 modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
index 4bf62eb..df04fd3 100644
--- a/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
+++ b/modules/FhirAPI/sql/1_0_0-to-2_0_0_upgrade.sql
@@ -91,8 +91,8 @@
 --    behavior: can take a long time.
 
 REPLACE INTO `list_options` (`list_id`, `option_id`, `title`, `seq`,`mapping` ,`notes`, `activity`,`subtype`) VALUES
-('loinc_org', '8480-6', 'Systolic blood pressure', 10,'bps','{"placeholder": "___" ,"label":"Blood pressure"}', 1,'mmHg'),
-('loinc_org', '8462-4', 'Diastolic blood pressure', 20,'bpd','{"placeholder": "___","label":"Blood pressure"}', 1,'mmHg'),
+('loinc_org', '8480-6', 'Systolic blood pressure', 10,'bps','{"placeholder": "___" ,"label":"Blood pressure", "mask": "###/###"}', 1,'mmHg'),
+('loinc_org', '8462-4', 'Diastolic blood pressure', 20,'bpd','{"placeholder": "___","label":"Blood pressure", "mask": "###/###"}', 1,'mmHg'),
 ('loinc_org', '8308-9', 'Body height --standing', 30,'height','{"label": "Height","placeholder":"___"}', 1,'cm'),
 ('loinc_org', '8335-2', 'Body weight Estimated', 40,'weight','{"label": "Weight","placeholder":"___._"}', 1,'Kg'),
 ('loinc_org', '69000-8','Heart rate --sitting', 50,'pulse','{"label": "Pulse","placeholder": "___"}', 1,'PRA'),

From 1d919ab0295fe933e0e2153ee8b110e2b92b9208 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sat, 10 Apr 2021 22:04:32 +0300
Subject: [PATCH 29/37] fix indicators in the summery letter

---
 .../src/ClinikalAPI/Controller/PdfBaseController.php     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
index 75d45d8..1a454da 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
@@ -311,12 +311,12 @@ public function getVariantVitals($encounter,$pid,$category,$acitivity,$order)
 
         foreach($vitals as $key=>$value){
             foreach($value['bpd'] as $k=>$v) {
-                if($k==0)
+                if($k!==2)
                 {
                     $vitals[$key]['pressure'][$k] = $vitals[$key]['bpd'][$k];
                 }
                 else {
-                    $vitals[$key]['pressure'][$k] = $vitals[$key]['bps'][$k] . "/" . $vitals[$key]['bpd'][$k];
+                    $vitals[$key]['pressure'][$k] = !is_null($vitals[$key]['bps'][$k] ) ? $vitals[$key]['bps'][$k] . "/" . $vitals[$key]['bpd'][$k] : '-';
                 }
             }
 
@@ -333,10 +333,15 @@ public function getVariantVitals($encounter,$pid,$category,$acitivity,$order)
                         break;
                     case 'temperature':
                         $vitals[$key][$k][2] = $vitals[$key][$k][2] !== '0.00' && $vitals[$key][$k][2] > 0 ? number_format($vitals[$key][$k][2],1) : '-';
+                        break;
                     case 'pulse':
                     case 'respiration':
                     case 'oxygen_saturation':
                         $vitals[$key][$k][2] = $vitals[$key][$k][2] !== '0.00' && $vitals[$key][$k][2] > 0 ? number_format($vitals[$key][$k][2],0) : '-';
+                        break;
+                    case 'pain_severity':
+                        $vitals[$key][$k][2] = is_null($v[2]) ? "-":$v[2];
+                        break;
                     case 'date':
                         $time = explode(":",$vitals[$key][$k][1]);
                         unset($time[2]);

From d50dca6adcd053d3d2bee994e107178ce02f0f73 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Tue, 13 Apr 2021 11:12:22 +0300
Subject: [PATCH 30/37] fixes for english version

---
 .../ClinikalAPI/view/clinikal-api/pdf/default-header.phtml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml b/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
index 5187d92..0385301 100644
--- a/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
@@ -10,7 +10,7 @@ $clinicName
 <header style="font-family: Arial" dir="<?php echo text($langDir); ?>"  lang="<?php echo text($langCode); ?>">
     <table width="100%" style="width=100%;  /*border-bottom: 1px solid #000000;*/ vertical-align: bottom; font-family: Arial,serif; font-size: 9pt; color: black;">
         <tr>
-            <td   style="width=20%; text-align:right;">
+            <td   style="width=20%; text-align:<?php echo $langDir === 'ltr' ? 'left ': 'right' ?>">
                 <table>
                     <tr  lang="<?php echo text($langCode); ?>" style="font-family: Arial,serif; font-size: 9pt;">
                         <td  style="width=40%; text-align:right;"><?php echo xl("Clinic")." :";?></td>
@@ -40,13 +40,13 @@ $clinicName
                         <?php if (isset($type) && $type === 'html'): ?>
                             <img style="padding-right:100px; src="<?php echo $GLOBALS['OE_SITE_WEBROOT'] . '/images/logo_1.png' ?>" width="126px" height="65px"/>
                         <?php else: ?>
-                            <img style="padding-right:100px; vertical-align:middle" src="var:logoHeader"  width="126px" height="65px " />
+                            <img style="<?php echo $langDir === 'ltr' ? 'padding-left:100px;': 'padding-right:100px;' ?> vertical-align:middle" src="var:logoHeader"  width="126px" height="65px " />
                         <?php endif; ?>
                     <?php endif; ?>
                 </div>
             </td>
 
-            <td  style="width=20%; text-align:left;">
+            <td  style="width=20%; text-align:<?php echo $langDir === 'ltr' ? 'right ': 'left' ?>;">
                     <div  style=" font-family: Arial,serif; font-size: 9pt;">
                         <span  style="width=40%; "><?php echo xl("Creation time")." :";?></span>
                         <span  style="width=40%; " dir="ltr"><?php echo $showDate; ?></span>

From 2bfcd53e4bb24adf13cba296e6b0f00518d606ff Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 18 Apr 2021 22:32:27 +0300
Subject: [PATCH 31/37] center logo

---
 .../view/clinikal-api/pdf/default-header.phtml            | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml b/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
index 0385301..940453d 100644
--- a/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
@@ -10,7 +10,7 @@ $clinicName
 <header style="font-family: Arial" dir="<?php echo text($langDir); ?>"  lang="<?php echo text($langCode); ?>">
     <table width="100%" style="width=100%;  /*border-bottom: 1px solid #000000;*/ vertical-align: bottom; font-family: Arial,serif; font-size: 9pt; color: black;">
         <tr>
-            <td   style="width=20%; text-align:<?php echo $langDir === 'ltr' ? 'left ': 'right' ?>">
+            <td   style="width=200px; text-align:<?php echo $langDir === 'ltr' ? 'left ': 'right' ?>">
                 <table>
                     <tr  lang="<?php echo text($langCode); ?>" style="font-family: Arial,serif; font-size: 9pt;">
                         <td  style="width=40%; text-align:right;"><?php echo xl("Clinic")." :";?></td>
@@ -34,19 +34,19 @@ $clinicName
                 </table>
             </td>
 
-            <td  style="width=60%;" >
+            <td  style="width=400px" >
                 <div style="width: 100%; height: 100%">
                     <?php if(is_file($GLOBALS['OE_SITE_DIR'] . '/images/logo_1.png')): ?>
                         <?php if (isset($type) && $type === 'html'): ?>
                             <img style="padding-right:100px; src="<?php echo $GLOBALS['OE_SITE_WEBROOT'] . '/images/logo_1.png' ?>" width="126px" height="65px"/>
                         <?php else: ?>
-                            <img style="<?php echo $langDir === 'ltr' ? 'padding-left:100px;': 'padding-right:100px;' ?> vertical-align:middle" src="var:logoHeader"  width="126px" height="65px " />
+                            <img style="<?php echo $langDir === 'ltr' ? 'padding-left:125px;': 'padding-right:110px;' ?> vertical-align:middle" src="var:logoHeader"  width="126px" height="65px " />
                         <?php endif; ?>
                     <?php endif; ?>
                 </div>
             </td>
 
-            <td  style="width=20%; text-align:<?php echo $langDir === 'ltr' ? 'right ': 'left' ?>;">
+            <td  style="width=200px text-align:<?php echo $langDir === 'ltr' ? 'right ': 'left' ?>;">
                     <div  style=" font-family: Arial,serif; font-size: 9pt;">
                         <span  style="width=40%; "><?php echo xl("Creation time")." :";?></span>
                         <span  style="width=40%; " dir="ltr"><?php echo $showDate; ?></span>

From 736d73dd541fa923229e786e4f3a4cf13975b066 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Tue, 20 Apr 2021 10:06:10 +0300
Subject: [PATCH 32/37] fix center logo

---
 .../view/clinikal-api/pdf/default-header.phtml       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml b/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
index 940453d..a7a2a74 100644
--- a/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/pdf/default-header.phtml
@@ -10,7 +10,7 @@ $clinicName
 <header style="font-family: Arial" dir="<?php echo text($langDir); ?>"  lang="<?php echo text($langCode); ?>">
     <table width="100%" style="width=100%;  /*border-bottom: 1px solid #000000;*/ vertical-align: bottom; font-family: Arial,serif; font-size: 9pt; color: black;">
         <tr>
-            <td   style="width=200px; text-align:<?php echo $langDir === 'ltr' ? 'left ': 'right' ?>">
+            <td  width="30%" align="<?php echo $langDir === 'ltr' ? 'left ': 'right' ?>">
                 <table>
                     <tr  lang="<?php echo text($langCode); ?>" style="font-family: Arial,serif; font-size: 9pt;">
                         <td  style="width=40%; text-align:right;"><?php echo xl("Clinic")." :";?></td>
@@ -34,19 +34,19 @@ $clinicName
                 </table>
             </td>
 
-            <td  style="width=400px" >
-                <div style="width: 100%; height: 100%">
+            <td  width="40%"  align="center" >
+
                     <?php if(is_file($GLOBALS['OE_SITE_DIR'] . '/images/logo_1.png')): ?>
                         <?php if (isset($type) && $type === 'html'): ?>
                             <img style="padding-right:100px; src="<?php echo $GLOBALS['OE_SITE_WEBROOT'] . '/images/logo_1.png' ?>" width="126px" height="65px"/>
                         <?php else: ?>
-                            <img style="<?php echo $langDir === 'ltr' ? 'padding-left:125px;': 'padding-right:110px;' ?> vertical-align:middle" src="var:logoHeader"  width="126px" height="65px " />
+                            <img  src="var:logoHeader"  width="126px" height="65px " />
                         <?php endif; ?>
                     <?php endif; ?>
-                </div>
+
             </td>
 
-            <td  style="width=200px text-align:<?php echo $langDir === 'ltr' ? 'right ': 'left' ?>;">
+            <td  width="30%" align=":<?php echo $langDir === 'ltr' ? 'right ': 'left' ?>;">
                     <div  style=" font-family: Arial,serif; font-size: 9pt;">
                         <span  style="width=40%; "><?php echo xl("Creation time")." :";?></span>
                         <span  style="width=40%; " dir="ltr"><?php echo $showDate; ?></span>

From e69815da2275ab4485daae7730a757d87f3e71aa Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Sun, 2 May 2021 23:26:48 +0300
Subject: [PATCH 33/37] increase letter font

---
 .../ClinikalAPI/view/clinikal-api/pdf/doctor-signature.phtml  | 2 +-
 .../ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/ClinikalAPI/view/clinikal-api/pdf/doctor-signature.phtml b/modules/ClinikalAPI/view/clinikal-api/pdf/doctor-signature.phtml
index c3e461a..a5b07c4 100644
--- a/modules/ClinikalAPI/view/clinikal-api/pdf/doctor-signature.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/pdf/doctor-signature.phtml
@@ -5,7 +5,7 @@ width: 52px;
 height: 18px;
 opacity: 0.6;
 font-family: OpenSansHebrew;
-font-size: 12px;
+font-size: 14px;
 font-weight: normal;
 font-stretch: normal;
 font-style: normal;
diff --git a/modules/ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml b/modules/ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml
index 0717a8c..0a323ae 100644
--- a/modules/ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml
@@ -12,7 +12,7 @@
         height: 18px;
         opacity: 0.6;
         font-family: OpenSansHebrew;
-        font-size: 10px;
+        font-size: 13px;
         font-weight: normal;
         font-stretch: normal;
         font-style: normal;
@@ -25,7 +25,7 @@
         width: 104px;
         height: 18px;
         font-family: OpenSansHebrew;
-        font-size: 12px;
+        font-size: 15px;
         font-weight: normal;
         font-stretch: normal;
         font-style: normal;

From 82a074e8dd05e737474de154c178f01da724851b Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@matrix.co.il>
Date: Thu, 6 May 2021 16:56:50 +0300
Subject: [PATCH 34/37] add patien address to letters

---
 .../Controller/PdfBaseController.php          | 24 +++++++++++++++++++
 .../clinikal-api/pdf/patient-details.phtml    |  5 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
index 1a454da..525b4e7 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
@@ -29,6 +29,8 @@ class PdfBaseController extends GenericBaseController
     const FOOTER_PATH = 'clinikal-api/pdf/default-footer';
     const DOC_TYPE = "file_url";
     const PDF_MINE_TYPE = "application/pdf";
+    const CITIES_LIST = 'mh_cities';
+    const STREETS_LIST = 'mh_streets';
 
     private $container;
     public $postData = array();
@@ -72,6 +74,7 @@ public function getPatientInfo($id = null)
             $data['age'] = $info['age'];
             $data['phone'] = ($info['phone_cell'] ? $info['phone_cell']  : ($info['phone_home'] ? $info['phone_home'] : ($info['phone_contact'] ? $info['phone_contact'] :""))) ;
             $data['HMO'] = $info['insurance_organiz_name'];
+            $data['address'] = $this->patientAddress($info);
             return $data;
 
         } else {
@@ -79,6 +82,21 @@ public function getPatientInfo($id = null)
         }
     }
 
+    public function patientAddress($patientInfo)
+    {
+        $city = !empty($patientInfo['city']) ? xlt($this->container->get(ListsTable::class)->getSpecificTitle(self::CITIES_LIST, $patientInfo['city'])) : '';
+        $street = !empty($patientInfo['street']) ? xlt($this->container->get(ListsTable::class)->getSpecificTitle(self::STREETS_LIST, $patientInfo['street'])) : '';
+        $numberHouse = !empty($patientInfo['mh_house_no']) ? $patientInfo['mh_house_no'] : '';
+
+        $address = '';
+        if ($street !== '') {
+          $address .= $street . ' ' . $numberHouse . ' ';
+        }
+        $address .= $city;
+
+        return $address;
+    }
+
     public function getListsOpenEMRInfo($type=null,$pid,$encounter,$outcome)
     {
         if (!is_null($type)) {
@@ -96,6 +114,12 @@ public function getListsOpenEMRInfo($type=null,$pid,$encounter,$outcome)
         }
     }
 
+    public function getEncounterStartDate($encId)
+    {
+        $info = $this->container->get(FormEncounterTable::class)->fetchById($encId);
+        return $info['date'];
+    }
+
     public function getUserInfo($id = null)
     {
         if (!is_null($id)) {
diff --git a/modules/ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml b/modules/ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml
index 0a323ae..6466302 100644
--- a/modules/ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml
+++ b/modules/ClinikalAPI/view/clinikal-api/pdf/patient-details.phtml
@@ -34,6 +34,7 @@
         text-align: right;
         color: #000b40;
     }
+
 </style>
     <table class="Rectangle" dir="<?php echo text($langDir); ?>"  lang="<?php echo text($langCode); ?>">
         <tbody>
@@ -69,8 +70,8 @@
                 <p class="Input-text"><?php echo($HMO);?></p>
             </td>
             <td>
-                <p class="Label-Text"></p>
-                <p class="Input-text"></p>
+                <p class="Label-Text"><?php echo(xlt("Address"));?></p>
+                <p class="Input-text"><?php echo text($address);?></p>
             </td>
         </tr>
         </tbody>

From 080a5fe50a7e4fa3bd91b9828647e19a4e66bf07 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@marix.co.il>
Date: Wed, 26 May 2021 17:52:51 +0300
Subject: [PATCH 35/37] show po box in the summary letter

---
 .../src/ClinikalAPI/Controller/PdfBaseController.php        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
index 525b4e7..fa1eb93 100644
--- a/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
+++ b/modules/ClinikalAPI/src/ClinikalAPI/Controller/PdfBaseController.php
@@ -87,10 +87,14 @@ public function patientAddress($patientInfo)
         $city = !empty($patientInfo['city']) ? xlt($this->container->get(ListsTable::class)->getSpecificTitle(self::CITIES_LIST, $patientInfo['city'])) : '';
         $street = !empty($patientInfo['street']) ? xlt($this->container->get(ListsTable::class)->getSpecificTitle(self::STREETS_LIST, $patientInfo['street'])) : '';
         $numberHouse = !empty($patientInfo['mh_house_no']) ? $patientInfo['mh_house_no'] : '';
+        $pobox = !empty($patientInfo['mh_pobox']) ? $patientInfo['mh_pobox'] : '';
 
         $address = '';
         if ($street !== '') {
-          $address .= $street . ' ' . $numberHouse . ' ';
+          $address .= $street . ' ' . $numberHouse . ', ';
+        }
+        if ($pobox !== '') {
+            $address .= xlt('PO Box') . ' ' . $pobox .', ';
         }
         $address .= $city;
 

From 9f5aa1df05de17cbe58819dd51135c5926a2d924 Mon Sep 17 00:00:00 2001
From: "Amiel Elboim (Matrix)" <amielel@matrix.co.il>
Date: Thu, 3 Jun 2021 09:08:15 +0300
Subject: [PATCH 36/37] Update README.md

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 7400e6d..26bb5bb 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,4 @@ Main contents:
 ### License
 Please see the [license agreement](https://github.com/israeli-moh/clinikal-react/blob/develop/LICENSE).
 
-### Acknowledgement
-The Clinikal team would like to thank Israeli Ministry Of Health that sponsored this project.
 

From a7eb8cfb04f4c4a0913944e9fde96fbb51cda7c6 Mon Sep 17 00:00:00 2001
From: Amiel Elboim <amielel@marix.co.il>
Date: Mon, 28 Jun 2021 15:21:54 +0300
Subject: [PATCH 37/37] change reposiory in the composer file

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d9b4f87..2ec3398 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
   "repositories": [
     {
       "type": "vcs",
-      "url": "git@github.com:israeli-moh/composer-installers-clinikal-extender.git"
+      "url": "git@github.com:MohGovIL/Clinical-composer-installers.git"
     }
   ],
   "require": {