Merge pull request #2212 from civicrm/staging

Sync master with staging

bin/drush-install.sh

@@ -14,13 +14,14 @@ org.civicrm.hrbank,\
 org.civicrm.hrdemog,\
 org.civicrm.hrjobcontract,\
 com.civicrm.hrjobroles,\
-org.civicrm.hrabsence,\
 org.civicrm.hrmed,\
 org.civicrm.hrqual,\
 org.civicrm.hremergency,\
 org.civicrm.hrcareer,\
 uk.co.compucorp.contactaccessrights,\
-uk.co.compucorp.civicrm.tasksassignments
+uk.co.compucorp.civicrm.tasksassignments,\
+uk.co.compucorp.civicrm.hrcomments,\
+uk.co.compucorp.civicrm.hrleaveandabsences
 
 ## List of extensions defining applications/UIs on top of the basic entity types
 APP_EXTS=\

bin/git-release.sh

@@ -27,7 +27,8 @@ org.civicrm.reqangular \
 uk.co.compucorp.civicrm.appraisals \
 uk.co.compucorp.civicrm.hrcore \
 uk.co.compucorp.civicrm.hremails \
-uk.co.compucorp.civicrm.hrleaveandabsences
+uk.co.compucorp.civicrm.hrleaveandabsences \
+uk.co.compucorp.civicrm.hrcomments
 )
 
 set -e

com.civicrm.hrjobroles/CRM/Hrjobroles/BAO/HrJobRoles.php

@@ -81,7 +81,7 @@ public static function getCurrentDepartmentsList($contractID)  {
               WHERE hrjr.job_contract_id = %1
                 AND hrjr.start_date <= '{$today}'
                 AND (
-                  hrjr.end_date = 0
+                  hrjr.end_date IS NULL
                   OR hrjr.end_date >= '{$today}'
                 )
                 AND cog.name = 'hrjc_department'";

com.civicrm.hrjobroles/info.xml

@@ -8,8 +8,8 @@
     <author>gregmeszaros</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2017-10-06</releaseDate>
-  <version>1.6.12</version>
+  <releaseDate>2017-10-10</releaseDate>
+  <version>1.7.0</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>4.7</ver>

com.civicrm.hrjobroles/tests/phpunit/CRM/Hrjobroles/BAO/HrJobRolesTest.php

@@ -155,8 +155,13 @@ public function testGetCompactCurrentDepartmentsList() {
 
     $department = $this->createDepartment('special_investigation', 'Special Investigation')['value'];
 
-    $this->createJobRole(array('job_contract_id' => $contract->id, 'department' => $department));
-    $this->createJobRole(array('job_contract_id' => $contract->id, 'department' => $department));
+    $params = [
+      'job_contract_id' => $contract->id,
+      'department' => $department,
+      'start_date' => date('Ymd')
+    ];
+    $this->createJobRole($params);
+    $this->createJobRole($params);
 
     $departmentsList = CRM_Hrjobroles_BAO_HrJobRoles::getCurrentDepartmentsList($contract->id);
 

contactaccessrights/info.xml

@@ -8,8 +8,8 @@
     <author>Robin Mitra</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2017-10-06</releaseDate>
-  <version>1.6.12</version>
+  <releaseDate>2017-10-10</releaseDate>
+  <version>1.7.0</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>4.7</ver>

contactsummary/css/contactsummary.css

@@ -1 +1 @@
-#contactsummary{padding:20px}#contactsummary .panel--key-dates>.panel-body{padding-bottom:0;padding-top:0}#contactsummary .panel--key-details{margin-bottom:0 !important}#contactsummary .panel--leave .list-unstyled{margin-bottom:0}@media (min-width: 1200px){#contactsummary .panel--sickness .col--sickness-days{text-align:right}}
+#contactsummary{padding:20px}#contactsummary .panel--key-dates>.panel-body{padding-bottom:0;padding-top:0}#contactsummary .panel--key-details{margin-bottom:0 !important}

contactsummary/info.xml

@@ -8,8 +8,8 @@
     <author>Robin Mitra</author>
     <email>[email protected]</email>
   </maintainer>
-  <releaseDate>2017-10-06</releaseDate>
-  <version>1.6.12</version>
+  <releaseDate>2017-10-10</releaseDate>
+  <version>1.7.0</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>4.7</ver>

contactsummary/js/src/contact-summary/app.js

@@ -6,8 +6,6 @@ define([
     'contact-summary/controllers/contactSummary',
     'contact-summary/controllers/keyDates',
     'contact-summary/controllers/keyDetails',
-    'contact-summary/controllers/leave',
-    'contact-summary/controllers/sickness',
     'contact-summary/directives/donutChart'
 ], function (angular) {
     var app = angular.module('contactsummary', [

contactsummary/js/src/contact-summary/controllers/contactSummary.js

@@ -1,2 +1,28 @@
-define([    'contact-summary/modules/controllers',    'contact-summary/modules/settings',    'contact-summary/services/contact'], function (controllers) {    'use strict';    /**     * @ngdoc controller     * @name ContactSummaryCtrl     * @param $log     * @param {ContactService} Contact     * @param settings     * @constructor     */    function ContactSummaryCtrl($log, Contact, settings) {        $log.debug('Controller: ContactSummaryCtrl');        var templateDir = settings.pathBaseUrl + settings.pathTpl;        this.partials = {            keyDetails: templateDir + '/include/keyDetails.html',            keyDates: templateDir + '/include/keyDates.html',            leave: templateDir + '/include/leave.html',            sickness: templateDir + '/include/sickness.html'        };        this.ready = false;        // Contact.get().then(function (response) {        //     $log.debug('Contact', response);        //     this.contact = response;        //     this.ready = true;        // }.bind(this));
-    }    controllers.controller('ContactSummaryCtrl', ['$log', 'ContactService', 'settings', ContactSummaryCtrl]);});
+define([
+    'contact-summary/modules/controllers',
+    'contact-summary/modules/settings'
+], function (controllers) {
+    'use strict';
+
+    /**
+     * @ngdoc controller
+     * @name ContactSummaryCtrl
+     * @param $log
+     * @param settings
+     * @constructor
+     */
+    function ContactSummaryCtrl($log, settings) {
+        $log.debug('Controller: ContactSummaryCtrl');
+
+        var templateDir = settings.pathBaseUrl + settings.pathTpl;
+
+        this.partials = {
+            keyDetails: templateDir + '/include/keyDetails.html',
+            keyDates: templateDir + '/include/keyDates.html'
+        };
+
+        this.ready = false;
+    }
+
+    controllers.controller('ContactSummaryCtrl', ['$log', 'settings', ContactSummaryCtrl]);
+});