Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PCHR-2395: Fix admin self leave request popup #1999

Merged
merged 4 commits into from
Jul 13, 2017
Merged

PCHR-2395: Fix admin self leave request popup #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abcc804
PCHR-2395: Amend tests
igorpavlov Jul 13, 2017
668851d
PCHR-2395: Fix leave request popup controllers
igorpavlov Jul 13, 2017
7a7ef9a
PCHR-2395: Amend templates
igorpavlov Jul 13, 2017
726cf8a
PCHR-2395: PR Feedback
igorpavlov Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions uk.co.compucorp.civicrm.hrleaveandabsences/js/angular/dist/absence-tab.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions uk.co.compucorp.civicrm.hrleaveandabsences/js/angular/dist/admin-dashboard.min.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions uk.co.compucorp.civicrm.hrleaveandabsences/js/angular/dist/manager-leave.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions uk.co.compucorp.civicrm.hrleaveandabsences/js/angular/dist/my-leave.min.js
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion ...absences/js/angular/src/leave-absences/shared/components/leave-request-create-dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ define([
bindings: {
btnClass: '@',
contactId: '<',
selectedContactId: '<'
selectedContactId: '<',
isSelfRecord: '<'
},
templateUrl: ['shared-settings', function (sharedSettings) {
return sharedSettings.sharedPathTpl + 'components/leave-request-create-dropdown.html';
Expand Down
13 changes: 9 additions & 4 deletions ...vicrm.hrleaveandabsences/js/angular/src/leave-absences/shared/controllers/request-ctrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ define([
this.canManage = false; // this flag is set on initialisation of the controller
this.contactName = null;
this.errors = [];
this.isSelfRecord = false; // this flag is set on initialisation of the controller
this.managedContacts = [];
this.mode = ''; // can be edit, create, view
this.newStatusOnSave = null;
Expand Down Expand Up @@ -713,11 +714,11 @@ define([

/**
* Changes status of the leave request before saving it
* For staff the status_id should be always set to awaitingApproval before saving
* If manager has changed the status through dropdown, assign the same before calling API
* When recording for yourself the status_id should be always set to awaitingApproval before saving
* If manager or admin have changed the status through dropdown, assign the same before calling API
*/
function changeStatusBeforeSave () {
if (this.isRole('staff')) {
if (this.isSelfRecord) {
this.request.status_id = this.requestStatuses[sharedSettings.statusNames.awaitingApproval].value;
} else if (this.canManage) {
this.request.status_id = this.newStatusOnSave || this.request.status_id;
Expand Down Expand Up @@ -982,6 +983,7 @@ define([
})
.finally(function () {
this.canManage = this.isRole('manager') || this.isRole('admin');
this.isSelfRecord = this.directiveOptions.isSelfRecord;
}.bind(this));
}

Expand Down Expand Up @@ -1027,7 +1029,10 @@ define([
// When in Admin Dashboard
return Contact.all()
.then(function (contacts) {
this.managedContacts = contacts.list;
this.managedContacts = _.remove(contacts.list, function (contact) {
// Removes the admin from the list of managees
return contact.id !== this.directiveOptions.contactId;
}.bind(this));
}.bind(this));
} else {
// Everywhere else
Expand Down
6 changes: 4 additions & 2 deletions ...hrleaveandabsences/js/angular/src/leave-absences/shared/directives/leave-request-popup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ define([
contactId: '<',
leaveRequest: '<',
leaveType: '@',
selectedContactId: '<'
selectedContactId: '<',
isSelfRecord: '<'
},
restrict: 'EA',
link: function (scope, element) {
Expand All @@ -55,7 +56,8 @@ define([
return {
contactId: scope.contactId,
leaveRequest: scope.leaveRequest,
selectedContactId: scope.selectedContactId
selectedContactId: scope.selectedContactId,
isSelfRecord: scope.isSelfRecord
};
},
// to set HR_settings DateFormat
Expand Down
35 changes: 34 additions & 1 deletion ...ndabsences/js/angular/test/shared/controllers/sub-controllers/leave-request-ctrls.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@
describe('staff opens request popup', function () {
beforeEach(inject(function () {
var directiveOptions = {
contactId: CRM.vars.leaveAndAbsences.contactId
contactId: CRM.vars.leaveAndAbsences.contactId,
isSelfRecord: true
};

initTestController(directiveOptions);
Expand Down Expand Up @@ -754,6 +755,7 @@
leaveRequest.contact_id = CRM.vars.leaveAndAbsences.contactId.toString();
var directiveOptions = {
contactId: leaveRequest.contact_id, // staff's contact id
isSelfRecord: true,
leaveRequest: leaveRequest
};

Expand Down Expand Up @@ -845,6 +847,7 @@
leaveRequest.contact_id = CRM.vars.leaveAndAbsences.contactId.toString();
var directiveOptions = {
contactId: leaveRequest.contact_id, // staff's contact id
isSelfRecord: true,
leaveRequest: leaveRequest
};

Expand All @@ -866,6 +869,7 @@
leaveRequest.contact_id = CRM.vars.leaveAndAbsences.contactId.toString();
var directiveOptions = {
contactId: leaveRequest.contact_id, // staff's contact id
isSelfRecord: true,
leaveRequest: leaveRequest
};

Expand Down Expand Up @@ -906,6 +910,7 @@

initTestController({
contactId: leaveRequest.contact_id, // staff's contact id
isSelfRecord: true,
leaveRequest: leaveRequest
});
});
Expand Down Expand Up @@ -934,6 +939,7 @@
leaveRequest.contact_id = CRM.vars.leaveAndAbsences.contactId.toString();
var directiveOptions = {
contactId: leaveRequest.contact_id, // staff's contact id
isSelfRecord: true,
leaveRequest: leaveRequest
};

Expand Down Expand Up @@ -1199,6 +1205,33 @@
});

describe('admin opens leave request popup in create mode', function () {
var adminId = 206;

beforeEach(function () {
$ctrl.request.contact_id = adminId.toString();

role = 'admin';
initTestController({
contactId: adminId
});
});

describe('on initialization', function () {
it('is in create mode', function () {
expect($ctrl.isMode('create')).toBeTruthy();
});

it('has admin role', function () {
expect($ctrl.isRole('admin')).toBeTruthy();
});

it('does not contain admin in the list of managees', function () {
expect(_.find($ctrl.managedContacts, { 'id': adminId })).toBeUndefined();
});
});
});

describe('admin opens leave request popup in create mode for a pre-selected contact', function () {
var selectedContactId = 208;
var adminId = 206;

Expand Down
3 changes: 2 additions & 1 deletion ...eandabsences/js/angular/test/shared/controllers/sub-controllers/sick-request-ctrl.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@

beforeEach(function () {
var directiveOptions = {
contactId: CRM.vars.leaveAndAbsences.contactId
contactId: CRM.vars.leaveAndAbsences.contactId,
isSelfRecord: true
};

initTestController(directiveOptions);
Expand Down
3 changes: 2 additions & 1 deletion ...eandabsences/js/angular/test/shared/controllers/sub-controllers/toil-request-ctrl.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,8 @@

beforeEach(function () {
var directiveOptions = {
contactId: CRM.vars.leaveAndAbsences.contactId
contactId: CRM.vars.leaveAndAbsences.contactId,
isSelfRecord: true
};

initTestController(directiveOptions);
Expand Down
4 changes: 3 additions & 1 deletion uk.co.compucorp.civicrm.hrleaveandabsences/views/my-leave/components/my-leave-container.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<div class="button-container">
<leave-request-create-dropdown
btn-class="btn-primary"
contact-id="myleave.contactId">
contact-id="myleave.contactId"
selected-contact-id="myleave.contactId"
is-self-record="true">
</leave-request-create-dropdown>
</div>
<div class="tabs-container">
Expand Down
3 changes: 2 additions & 1 deletion ...orp.civicrm.hrleaveandabsences/views/shared/components/leave-request-create-dropdown.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
href="#"
leave-request-popup leave-type="{{option.type}}"
contact-id="vm.contactId"
selected-contact-id="vm.selectedContactId">
selected-contact-id="vm.selectedContactId"
is-self-record="vm.isSelfRecord">
<i class="fa fa-{{option.icon}}" aria-hidden="true"></i> {{option.label}}
</a>
</li>
Expand Down
1 change: 1 addition & 0 deletions ...pucorp.civicrm.hrleaveandabsences/views/shared/components/staff-leave-calendar-month.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ <h2 class="panel-title">{{calendar.monthLabels[month.month] + " " + month.year}}
<a ng-if="day.leaveRequest"
contact-id="calendar.contactId"
selected-contact-id="$root.settings.contactId"
is-self-record="true"
leave-request-popup
leave-request="day.leaveRequest"
title="Click to open this leave request">
Expand Down
9 changes: 6 additions & 3 deletions uk.co.compucorp.civicrm.hrleaveandabsences/views/shared/components/staff-leave-report.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@
ng-switch-when="true"
leave-request-popup
leave-request="request"
contact-id="report.contactId">
contact-id="report.contactId"
is-self-record="true">
{{action}}
</a>
<a href ng-switch-default ng-click="report.action(request, action)">
Expand Down Expand Up @@ -398,7 +399,8 @@
ng-switch-when="true"
leave-request-popup
leave-request="request"
contact-id="report.contactId">
contact-id="report.contactId"
is-self-record="true">
{{action}}
</a>
<a href ng-switch-default ng-click="report.action(request, action)">
Expand Down Expand Up @@ -500,7 +502,8 @@
ng-switch-when="true"
leave-request-popup
leave-request="request"
contact-id="report.contactId">
contact-id="report.contactId"
is-self-record="true">
{{action}}
</a>
<a href ng-switch-default ng-click="report.action(request, action)">
Expand Down
4 changes: 2 additions & 2 deletions ...absences/views/shared/directives/leave-request-popup/leave-request-popup-details-tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
<div class="col-xs-4">
<span
class="chr_leave-request-modal__span-expiry"
ng-if="!$ctrl.canManage">
ng-if="!$ctrl.canManage || $ctrl.isSelfRecord">
{{$ctrl.request.toil_expiry_date | date: $ctrl.uiOptions.userDateFormat}}
</span>
<div ng-if="$ctrl.canManage" class="input-group">
<div ng-if="$ctrl.canManage && !$ctrl.isSelfRecord" class="input-group">
<input
type="text"
class="form-control"
Expand Down
2 changes: 1 addition & 1 deletion ...veandabsences/views/shared/directives/leave-request-popup/leave-request-popup-footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</button>
<a
class="text-danger pull-left pointer chr_leave-request-modal__delete"
ng-if="$ctrl.isRole('admin') && $ctrl.directiveOptions.leaveRequest.id"
ng-if="$ctrl.isRole('admin') && $ctrl.directiveOptions.leaveRequest.id && !$ctrl.isSelfRecord"
ng-click="$ctrl.deleteLeaveRequest()">
<i class="fa fa-trash-o" aria-hidden="true"></i> Delete
</a>
Expand Down
8 changes: 4 additions & 4 deletions ...m.hrleaveandabsences/views/shared/directives/leave-request-popup/leave-request-popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@

<crm-loading show="!$ctrl.loading.absenceTypes">
<div
ng-show="$ctrl.canManage && !$ctrl.isMode('create')"
ng-show="$ctrl.canManage && !$ctrl.isMode('create') && !$ctrl.isSelfRecord"
class="row chr_leave-request-modal__user-info">
<span class="col-xs-6">{{$ctrl.contactName}}</span>
<span class="col-xs-6">{{::$ctrl.getStatusFromValue($ctrl.request.status_id).label}}</span>
</div>
<!-- ng-show is required in model as it was not showing the list of managees for ui-select-choices-->
<div class="modal-body chr_leave-request-modal__form">
<div ng-show="$ctrl.canManage && !$ctrl.isMode('edit')">
<div class="modal-body chr_leave-request-modal__form" ng-if="!$ctrl.loading.absenceTypes">
<div ng-show="$ctrl.canManage && !$ctrl.isMode('edit') && !$ctrl.isSelfRecord">
<ui-select
autofocus
ng-model="$ctrl.request.contact_id"
Expand Down Expand Up @@ -74,7 +74,7 @@
</div>
</div>
<div
ng-show="$ctrl.canManage"
ng-show="$ctrl.canManage && !$ctrl.isSelfRecord"
class="row chr_leave-request-modal__response">
<div class="col-xs-12 form-horizontal">
<div class="form-group">
Expand Down