Merge pull request #2832 from compucorp/staging

Sync master with staging
compucorp · Aug 20, 2018 · 350bb6a · 350bb6a
2 parents 15943b5 + 2e38090
commit 350bb6a
Show file tree

Hide file tree

Showing 289 changed files with 25,936 additions and 26,409 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -359,7 +359,7 @@ def testJS(hrcoreFolder, java.util.LinkedHashMap extension) {
   // workspace, where Jenkins will read it
   sh """
     cd $CIVICRM_EXT_ROOT/civihr/${hrcoreFolder}
-    gulp test --ext ${extension.folder} --reporters junit,progress || true
+    npx gulp test --ext ${extension.folder} --reporters junit,progress || true
 
     cd $CIVICRM_EXT_ROOT/civihr/${extension.folder}
     mv test-reports/*.xml $WORKSPACE/$KARMA_TESTS_REPORT_FOLDER/ || true

diff --git a/bin/apply-core-fork-patch.sh b/bin/apply-core-fork-patch.sh
@@ -3,6 +3,7 @@
 set -e
 
 API_URL_BASE="https://api.github.com/repos/compucorp/civicrm-core"
+REPO_BASE_URL="https://github.com/compucorp/civicrm-core"
 LAST_COMMIT_PATCHED_FILE="core-fork-last-commit-patched.txt"
 PATCH_FILE="fork-patch.diff"
 
@@ -27,7 +28,7 @@ applyPatch () {
 # Creates a diff patch file by sending a request to the given GitHub API url
 #
 # Globals:
-#   $API_URL_BASE
+#   $REPO_BASE_URL
 #   $civiRoot
 #   $PATCH_FILE
 # Arguments:
@@ -37,7 +38,7 @@ applyPatch () {
 #   None
 #######################################
 createPatch () {
-  curl "$API_URL_BASE/compare/$1...$2" -s -H "Accept: application/vnd.github.v3.diff" > "$civiRoot/$PATCH_FILE"
+  curl "$REPO_BASE_URL/compare/$1...$2.diff" -s > "$civiRoot/$PATCH_FILE"
 }
 
 #######################################

diff --git a/bin/drush-install.sh b/bin/drush-install.sh
@@ -11,7 +11,6 @@ uk.co.compucorp.civicrm.hremails
 ## List of extensions defining basic entity types
 ENTITY_EXTS=\
 org.civicrm.hrbank,\
-org.civicrm.hrdemog,\
 org.civicrm.hrjobcontract,\
 com.civicrm.hrjobroles,\
 org.civicrm.hrmed,\

diff --git a/bin/git-release.sh b/bin/git-release.sh
@@ -5,7 +5,6 @@ fileName=""
 ENTITY_EXTS=( hrbank \
 hrcareer \
 hrcase \
-hrdemog \
 hrim \
 hrmed \
 hrprofile \

diff --git a/com.civicrm.hrjobroles/CRM/Hrjobroles/API/Query/ContactHrJobRolesSelect.php b/com.civicrm.hrjobroles/CRM/Hrjobroles/API/Query/ContactHrJobRolesSelect.php
@@ -126,9 +126,14 @@ private function addJoins(CRM_Utils_SQL_Select $query) {
   private function addWhere(CRM_Utils_SQL_Select $customQuery) {
     if (!empty($this->params['contact_id'])) {
       $conditions[] = 'jc.contact_id IN (' . implode(',' , $this->params['contact_id']) . ')';
-      $customQuery->where($conditions);
       unset($this->params['contact_id']);
     }
+
+    $today = date('Y-m-d H:i:s');
+    $dateRestriction = 'a.start_date <= "' . $today . '"';
+    $dateRestriction .= ' AND (a.end_date >= "' . $today . '" OR a.end_date IS NULL)';
+    $conditions[] = $dateRestriction;
+    $customQuery->where($conditions);
   }
 
   /**

diff --git a/com.civicrm.hrjobroles/CRM/Hrjobroles/BAO/Query.php b/com.civicrm.hrjobroles/CRM/Hrjobroles/BAO/Query.php
@@ -70,15 +70,26 @@ public function from($name, $mode, $side) {
     }
 
     public function where(&$query) {
-        $grouping = NULL;
-        foreach ($query->_params as $param) {
-            if ($this->isAJobRoleParam($param)) {
-                if ($query->_mode == CRM_Contact_BAO_QUERY::MODE_CONTACTS) {
-                    $query->_useDistinct = TRUE;
-                }
-                $this->whereClauseSingle($param, $query);
-            }
+      $grouping = NULL;
+      $filterJobRoleByDate = $filterJobRole = FALSE;
+      foreach ($query->_params as $param) {
+        if ($this->isAJobRoleParam($param)) {
+          $filterJobRole = TRUE;
+          $paramHasDate = strpos($param[0], 'date');
+          if (!$filterJobRoleByDate && $paramHasDate) {
+            $filterJobRoleByDate = TRUE;
+          }
+
+          if ($query->_mode == CRM_Contact_BAO_QUERY::MODE_CONTACTS) {
+              $query->_useDistinct = TRUE;
+          }
+
+          $this->whereClauseSingle($param, $query);
         }
+      }
+      if (!$filterJobRoleByDate && $filterJobRole) {
+        $this->applyJobRoleDateFiltering($query);
+      }
     }
 
     private function isAJobRoleParam($param) {
@@ -90,6 +101,18 @@ private function isAJobRoleParam($param) {
         return false;
     }
 
+  /**
+   * Applies date filtering for active job roles
+   *
+   * @param CRM_Contact_BAO_Query $query
+   */
+    private function applyJobRoleDateFiltering(&$query) {
+      $today = date('Y-m-d H:i:s');
+      $dateRestriction = 'civicrm_hrjobroles.start_date <= "' . $today . '"';
+      $dateRestriction .= ' AND (civicrm_hrjobroles.end_date >= "' . $today . '" OR civicrm_hrjobroles.end_date IS NULL)';
+      $query->_where[] = [$dateRestriction];
+    }
+
     private function whereClauseSingle($values, &$query) {
         list($name, $op, $value, $grouping, $wildcard) = $values;
 

diff --git a/com.civicrm.hrjobroles/CRM/Hrjobroles/Test/Fabricator/HrJobRoles.php b/com.civicrm.hrjobroles/CRM/Hrjobroles/Test/Fabricator/HrJobRoles.php
@@ -16,6 +16,10 @@ class CRM_Hrjobroles_Test_Fabricator_HrJobRoles {
    * @throws \Exception
    */
   public static function fabricate($params) {
+    if (empty($params['start_date'])) {
+      $params['start_date'] = date('Y-m-d H:i:s');
+    }
+
     $result = civicrm_api3(
       'HrJobRoles',
       'create',

diff --git a/com.civicrm.hrjobroles/info.xml b/com.civicrm.hrjobroles/info.xml
@@ -8,8 +8,8 @@
     <author>Compucorp Ltd</author>
     <email>info@compucorp.co.uk</email>
   </maintainer>
-  <releaseDate>2018-07-24</releaseDate>
-  <version>1.7.9</version>
+  <releaseDate>2018-08-20</releaseDate>
+  <version>1.7.10</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/com.civicrm.hrjobroles/tests/phpunit/api/v3/ContactHRJobRoleTest.php b/com.civicrm.hrjobroles/tests/phpunit/api/v3/ContactHRJobRoleTest.php
@@ -99,9 +99,9 @@ public function testTheGetActionReturnsMultipleJobRoles() {
     $contact2 = ContactFabricator::fabricate();
     $contract1 = HRJobContractFabricator::fabricate(['contact_id' => $contact1['id']]);
     $contract2 = HRJobContractFabricator::fabricate(['contact_id' => $contact2['id']]);
-    $jobRole1 = HRJobRolesFabricator::fabricate(['job_contract_id' => $contract1['id'],]);
-    $jobRole2 = HRJobRolesFabricator::fabricate(['job_contract_id' => $contract1['id'],]);
-    $jobRole3 = HRJobRolesFabricator::fabricate(['job_contract_id' => $contract2['id'],]);
+    $jobRole1 = HRJobRolesFabricator::fabricate(['job_contract_id' => $contract1['id']]);
+    $jobRole2 = HRJobRolesFabricator::fabricate(['job_contract_id' => $contract1['id']]);
+    $jobRole3 = HRJobRolesFabricator::fabricate(['job_contract_id' => $contract2['id']]);
 
     $contactJobRoles = civicrm_api3($this->entity, $this->action)['values'];
 

diff --git a/contactaccessrights/info.xml b/contactaccessrights/info.xml
@@ -8,8 +8,8 @@
     <author>Compucorp Ltd</author>
     <email>info@compucorp.co.uk</email>
   </maintainer>
-  <releaseDate>2018-07-24</releaseDate>
-  <version>1.7.9</version>
+  <releaseDate>2018-08-20</releaseDate>
+  <version>1.7.10</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/contactaccessrights/js/dist/access-rights.min.js b/contactaccessrights/js/dist/access-rights.min.js
diff --git a/contactsummary/info.xml b/contactsummary/info.xml
@@ -8,8 +8,8 @@
     <author>Compucorp Ltd</author>
     <email>info@compucorp.co.uk</email>
   </maintainer>
-  <releaseDate>2018-07-24</releaseDate>
-  <version>1.7.9</version>
+  <releaseDate>2018-08-20</releaseDate>
+  <version>1.7.10</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/contactsummary/js/dist/contact-summary.min.js b/contactsummary/js/dist/contact-summary.min.js
diff --git a/contactsummary/js/test/controllers/key-dates.controller.spec.js b/contactsummary/js/test/controllers/key-dates.controller.spec.js
@@ -14,7 +14,7 @@ define([
     var $httpBackend, $rootScope, $q, contractServiceMock, controller, ctrlConstructor,
       jobRoleServiceMock, pubSub;
 
-    beforeEach(module('contactsummary', 'contactsummary.mocks'));
+    beforeEach(module('contactsummary', 'contactsummary.mocks', 'contact-summary.templates'));
 
     beforeEach(module(function ($provide) {
       $provide.factory('contractService', function () {

diff --git a/hrbank/info.xml b/hrbank/info.xml
@@ -8,8 +8,8 @@
     <author>CiviCRM LLC</author>
     <email>info@civicrm.org</email>
   </maintainer>
-  <releaseDate>2018-07-24</releaseDate>
-  <version>1.7.9</version>
+  <releaseDate>2018-08-20</releaseDate>
+  <version>1.7.10</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>4.7</ver>

diff --git a/hrcareer/hrcareer.php b/hrcareer/hrcareer.php
@@ -189,6 +189,6 @@ function hrcareer_civicrm_pageRun($page) {
       ->addScriptFile('civicrm', 'js/jquery/jquery.crmRevisionLink.js', CRM_Core_Resources::DEFAULT_WEIGHT, 'html-header');
 
     CRM_Core_Resources::singleton()
-      ->addScriptFile('org.civicrm.hrcareer', 'js/hrcareer.js');
+      ->addScriptFile('org.civicrm.hrcareer', 'js/dist/hrcareer.min.js', 1010);
   }
 }