BAH-3445 | Fix. Unsaved Alert Popup Issue When Saved Orders Are Removed

* Parvathy | BAH-3445 | Fix. Alert Message after Removing Orders * Parvathy | BAH-3445 | Fix. Eslint issues
Bahmni · Jan 19, 2024 · 7dc0eac · 7dc0eac
1 parent ed3d493
commit 7dc0eac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/ui/app/clinical/consultation/controllers/consultationController.js b/ui/app/clinical/consultation/controllers/consultationController.js
@@ -544,6 +544,7 @@ angular.module('bahmni.clinical').controller('ConsultationController',
                             return encounterService.create(encounterData)
                             .then(function (saveResponse) {
                                 $state.dirtyConsultationForm = false;
+                                $state.orderRemoved = false;
                                 $scope.$parent.$broadcast("event:changes-saved");
                                 var messageParams = {
                                     encounterUuid: saveResponse.data.encounterUuid,

diff --git a/ui/app/clinical/consultation/controllers/orderController.js b/ui/app/clinical/consultation/controllers/orderController.js
@@ -54,6 +54,7 @@ angular.module('bahmni.clinical')
                 if (order) {
                     if (order.uuid) {
                         order.isDiscontinued = true;
+                        $state.orderRemoved = true;
                     } else {
                         _.remove($scope.consultation.orders, order);
                     }
@@ -133,7 +134,7 @@ angular.module('bahmni.clinical')
             };
 
             $scope.$on('$stateChangeStart', function () {
-                if ($scope.consultation.orders.length !== $scope.consultation.investigations.length) {
+                if ($state.orderRemoved || ($scope.consultation.orders.length > $scope.consultation.investigations.length)) {
                     $state.dirtyConsultationForm = true;
                 }
             });

diff --git a/ui/test/unit/clinical/controllers/orderController.spec.js b/ui/test/unit/clinical/controllers/orderController.spec.js
@@ -44,7 +44,7 @@ describe("OrderController", function () {
             retrospectiveEntryService: retrospectiveEntryService,
             appService: appServiceMock,
             $translate: translate,
-            $state: $state
+            $state: {}
         });
     }));