From da08a6cd384911239aa2819e65ac1ac6f1bedc9f Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Tue, 20 Jun 2017 09:07:48 +0545
Subject: [PATCH 01/24] PCHR-2319: Pass modalMode to Document Modal resolve
 option

---
 civihr_employee_portal/js/ta-documents-app.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index d20ec287..478505f4 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -57,6 +57,9 @@
             templateUrl: config.path.TPL + 'modal/document.html?v=3',
             controller: 'ModalDocumentCtrl',
             resolve: {
+              modalMode: function () {
+                return '';
+              },
               role: function () {
                 return role;
               },

From c4c47b839cbd050ea81cd39188e16a904982ff51 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Tue, 13 Jun 2017 22:04:45 +0545
Subject: [PATCH 02/24] PCHR-2317: Attatch document modal to the root of
 angular app

---
 civihr_employee_portal/js/ta-documents-app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index 478505f4..4c878d95 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -53,7 +53,7 @@
          */
         function openModalDocument(data, role) {
           var modalInstance = $modal.open({
-            appendTo: $rootElement.find('div').eq(0),
+            appendTo: $rootElement,
             templateUrl: config.path.TPL + 'modal/document.html?v=3',
             controller: 'ModalDocumentCtrl',
             resolve: {

From f19405f18123cc2a70605a677402d4bec1f264f7 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Fri, 16 Jun 2017 18:19:42 +0545
Subject: [PATCH 03/24] PCHR-2317: Load contacts and cache them before opening
 modal + display spinner

---
 civihr_employee_portal/js/ta-documents-app.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index 4c878d95..a183239d 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -1,11 +1,14 @@
 /* globals angular */
 
 (function(angular) {
-  angular.module('taDocuments', ['civitasks.appDocuments'])
+  angular.module('taDocuments', ['civitasks.appDocuments', 'civitasks.directives'])
     .controller('ModalController', ['$scope', '$rootScope', '$window', '$rootElement', '$log', '$uibModal',
       'DocumentService', 'FileService', 'config', 'settings',
       function($scope, $rootScope, $window, $rootElement, $log, $modal, DocumentService, FileService, config, settings) {
         var vm = {};
+        var isContactsCached = {};
+
+        vm.showOpenBtn = true;
 
         /**
          * Gets Document for the given document id and
@@ -21,6 +24,9 @@
                 throw new Error('Requested Document is not available');
               }
 
+              $rootScope.$broadcast('ct-spinner-show');
+              vm.showOpenBtn = false;
+
               openModalDocument(data[0], role);
             })
             .catch(function(reason) {
@@ -33,15 +39,13 @@
           $rootScope.$on('document-saved', function () {
             $window.location.reload();
           });
-
           // Get list of documents
           DocumentService.get({
             'status_id': {
               'NOT IN': config.status.resolve.DOCUMENT
             }
           }).then(function (documents) {
-            // Getting and caching only the contacts
-            DocumentService.cacheContactsAndAssignments(documents, 'contacts');
+            isContactsCached = DocumentService.cacheContactsAndAssignments(documents, 'contacts');
           });
         })();
 
@@ -66,6 +70,7 @@
               data: function () {
                 return data;
               },
+              isCachedContacts: isContactsCached,
               files: function () {
                 if (!data.id || !+data.file_count) {
                   return [];
@@ -75,6 +80,11 @@
               }
             }
           });
+
+          modalInstance.opened.then(function () {
+            $rootScope.$broadcast('ct-spinner-hide');
+            vm.showOpenBtn = true;
+          });
         };
 
         return vm;

From acd069a244fd41d9eee7b1ec67c1b341d86ba36a Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Fri, 16 Jun 2017 18:20:39 +0545
Subject: [PATCH 04/24] PCHR-2317: Add ct-spinner + hide button as appropriate

---
 .../templates/views-view-table--Documents--block-1.tpl.php   | 3 ++-
 .../templates/views-view-table--Documents--block.tpl.php     | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
index 4552ab12..8d0fca24 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
@@ -94,8 +94,9 @@
                 <?php print strip_tags(html_entity_decode($content)); ?>
               </td>
             <?php endforeach; ?>
-            <td>
+            <td ct-spinner>
               <button
+              ng-show='document.showOpenBtn'
               ng-click="document.modalDocument(<?php print strip_tags($row['id']); ?>, 'manager')"
               class="btn btn-sm btn-default">
                 <i class="fa fa-upload"></i> Open
diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
index e5e8b6c1..3c528791 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
@@ -95,18 +95,21 @@
                   continue;
                 endif;
                 ?>
+
                 <?php print $content; ?>
                 </td>
                 <?php endforeach; ?>
-              <td>
+              <td ct-spinner>
                 <?php if (strip_tags($row['status_id']) == 3): ?>
                   <button
+                    ng-show='document.showOpenBtn'
                     class="btn btn-sm btn-default ctools-use-modal ctools-modal-civihr-default-style ctools-use-modal-processed"
                     disabled="disabled">
                     <i class="fa fa-upload"></i> Open
                   </button>
                 <?php else: ?>
                   <button
+                    ng-show='document.showOpenBtn'
                     ng-click="document.modalDocument(<?php print strip_tags($row['id']); ?> , 'staff')"
                     class="btn btn-sm btn-default">
                     <i class="fa fa-upload"></i> Open

From ab35ecc009d0204f9efc81df2b1a04ee1d984bd7 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Fri, 16 Jun 2017 18:58:27 +0545
Subject: [PATCH 05/24] PCHR-2317: Implements PR review feedbacks

---
 civihr_employee_portal/js/ta-documents-app.js             | 8 ++++----
 .../views-view-table--Documents--block-1.tpl.php          | 2 +-
 .../templates/views-view-table--Documents--block.tpl.php  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index a183239d..c93e5c99 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -8,7 +8,7 @@
         var vm = {};
         var isContactsCached = {};
 
-        vm.showOpenBtn = true;
+        vm.loadingModalData = false;
 
         /**
          * Gets Document for the given document id and
@@ -25,7 +25,7 @@
               }
 
               $rootScope.$broadcast('ct-spinner-show');
-              vm.showOpenBtn = false;
+              vm.loadingModalData = true;
 
               openModalDocument(data[0], role);
             })
@@ -70,7 +70,7 @@
               data: function () {
                 return data;
               },
-              isCachedContacts: isContactsCached,
+              isContactsCached: isContactsCached,
               files: function () {
                 if (!data.id || !+data.file_count) {
                   return [];
@@ -83,7 +83,7 @@
 
           modalInstance.opened.then(function () {
             $rootScope.$broadcast('ct-spinner-hide');
-            vm.showOpenBtn = true;
+            vm.loadingModalData = false;
           });
         };
 
diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
index 8d0fca24..27fecc5a 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
@@ -96,7 +96,7 @@
             <?php endforeach; ?>
             <td ct-spinner>
               <button
-              ng-show='document.showOpenBtn'
+              ng-show='!document.loadingModalData'
               ng-click="document.modalDocument(<?php print strip_tags($row['id']); ?>, 'manager')"
               class="btn btn-sm btn-default">
                 <i class="fa fa-upload"></i> Open
diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
index 3c528791..2fdd100b 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
@@ -102,14 +102,14 @@
               <td ct-spinner>
                 <?php if (strip_tags($row['status_id']) == 3): ?>
                   <button
-                    ng-show='document.showOpenBtn'
+                    ng-show='!document.loadingModalData'
                     class="btn btn-sm btn-default ctools-use-modal ctools-modal-civihr-default-style ctools-use-modal-processed"
                     disabled="disabled">
                     <i class="fa fa-upload"></i> Open
                   </button>
                 <?php else: ?>
                   <button
-                    ng-show='document.showOpenBtn'
+                    ng-show='!document.loadingModalData'
                     ng-click="document.modalDocument(<?php print strip_tags($row['id']); ?> , 'staff')"
                     class="btn btn-sm btn-default">
                     <i class="fa fa-upload"></i> Open

From f60199bba08397c57aa326c3179d4be58f61cb94 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Tue, 20 Jun 2017 09:20:39 +0545
Subject: [PATCH 06/24] PCHR-2317: Do not restrict documents with approved and
 rejected status

---
 civihr_employee_portal/js/ta-documents-app.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index c93e5c99..5b3b785f 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -40,11 +40,7 @@
             $window.location.reload();
           });
           // Get list of documents
-          DocumentService.get({
-            'status_id': {
-              'NOT IN': config.status.resolve.DOCUMENT
-            }
-          }).then(function (documents) {
+          DocumentService.get().then(function (documents) {
             isContactsCached = DocumentService.cacheContactsAndAssignments(documents, 'contacts');
           });
         })();

From cc493df89f27b275f9925f331a50152aef295f98 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Wed, 21 Jun 2017 19:29:23 +0545
Subject: [PATCH 07/24] PCHR-2318: Add code to remove # form url in ssp

---
 civihr_employee_portal/js/ta-documents-app.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index 5b3b785f..d46d3424 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -2,6 +2,10 @@
 
 (function(angular) {
   angular.module('taDocuments', ['civitasks.appDocuments', 'civitasks.directives'])
+    .config(function ($urlRouterProvider, $locationProvider) {
+      $locationProvider.html5Mode(true); // This is required to remove # for the URL
+      $urlRouterProvider.otherwise('/dashboard');
+    })
     .controller('ModalController', ['$scope', '$rootScope', '$window', '$rootElement', '$log', '$uibModal',
       'DocumentService', 'FileService', 'config', 'settings',
       function($scope, $rootScope, $window, $rootElement, $log, $modal, DocumentService, FileService, config, settings) {

From 690f063a118d62957a5ba9f3361ed1cc53d24eda Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Wed, 21 Jun 2017 19:30:25 +0545
Subject: [PATCH 08/24] PCHR-2318: Add base element in html markup to remove #
 form url

---
 .../views/templates/views-view-table--Documents--block.tpl.php   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
index 2fdd100b..9b056d75 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
@@ -34,6 +34,7 @@
   $statusesCount[0] ++;
 endforeach;
 ?>
+<base href="/"> <!-- This is required to remove # for the URL-->
 <div data-ta-documents ng-controller="ModalController as document" class="chr_table-w-filters chr_table-w-filters--documents row">
   <div class="chr_table-w-filters__filters col-md-3">
     <div class="chr_table-w-filters__filters__dropdown-wrapper">

From 7f1b3d142c731198943e4c285db02ee3ad2e0150 Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Mon, 26 Jun 2017 11:28:34 +0000
Subject: [PATCH 09/24] PCHR-2129: Remove Unneeded Commas From Roles in Staff
 Directory

When a contact had an inactive role and one or more active ones, inactive
roles were being removed from the result set with a hook that altered the
value for the role name, by setting it to null. If the inactive role was the
first role in the result set, this caused the directory to render the list of
roles with a comma inserted before the actual list of roles (eg. ", Role 1,
Role 2, ...").

Fixed by adding filters to the view, to check for roles with start date in the
past or null, and end date in the future or null.
---
 .../views_export/views_hr_staff_directory.inc | 46 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/civihr_employee_portal/views/views_export/views_hr_staff_directory.inc b/civihr_employee_portal/views/views_export/views_hr_staff_directory.inc
index 6c7562f0..cab0bd6b 100755
--- a/civihr_employee_portal/views/views_export/views_hr_staff_directory.inc
+++ b/civihr_employee_portal/views/views_export/views_hr_staff_directory.inc
@@ -395,6 +395,11 @@ $handler->display->display_options['fields']['display_name_2']['link_to_civicrm_
 $handler->display->display_options['sorts']['id']['id'] = 'id';
 $handler->display->display_options['sorts']['id']['table'] = 'civicrm_contact';
 $handler->display->display_options['sorts']['id']['field'] = 'id';
+$handler->display->display_options['filter_groups']['groups'] = array(
+  1 => 'AND',
+  2 => 'OR',
+  3 => 'OR',
+);
 /* Filter criterion: CiviCRM Contacts: Contact Type */
 $handler->display->display_options['filters']['contact_type']['id'] = 'contact_type';
 $handler->display->display_options['filters']['contact_type']['table'] = 'civicrm_contact';
@@ -576,6 +581,44 @@ $handler->display->display_options['filters']['is_deleted']['table'] = 'civicrm_
 $handler->display->display_options['filters']['is_deleted']['field'] = 'is_deleted';
 $handler->display->display_options['filters']['is_deleted']['value'] = '0';
 $handler->display->display_options['filters']['is_deleted']['group'] = 1;
+/* Filter criterion: CiviCRM Custom: Immigration: Start Date */
+$handler->display->display_options['filters']['start_date_52']['id'] = 'start_date_52';
+$handler->display->display_options['filters']['start_date_52']['table'] = 'civicrm_value_immigration_3';
+$handler->display->display_options['filters']['start_date_52']['field'] = 'start_date_52';
+$handler->display->display_options['filters']['start_date_52']['operator'] = 'empty';
+$handler->display->display_options['filters']['start_date_52']['group'] = 1;
+/* Filter criterion: HRJobContract Role entity: Role end date */
+$handler->display->display_options['filters']['role_end_date']['id'] = 'role_end_date';
+$handler->display->display_options['filters']['role_end_date']['table'] = 'hrjc_role';
+$handler->display->display_options['filters']['role_end_date']['field'] = 'role_end_date';
+$handler->display->display_options['filters']['role_end_date']['relationship'] = 'role_jobcontract_id';
+$handler->display->display_options['filters']['role_end_date']['operator'] = '>=';
+$handler->display->display_options['filters']['role_end_date']['value']['value'] = '+0';
+$handler->display->display_options['filters']['role_end_date']['value']['type'] = 'offset';
+$handler->display->display_options['filters']['role_end_date']['group'] = 2;
+/* Filter criterion: HRJobContract Role entity: Role end date */
+$handler->display->display_options['filters']['role_end_date_1']['id'] = 'role_end_date_1';
+$handler->display->display_options['filters']['role_end_date_1']['table'] = 'hrjc_role';
+$handler->display->display_options['filters']['role_end_date_1']['field'] = 'role_end_date';
+$handler->display->display_options['filters']['role_end_date_1']['relationship'] = 'role_jobcontract_id';
+$handler->display->display_options['filters']['role_end_date_1']['operator'] = 'empty';
+$handler->display->display_options['filters']['role_end_date_1']['group'] = 2;
+/* Filter criterion: HRJobContract Role entity: Role start date */
+$handler->display->display_options['filters']['role_start_date']['id'] = 'role_start_date';
+$handler->display->display_options['filters']['role_start_date']['table'] = 'hrjc_role';
+$handler->display->display_options['filters']['role_start_date']['field'] = 'role_start_date';
+$handler->display->display_options['filters']['role_start_date']['relationship'] = 'role_jobcontract_id';
+$handler->display->display_options['filters']['role_start_date']['operator'] = '<=';
+$handler->display->display_options['filters']['role_start_date']['value']['value'] = '+0';
+$handler->display->display_options['filters']['role_start_date']['value']['type'] = 'offset';
+$handler->display->display_options['filters']['role_start_date']['group'] = 3;
+/* Filter criterion: HRJobContract Role entity: Role start date */
+$handler->display->display_options['filters']['role_start_date_1']['id'] = 'role_start_date_1';
+$handler->display->display_options['filters']['role_start_date_1']['table'] = 'hrjc_role';
+$handler->display->display_options['filters']['role_start_date_1']['field'] = 'role_start_date';
+$handler->display->display_options['filters']['role_start_date_1']['relationship'] = 'role_jobcontract_id';
+$handler->display->display_options['filters']['role_start_date_1']['operator'] = 'empty';
+$handler->display->display_options['filters']['role_start_date_1']['group'] = 3;
 
 /* Display: Staff directory list page */
 $handler = $view->new_display('page', 'Staff directory list page', 'page');
@@ -631,7 +674,6 @@ $handler->display->display_options['arguments']['effective_end_date']['summary']
 $handler->display->display_options['arguments']['effective_end_date']['summary_options']['items_per_page'] = '25';
 $handler->display->display_options['arguments']['effective_end_date']['civihr_range'] = '>=';
 $handler->display->display_options['arguments']['effective_end_date']['civihr_range_empty'] = '1';
-
 $handler->display->display_options['merge_rows'] = TRUE;
 $handler->display->display_options['field_config'] = array(
   'id' => array(
@@ -719,6 +761,7 @@ $translatables['civihr_staff_directory'] = array(
   t('Work Phone'),
   t('Work Phone Extension'),
   t('Job Title'),
+  t('Email'),
   t('Location'),
   t(' Contract Type '),
   t('Role Department'),
@@ -730,7 +773,6 @@ $translatables['civihr_staff_directory'] = array(
   t('Role start date'),
   t('Manager'),
   t('Managers'),
-  t('Email'),
   t('Department'),
   t('Staff directory list page'),
   t('First'),

From 8d1c380f025110cb437409e0af48b7da92f967dd Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Mon, 26 Jun 2017 18:21:14 +0545
Subject: [PATCH 10/24] PCHR-2329: Format expiry date if it only exists

---
 .../civihr_employee_portal_handler_documents_date.inc     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/civihr_employee_portal/views/includes/civihr_employee_portal_handler_documents_date.inc b/civihr_employee_portal/views/includes/civihr_employee_portal_handler_documents_date.inc
index 5e906298..e8621411 100644
--- a/civihr_employee_portal/views/includes/civihr_employee_portal_handler_documents_date.inc
+++ b/civihr_employee_portal/views/includes/civihr_employee_portal_handler_documents_date.inc
@@ -5,8 +5,10 @@
  * Custom views handler to display Task / Document date in specific format.
  */
 class civihr_employee_portal_handler_documents_date extends views_handler_field {
-    function render($values) {
-        $value = $this->get_value($values);
-        return date('M d Y', strtotime(strip_tags($value)));
+  function render($values) {
+    $value = $this->get_value($values);
+    if($value) {
+      return date('M d Y', strtotime(strip_tags($value)));
     }
+  }
 }

From 9d72c2669d7b0a161b84df17fc353d231a23f14c Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Mon, 26 Jun 2017 13:04:03 +0000
Subject: [PATCH 11/24] PCHR-2129: Remove Extra Commas From Managers in Staff
 Directory

Applied the same logic to relationships being shown on managers field of staff
directory as was implemented for active roles, so that only active
relationships are fetched from the database, preventing the post-render hook
to produce those extra commas when it deleted inactive ones.
---
 .../views_export/views_hr_staff_directory.inc | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/civihr_employee_portal/views/views_export/views_hr_staff_directory.inc b/civihr_employee_portal/views/views_export/views_hr_staff_directory.inc
index cab0bd6b..bc399c84 100755
--- a/civihr_employee_portal/views/views_export/views_hr_staff_directory.inc
+++ b/civihr_employee_portal/views/views_export/views_hr_staff_directory.inc
@@ -399,6 +399,8 @@ $handler->display->display_options['filter_groups']['groups'] = array(
   1 => 'AND',
   2 => 'OR',
   3 => 'OR',
+  4 => 'OR',
+  5 => 'OR',
 );
 /* Filter criterion: CiviCRM Contacts: Contact Type */
 $handler->display->display_options['filters']['contact_type']['id'] = 'contact_type';
@@ -619,6 +621,38 @@ $handler->display->display_options['filters']['role_start_date_1']['field'] = 'r
 $handler->display->display_options['filters']['role_start_date_1']['relationship'] = 'role_jobcontract_id';
 $handler->display->display_options['filters']['role_start_date_1']['operator'] = 'empty';
 $handler->display->display_options['filters']['role_start_date_1']['group'] = 3;
+/* Filter criterion: CiviCRM Relationships: End Date */
+$handler->display->display_options['filters']['end_date']['id'] = 'end_date';
+$handler->display->display_options['filters']['end_date']['table'] = 'civicrm_relationship';
+$handler->display->display_options['filters']['end_date']['field'] = 'end_date';
+$handler->display->display_options['filters']['end_date']['relationship'] = 'relationship_id_a_1';
+$handler->display->display_options['filters']['end_date']['operator'] = '>=';
+$handler->display->display_options['filters']['end_date']['value']['value'] = '+0';
+$handler->display->display_options['filters']['end_date']['value']['type'] = 'offset';
+$handler->display->display_options['filters']['end_date']['group'] = 4;
+/* Filter criterion: CiviCRM Relationships: End Date */
+$handler->display->display_options['filters']['end_date_1']['id'] = 'end_date_1';
+$handler->display->display_options['filters']['end_date_1']['table'] = 'civicrm_relationship';
+$handler->display->display_options['filters']['end_date_1']['field'] = 'end_date';
+$handler->display->display_options['filters']['end_date_1']['relationship'] = 'relationship_id_a_1';
+$handler->display->display_options['filters']['end_date_1']['operator'] = 'empty';
+$handler->display->display_options['filters']['end_date_1']['group'] = 4;
+/* Filter criterion: CiviCRM Relationships: Start Date */
+$handler->display->display_options['filters']['start_date']['id'] = 'start_date';
+$handler->display->display_options['filters']['start_date']['table'] = 'civicrm_relationship';
+$handler->display->display_options['filters']['start_date']['field'] = 'start_date';
+$handler->display->display_options['filters']['start_date']['relationship'] = 'relationship_id_a_1';
+$handler->display->display_options['filters']['start_date']['operator'] = '<=';
+$handler->display->display_options['filters']['start_date']['value']['value'] = '+0';
+$handler->display->display_options['filters']['start_date']['value']['type'] = 'offset';
+$handler->display->display_options['filters']['start_date']['group'] = 5;
+/* Filter criterion: CiviCRM Relationships: Start Date */
+$handler->display->display_options['filters']['start_date_1']['id'] = 'start_date_1';
+$handler->display->display_options['filters']['start_date_1']['table'] = 'civicrm_relationship';
+$handler->display->display_options['filters']['start_date_1']['field'] = 'start_date';
+$handler->display->display_options['filters']['start_date_1']['relationship'] = 'relationship_id_a_1';
+$handler->display->display_options['filters']['start_date_1']['operator'] = 'empty';
+$handler->display->display_options['filters']['start_date_1']['group'] = 5;
 
 /* Display: Staff directory list page */
 $handler = $view->new_display('page', 'Staff directory list page', 'page');

From b205d599854ce29b8c0085649297abda4ed30f4b Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Mon, 26 Jun 2017 19:32:20 +0545
Subject: [PATCH 12/24] PCHR-2243: Compare status value with content instead of
 status id

---
 .../templates/views-view-table--Documents--block-1.tpl.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
index 27fecc5a..254f5690 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
@@ -65,11 +65,11 @@
                     <?php foreach ($statuses as $statusKey => $statusValue): ?>
                       <?php
                         $selected = '';
-                        if ($statusKey == (int) strip_tags($content)):
+                        if (strtolower($statusValue) == strip_tags($content)):
                           $selected = ' selected="selected"';
                         endif;
                         ?>
-                      <option value="<?php print $statusKey; ?>"<?php print $selected; ?>><?php print $statusValue; ?></option>
+                      <option value="<?php print $statusKey; ?>"<?php print $selected; ?>><?php print ucwords($statusValue);?></option>
                     <?php endforeach; ?>
                   </select>
                   <?php continue; ?>

From 0497c91cff6adeb77b9069d4eaece827d51588d8 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Mon, 26 Jun 2017 20:10:10 +0545
Subject: [PATCH 13/24] PCHR-2243: Implemets PR review feedbacks

---
 .../templates/views-view-table--Documents--block-1.tpl.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
index 254f5690..70ac45a4 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
@@ -69,7 +69,7 @@
                           $selected = ' selected="selected"';
                         endif;
                         ?>
-                      <option value="<?php print $statusKey; ?>"<?php print $selected; ?>><?php print ucwords($statusValue);?></option>
+                      <?php printf('<option value="%s" %s>%s</option>', $statusKey, $selected, ucwords($statusValue)); ?>
                     <?php endforeach; ?>
                   </select>
                   <?php continue; ?>

From 699408d46466cc0ac868b9a7f2297f6b9ef07897 Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Thu, 29 Jun 2017 21:59:01 +0000
Subject: [PATCH 14/24] PCHR-2333: Show Documents to All Assignees on Document
 Manager

Document Manager block in SSP is used to show the list of documents they have
assigned. A document can be assigned to several managers, however, only the
first manager assigned was able to see the document on Document Manager block.

The problem arose because the DB view being used to build the manager block
was grouping results by document ID, thus only one manager was shown in result
set.

Fixed by altering the SQL being used to build the DB view. Also had to fix the
Documents Dashboard Block, since new structure of the view caused each
document to be shown several times (one time per each assigned manager), by
grouping results within the drupal view.
---
 .../civihr_employee_portal.module             | 10 +++-
 .../views/views_export/views_documents.inc    | 55 +++++++++++++++++++
 2 files changed, 63 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 civihr_employee_portal/views/views_export/views_documents.inc

diff --git a/civihr_employee_portal/civihr_employee_portal.module b/civihr_employee_portal/civihr_employee_portal.module
index bd7e49e3..aabad83b 100755
--- a/civihr_employee_portal/civihr_employee_portal.module
+++ b/civihr_employee_portal/civihr_employee_portal.module
@@ -287,7 +287,13 @@ function _get_activity_type_ids_by_component($component) {
 function _get_tasks_documents_sql_query(array $activityTypes) {
   $civi_settings = parse_url(CIVICRM_DSN);
   $civi_db_name = trim($civi_settings['path'], '/');
-  return "SELECT a.id, a.activity_type_id, a.subject, a.activity_date_time, acustom.expire_date, a.details, a.status_id, a.is_deleted, ca.case_id, COUNT(ef.id) AS file_count, acs.contact_id AS source_contact_id, contact_source.sort_name AS source_contact_name, act.contact_id AS target_contact_id, contact_target.sort_name AS target_contact_name, aca.contact_id AS assignee_contact_id, contact_assignee.sort_name AS assignee_contact_name
+
+  return "SELECT a.id, a.activity_type_id, a.subject, a.activity_date_time,
+            acustom.expire_date, a.details, a.status_id, a.is_deleted, ca.case_id,
+            COUNT(ef.id) AS file_count, acs.contact_id AS source_contact_id,
+            contact_source.sort_name AS source_contact_name, act.contact_id AS target_contact_id,
+            contact_target.sort_name AS target_contact_name, aca.contact_id AS assignee_contact_id,
+            contact_assignee.sort_name AS assignee_contact_name
             FROM {$civi_db_name}.civicrm_activity a
             LEFT JOIN {$civi_db_name}.civicrm_value_activity_custom_fields_11 acustom ON acustom.entity_id = a.id
             LEFT JOIN {$civi_db_name}.civicrm_case_activity ca ON ca.activity_id = a.id
@@ -299,7 +305,7 @@ function _get_tasks_documents_sql_query(array $activityTypes) {
             LEFT JOIN {$civi_db_name}.civicrm_activity_contact aca ON aca.activity_id = a.id AND aca.record_type_id = 1
             LEFT JOIN {$civi_db_name}.civicrm_contact contact_assignee ON contact_assignee.id = aca.contact_id
             WHERE a.is_deleted = 0 AND a.is_current_revision = 1 AND a.activity_type_id IN (" . implode(',', $activityTypes) . ")
-            GROUP BY a.id";
+            GROUP BY a.id, aca.contact_id";
 }
 
 /**
diff --git a/civihr_employee_portal/views/views_export/views_documents.inc b/civihr_employee_portal/views/views_export/views_documents.inc
old mode 100644
new mode 100755
index 6f7f0c6a..16bce21d
--- a/civihr_employee_portal/views/views_export/views_documents.inc
+++ b/civihr_employee_portal/views/views_export/views_documents.inc
@@ -346,6 +346,61 @@ $handler->display->display_options['arguments']['target_contact_id']['default_ar
 $handler->display->display_options['arguments']['target_contact_id']['summary']['number_of_records'] = '0';
 $handler->display->display_options['arguments']['target_contact_id']['summary']['format'] = 'default_summary';
 $handler->display->display_options['arguments']['target_contact_id']['summary_options']['items_per_page'] = '25';
+$handler->display->display_options['merge_rows'] = TRUE;
+$handler->display->display_options['field_config'] = array(
+  'id' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'activity_type_id' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'case_id' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'subject' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'activity_date_time' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'expire_date' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'details' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'file_count' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'status_id' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'target_contact_id' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'assignee_contact_id' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'target_contact_name' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+  'assignee_contact_name' => array(
+    'merge_option' => 'merge_unique',
+    'separator' => ', ',
+  ),
+);
 
 /* Display: Documents Dashboard Manager block */
 $handler = $view->new_display('block', 'Documents Dashboard Manager block', 'block_1');

From 81f4555725f7454785fc34c521749d60b6ec238c Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Thu, 29 Jun 2017 22:09:08 +0000
Subject: [PATCH 15/24] PCHR-2333: Show Document Type on SSP Dashboard

List of documents in SSP dashboard showed an empty type for every document.
This happened because the option values for document types, which in fact are
a special case of activity types, were not being loaded to resolve activity
type id's for their corresponding labels.

Fixed by calling 'getoptions' to Document entity, and merging the result with
original activity types array.
---
 civihr_employee_portal/civihr_employee_portal.module | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/civihr_employee_portal/civihr_employee_portal.module b/civihr_employee_portal/civihr_employee_portal.module
index aabad83b..1eb0e3a4 100755
--- a/civihr_employee_portal/civihr_employee_portal.module
+++ b/civihr_employee_portal/civihr_employee_portal.module
@@ -1114,8 +1114,16 @@ function get_activity_type_value($type_id = NULL) {
 
                 // Task types array
                 $activityTypes = civicrm_api3('Activity', 'getoptions', array(
+                  'field' => "activity_type_id",
+                ));
+
+                // Document types array
+                $documentTypes = civicrm_api3('Document', 'getoptions', array(
                     'field' => "activity_type_id",
                 ));
+
+                $activityTypes['values'] += $documentTypes['values'];
+                $activityTypes['count'] = count($activityTypes['values']);
             }
 
             catch (CiviCRM_API3_Exception $e) {

From 1a621f67faf34085fdbce4e47fd44f2b2d05c6ec Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Thu, 29 Jun 2017 22:16:14 +0000
Subject: [PATCH 16/24] PCHR-2333: Reformat Code for get_activity_type_value

Reformated code of the aforementioned function to follow current code
formatting standards.
---
 .../civihr_employee_portal.module             | 64 +++++++++----------
 1 file changed, 31 insertions(+), 33 deletions(-)

diff --git a/civihr_employee_portal/civihr_employee_portal.module b/civihr_employee_portal/civihr_employee_portal.module
index 1eb0e3a4..2d8e3111 100755
--- a/civihr_employee_portal/civihr_employee_portal.module
+++ b/civihr_employee_portal/civihr_employee_portal.module
@@ -1100,49 +1100,47 @@ function get_task_statuses($status_id = NULL) {
  */
 function get_activity_type_value($type_id = NULL) {
 
-    $activityTypes = &drupal_static(__FUNCTION__);
+  $activityTypes = &drupal_static(__FUNCTION__);
 
-    if (!isset($activityTypes)) {
+  if (!isset($activityTypes)) {
 
-        if ($cache = cache_get('civihr_activity_types')) {
-            $activityTypes = $cache->data;
-        }
-        else {
-            try {
-                // Civi init
-                civicrm_initialize();
-
-                // Task types array
-                $activityTypes = civicrm_api3('Activity', 'getoptions', array(
-                  'field' => "activity_type_id",
-                ));
+    if ($cache = cache_get('civihr_activity_types')) {
+      $activityTypes = $cache->data;
+    }
+    else {
+      try {
+        // Civi init
+        civicrm_initialize();
 
-                // Document types array
-                $documentTypes = civicrm_api3('Document', 'getoptions', array(
-                    'field' => "activity_type_id",
-                ));
+        // Task types array
+        $activityTypes = civicrm_api3('Activity', 'getoptions', [
+          'field' => "activity_type_id",
+        ]);
 
-                $activityTypes['values'] += $documentTypes['values'];
-                $activityTypes['count'] = count($activityTypes['values']);
-            }
+        // Document types array
+        $documentTypes = civicrm_api3('Document', 'getoptions', [
+          'field' => "activity_type_id",
+        ]);
 
-            catch (CiviCRM_API3_Exception $e) {
-                $error = $e->getMessage();
-            }
+        $activityTypes['values'] += $documentTypes['values'];
+        $activityTypes['count'] = count($activityTypes['values']);
+      } catch (CiviCRM_API3_Exception $e) {
+        $error = $e->getMessage();
+      }
 
-            // Cache the task types for 5 minutes
-            cache_set('civihr_activity_types', $activityTypes, 'cache', time() + 360);
-        }
+      // Cache the task types for 5 minutes
+      cache_set('civihr_activity_types', $activityTypes, 'cache', time() + 360);
     }
+  }
 
-    if ($type_id === null) {
-        return $activityTypes['values'];
-    }
+  if ($type_id === NULL) {
+    return $activityTypes['values'];
+  }
 
-    // Get the type values based on the type_id
-    $type_id_value = CRM_Utils_Array::value($type_id, $activityTypes['values']);
+  // Get the type values based on the type_id
+  $type_id_value = CRM_Utils_Array::value($type_id, $activityTypes['values']);
 
-    return $type_id_value;
+  return $type_id_value;
 }
 
 function get_appraisal_cycle_type($type_id = NULL) {

From f758124e332bb9ea490e0ada0e989003f5f02041 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Tue, 4 Jul 2017 21:25:19 +0545
Subject: [PATCH 17/24] PCHR-2354: Show spinner to specific document

---
 civihr_employee_portal/js/ta-documents-app.js             | 2 +-
 .../views-view-table--Documents--block-1.tpl.php          | 8 ++++----
 .../templates/views-view-table--Documents--block.tpl.php  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index d46d3424..d4385ddf 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -28,7 +28,7 @@
                 throw new Error('Requested Document is not available');
               }
 
-              $rootScope.$broadcast('ct-spinner-show');
+              $rootScope.$broadcast('ct-spinner-show', 'document-' + id);
               vm.loadingModalData = true;
 
               openModalDocument(data[0], role);
diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
index 70ac45a4..43ab6493 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block-1.tpl.php
@@ -94,11 +94,11 @@
                 <?php print strip_tags(html_entity_decode($content)); ?>
               </td>
             <?php endforeach; ?>
-            <td ct-spinner>
+            <td ct-spinner ct-spinner-id="document-<?php print strip_tags($row['id']); ?>">
               <button
-              ng-show='!document.loadingModalData'
-              ng-click="document.modalDocument(<?php print strip_tags($row['id']); ?>, 'manager')"
-              class="btn btn-sm btn-default">
+                ng-show='!document.loadingModalData'
+                ng-click="document.modalDocument(<?php print strip_tags($row['id']); ?>, 'manager')"
+                class="btn btn-sm btn-default">
                 <i class="fa fa-upload"></i> Open
               </button>
             </td>
diff --git a/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php b/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
index 9b056d75..3be9b72a 100644
--- a/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
+++ b/civihr_employee_portal/views/templates/views-view-table--Documents--block.tpl.php
@@ -100,7 +100,7 @@
                 <?php print $content; ?>
                 </td>
                 <?php endforeach; ?>
-              <td ct-spinner>
+              <td ct-spinner ct-spinner-id="document-<?php print strip_tags($row['id']); ?>">
                 <?php if (strip_tags($row['status_id']) == 3): ?>
                   <button
                     ng-show='!document.loadingModalData'

From 67f78860694c6bc7c30c950795fe98b0f1435fba Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Wed, 5 Jul 2017 14:09:54 +0545
Subject: [PATCH 18/24] PCHR-2354: Display loader before loading documents

---
 civihr_employee_portal/js/ta-documents-app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index d4385ddf..e0f1dba9 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -22,15 +22,15 @@
          * @param {string} role
          */
         vm.modalDocument = function (id, role) {
+          $rootScope.$broadcast('ct-spinner-show', 'document-' + id);
+          vm.loadingModalData = true;
+
           DocumentService.get({ id: id })
             .then(function(data) {
               if (!data) {
                 throw new Error('Requested Document is not available');
               }
 
-              $rootScope.$broadcast('ct-spinner-show', 'document-' + id);
-              vm.loadingModalData = true;
-
               openModalDocument(data[0], role);
             })
             .catch(function(reason) {

From 1de8a39ae93a79c0b83516a13682ca20ffe2f343 Mon Sep 17 00:00:00 2001
From: Camilo Rodriguez <camilo@compucorp.co.uk>
Date: Wed, 5 Jul 2017 16:07:10 +0000
Subject: [PATCH 19/24] PCHR-2333: Fix Document Dashboard Block

Previous fix was making all documents to be merge into a single row. Fixed by
implementing merge on document ID by 'filter' option.
---
 civihr_employee_portal/views/views_export/views_documents.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/civihr_employee_portal/views/views_export/views_documents.inc b/civihr_employee_portal/views/views_export/views_documents.inc
index 16bce21d..b034ee1f 100755
--- a/civihr_employee_portal/views/views_export/views_documents.inc
+++ b/civihr_employee_portal/views/views_export/views_documents.inc
@@ -349,7 +349,7 @@ $handler->display->display_options['arguments']['target_contact_id']['summary_op
 $handler->display->display_options['merge_rows'] = TRUE;
 $handler->display->display_options['field_config'] = array(
   'id' => array(
-    'merge_option' => 'merge_unique',
+    'merge_option' => 'filter',
     'separator' => ', ',
   ),
   'activity_type_id' => array(

From 3b9810f9c7fb3feab438ecb8b1bf22229f717f04 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Mon, 3 Jul 2017 14:20:43 +0545
Subject: [PATCH 20/24] PCHR-2355: Configure DATE_FORMAT in HR_settings for SSP

---
 civihr_employee_portal/js/ta-documents-app.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index e0f1dba9..0f604993 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -7,11 +7,13 @@
       $urlRouterProvider.otherwise('/dashboard');
     })
     .controller('ModalController', ['$scope', '$rootScope', '$window', '$rootElement', '$log', '$uibModal',
-      'DocumentService', 'FileService', 'config', 'settings',
-      function($scope, $rootScope, $window, $rootElement, $log, $modal, DocumentService, FileService, config, settings) {
+      'DocumentService', 'FileService', 'config', 'settings', 'HR_settings',
+      function($scope, $rootScope, $window, $rootElement, $log, $modal, DocumentService, FileService, config,
+        settings, HR_settings) {
         var vm = {};
         var isContactsCached = {};
 
+        HR_settings.DATE_FORMAT = "dd/MM/yyyy";
         vm.loadingModalData = false;
 
         /**

From 142ea9578ebef49a1152ff12b7554e40836ff415 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Mon, 3 Jul 2017 16:45:42 +0545
Subject: [PATCH 21/24] PCHR-2355: Add civihr_manager to cbange document status

---
 .../civihr_default_permissions.features.user_permission.inc      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.features.user_permission.inc b/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.features.user_permission.inc
index b583d6e0..9bd2f6a6 100755
--- a/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.features.user_permission.inc
+++ b/civihr_employee_portal/features/civihr_default_permissions/civihr_default_permissions.features.user_permission.inc
@@ -1032,6 +1032,7 @@ function civihr_default_permissions_user_default_permissions() {
     'roles' => array(
       'administrator' => 'administrator',
       'civihr_admin_local' => 'civihr_admin_local',
+      'civihr_manager' => 'civihr_manager',
     ),
     'module' => 'civihr_employee_portal',
   );

From 9bfb3cb455aec29378a745e3fe97b1f5c6ced46d Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Mon, 3 Jul 2017 19:53:12 +0545
Subject: [PATCH 22/24] PCHR-2355: user DateFormat service to set date format
 in ssp

---
 civihr_employee_portal/js/ta-documents-app.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index 0f604993..0a7ea109 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -7,13 +7,12 @@
       $urlRouterProvider.otherwise('/dashboard');
     })
     .controller('ModalController', ['$scope', '$rootScope', '$window', '$rootElement', '$log', '$uibModal',
-      'DocumentService', 'FileService', 'config', 'settings', 'HR_settings',
+      'DocumentService', 'FileService', 'config', 'settings', 'DateFormat',
       function($scope, $rootScope, $window, $rootElement, $log, $modal, DocumentService, FileService, config,
-        settings, HR_settings) {
+        settings, DateFormat) {
         var vm = {};
         var isContactsCached = {};
 
-        HR_settings.DATE_FORMAT = "dd/MM/yyyy";
         vm.loadingModalData = false;
 
         /**
@@ -41,12 +40,15 @@
         };
 
         (function init() {
+
           // Reloads page on 'document-saved' event
           $rootScope.$on('document-saved', function () {
             $window.location.reload();
           });
           // Get list of documents
           DocumentService.get().then(function (documents) {
+            //sets the date format for HR_settings.DATE_FORMAT
+            DateFormat.getDateFormat();
             isContactsCached = DocumentService.cacheContactsAndAssignments(documents, 'contacts');
           });
         })();

From 2de2a753aadb00c5316940f028b77d09a3934ad6 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Thu, 6 Jul 2017 19:45:24 +0545
Subject: [PATCH 23/24] PCHR-2355: Display spinner and hide button until
 contacts are loaded

---
 civihr_employee_portal/js/ta-documents-app.js | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index 0a7ea109..fc77b5fc 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -11,7 +11,7 @@
       function($scope, $rootScope, $window, $rootElement, $log, $modal, DocumentService, FileService, config,
         settings, DateFormat) {
         var vm = {};
-        var isContactsCached = {};
+        var availableContacts = false;
 
         vm.loadingModalData = false;
 
@@ -49,7 +49,7 @@
           DocumentService.get().then(function (documents) {
             //sets the date format for HR_settings.DATE_FORMAT
             DateFormat.getDateFormat();
-            isContactsCached = DocumentService.cacheContactsAndAssignments(documents, 'contacts');
+            DocumentService.cacheContactsAndAssignments(documents, 'contacts');
           });
         })();
 
@@ -74,7 +74,6 @@
               data: function () {
                 return data;
               },
-              isContactsCached: isContactsCached,
               files: function () {
                 if (!data.id || !+data.file_count) {
                   return [];
@@ -91,6 +90,25 @@
           });
         };
 
+        /**
+         * Watch for the changes in the list of $rootScope.cache.contact.arrSearch
+         * Display spinner and hide "open" button until the arrSearch is filled with contacts
+         *
+         * Note: $rootScope.cache.contact.arrSearch will always contain a
+         * contact data (curently logged in contact). So if there are documents,
+         * there must be more that one contacts conidering at aleast a target contact in a document
+         */
+        $rootScope.$watch('cache.contact', function () {
+          availableContacts = $rootScope.cache.contact.arrSearch.length > 1;
+          if (!availableContacts) {
+            $rootScope.$broadcast('ct-spinner-show');
+            vm.loadingModalData = true;
+          } else {
+            $rootScope.$broadcast('ct-spinner-hide');
+            vm.loadingModalData = false;
+          }
+        });
+
         return vm;
       }
     ]);

From 5083e414e57f236c42876868f06d98832dd75859 Mon Sep 17 00:00:00 2001
From: Buddha Man Nepali <bmnepali980@gmail.com>
Date: Thu, 6 Jul 2017 20:35:42 +0545
Subject: [PATCH 24/24] PCHR-2355: Implements PR review feedbacks

---
 civihr_employee_portal/js/ta-documents-app.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/civihr_employee_portal/js/ta-documents-app.js b/civihr_employee_portal/js/ta-documents-app.js
index fc77b5fc..bac78992 100644
--- a/civihr_employee_portal/js/ta-documents-app.js
+++ b/civihr_employee_portal/js/ta-documents-app.js
@@ -40,11 +40,11 @@
         };
 
         (function init() {
-
           // Reloads page on 'document-saved' event
           $rootScope.$on('document-saved', function () {
             $window.location.reload();
           });
+
           // Get list of documents
           DocumentService.get().then(function (documents) {
             //sets the date format for HR_settings.DATE_FORMAT
@@ -100,13 +100,8 @@
          */
         $rootScope.$watch('cache.contact', function () {
           availableContacts = $rootScope.cache.contact.arrSearch.length > 1;
-          if (!availableContacts) {
-            $rootScope.$broadcast('ct-spinner-show');
-            vm.loadingModalData = true;
-          } else {
-            $rootScope.$broadcast('ct-spinner-hide');
-            vm.loadingModalData = false;
-          }
+          $rootScope.$broadcast('ct-spinner-' + (availableContacts ? 'hide' : 'show'));
+          vm.loadingModalData = !availableContacts;
         });
 
         return vm;