Merge pull request #2990 from compucorp/PCHR-4537-remove-leave-request-notes

PCHR-4537: Remove leave request notes

Author: reneolivo

uk.co.compucorp.civicrm.hrleaveandabsences/js/dist/absence-tab.min.js

@@ -18,6 +18,8 @@ define([
   ];
 
   function LeavePopupService ($log, $rootElement, $rootScope, $modal, notification, sharedSettings, DateFormat, Session, LeaveRequest) {
+    var BACKDROP_CLICK_EVENT_NAME = 'backdrop click';
+
     $log.debug('LeavePopup');
 
     return {
@@ -67,7 +69,13 @@ define([
             return DateFormat.getDateFormat();
           }]
         }
-      });
+      })
+        .result
+        .catch(function (error) {
+          if (error !== BACKDROP_CLICK_EVENT_NAME) {
+            throw error;
+          }
+        });
     }
 
     /**

uk.co.compucorp.civicrm.hrleaveandabsences/js/dist/admin-dashboard.min.js

@@ -27,6 +27,9 @@ define([
 
       spyOn(LeaveRequest, 'find');
       spyOn(notification, 'error');
+      $uibModal.open.and.returnValue({
+        result: $q.resolve()
+      });
     }));
 
     describe('openModal()', function () {
@@ -68,6 +71,59 @@ define([
             .directiveOptions().defaultStatus).toBe(defaultStatus);
         });
       });
+
+      describe('resolving the modal', function () {
+        describe('when the modal resolves as normal', function () {
+          beforeEach(function () {
+            $uibModal.open.and.returnValue({
+              result: $q.resolve()
+            });
+
+            LeavePopup.openModal();
+          });
+
+          it('does not emit an error', function () {
+            expect(function () {
+              $rootScope.$digest();
+            })
+              .not.toThrow();
+          });
+        });
+
+        describe('when the modal is rejected by the "backdrop click" event', function () {
+          beforeEach(function () {
+            $uibModal.open.and.returnValue({
+              result: $q.reject('backdrop click')
+            });
+
+            LeavePopup.openModal();
+          });
+
+          it('does not emit an error', function () {
+            expect(function () {
+              $rootScope.$digest();
+            })
+              .not.toThrow();
+          });
+        });
+
+        describe('when the modal is rejected by any reason other than the "backdrop click" event', function () {
+          beforeEach(function () {
+            $uibModal.open.and.returnValue({
+              result: $q.reject('another reason')
+            });
+
+            LeavePopup.openModal();
+          });
+
+          it('emits an error', function () {
+            expect(function () {
+              $rootScope.$digest();
+            })
+              .toThrow();
+          });
+        });
+      });
     });
 
     describe('openModalByID()', function () {

uk.co.compucorp.civicrm.hrleaveandabsences/js/dist/manager-leave.min.js

@@ -94,24 +94,6 @@
           </div>
         </div>
       </div>
-      <div ng-show="$ctrl.request.selectedResponse == 3">
-        <div class="col-xs-12">Please add a comment:</div>
-        <div class="col-xs-12">
-          <div
-            class="chr_wysiwyg"
-            text-angular
-            prevent-animations
-            ta-toolbar="[['bold','italics','underline']]"
-            ng-model="myleave.request.responseComment"></div>
-          <div class="chr_wysiwyg__action">
-            <hr/>
-            <button class="btn btn-link">
-              <i class="fa fa-comment-o" aria-hidden="true"></i>
-              Add comment
-            </button>
-          </div>
-        </div>
-      </div>
     </div>
   </div>
 </div>