update master

README.md

@@ -1,41 +1,34 @@
-# 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.
+## 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 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
+* 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).
+
+

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": {

modules/ClinikalAPI/Module.php

@@ -157,6 +157,24 @@ 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']);
+
+        }, 100);
+    }
 
 }

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');

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');
     }
 );

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',
+        )
     ),
+
 );

modules/ClinikalAPI/sql/1_0_0-to-2_0_0_upgrade.sql

@@ -0,0 +1,128 @@
+--
+--  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.
+
+#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
+
+
+#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

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,
@@ -131,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`)
@@ -150,3 +158,19 @@ 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);
+
+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);