PCHR-2395: Amend templates

compucorp · Jul 13, 2017 · df49841 · df49841
1 parent a0292a0
commit df49841
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 12 deletions.
diff --git a/uk.co.compucorp.civicrm.hrleaveandabsences/views/my-leave/components/my-leave-container.html b/uk.co.compucorp.civicrm.hrleaveandabsences/views/my-leave/components/my-leave-container.html
@@ -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">

diff --git a/...orp.civicrm.hrleaveandabsences/views/shared/components/leave-request-create-dropdown.html b/...orp.civicrm.hrleaveandabsences/views/shared/components/leave-request-create-dropdown.html
@@ -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>

diff --git a/...pucorp.civicrm.hrleaveandabsences/views/shared/components/staff-leave-calendar-month.html b/...pucorp.civicrm.hrleaveandabsences/views/shared/components/staff-leave-calendar-month.html
@@ -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">

diff --git a/uk.co.compucorp.civicrm.hrleaveandabsences/views/shared/components/staff-leave-report.html b/uk.co.compucorp.civicrm.hrleaveandabsences/views/shared/components/staff-leave-report.html
@@ -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)">
@@ -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)">
@@ -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)">

diff --git a/...absences/views/shared/directives/leave-request-popup/leave-request-popup-details-tab.html b/...absences/views/shared/directives/leave-request-popup/leave-request-popup-details-tab.html
@@ -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"

diff --git a/...veandabsences/views/shared/directives/leave-request-popup/leave-request-popup-footer.html b/...veandabsences/views/shared/directives/leave-request-popup/leave-request-popup-footer.html
@@ -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>

diff --git a/...m.hrleaveandabsences/views/shared/directives/leave-request-popup/leave-request-popup.html b/...m.hrleaveandabsences/views/shared/directives/leave-request-popup/leave-request-popup.html
@@ -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"
@@ -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">