Keerthi | MOBN-2397 | Remove. additional information in medications t…

…ab (#78) * Keerthi | MOBN-2397 | Remove. additional information in medications tab * Keerthi | MOBN-2397 | Add. appService to drugOrderHistory * Keerthi | MOBN-2397 | hideAdditonalInstructions for new drug orders * Keerthi | MOBN-2397 | Add. mockAppService and mockAppDescriptor in drugOrderHistoryController test
bahmni-msf · Jun 28, 2024 · 54b0c8a · 54b0c8a
1 parent e214da9
commit 54b0c8a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js b/ui/app/clinical/consultation/controllers/drugOrderHistoryController.js
@@ -2,8 +2,8 @@
 
 angular.module('bahmni.clinical')
     .controller('DrugOrderHistoryController', ['$scope', '$filter', '$stateParams', 'activeDrugOrders',
-        'treatmentConfig', 'treatmentService', 'spinner', 'drugOrderHistoryHelper', 'visitHistory', '$translate', '$rootScope',
-        function ($scope, $filter, $stateParams, activeDrugOrders, treatmentConfig, treatmentService, spinner,
+        'treatmentConfig', 'treatmentService', 'appService', 'spinner', 'drugOrderHistoryHelper', 'visitHistory', '$translate', '$rootScope',
+        function ($scope, $filter, $stateParams, activeDrugOrders, treatmentConfig, treatmentService, appService, spinner,
                    drugOrderHistoryHelper, visitHistory, $translate, $rootScope) {
             var DrugOrderViewModel = Bahmni.Clinical.DrugOrderViewModel;
             var DateUtil = Bahmni.Common.Util.DateUtil;
@@ -12,6 +12,7 @@ angular.module('bahmni.clinical')
             var prescribedDrugOrders = [];
             $scope.dispensePrivilege = Bahmni.Clinical.Constants.dispensePrivilege;
             $scope.scheduledDate = DateUtil.getDateWithoutTime(DateUtil.addDays(DateUtil.now(), 1));
+            $scope.hideAdditionalInstructions = appService.getAppDescriptor().getConfigValue("hideAdditionalInstructions");
 
             var createPrescriptionGroups = function (activeAndScheduledDrugOrders) {
                 $scope.consultation.drugOrderGroups = [];

diff --git a/ui/app/clinical/consultation/directives/newDrugOrders.js b/ui/app/clinical/consultation/directives/newDrugOrders.js
@@ -1,8 +1,9 @@
 'use strict';
 
 angular.module('bahmni.clinical')
-    .directive('newDrugOrders', ['messagingService', function (messagingService) {
+    .directive('newDrugOrders', ['messagingService', 'appService', function (messagingService, appService) {
         var controller = function ($scope, $rootScope) {
+            $scope.hideAdditionalInstructions = appService.getAppDescriptor().getConfigValue("hideAdditionalInstructions");
             $scope.edit = function (drugOrder, index) {
                 $rootScope.$broadcast("event:editDrugOrder", drugOrder, index);
             };

diff --git a/ui/app/clinical/consultation/views/newDrugOrders.html b/ui/app/clinical/consultation/views/newDrugOrders.html
@@ -55,7 +55,7 @@ <h2 class="section-title fl">{{ ::'MEDICATION_NEW_PRESCRIPTION' | translate}}</h
                 <div>
                     <span ng-if="newTreatment.asNeeded">{{newTreatment.getAsNeededText(newTreatment.asNeeded)}}, </span>
                     <span ng-if="newTreatment.route">{{newTreatment.route}}, </span>
-                    {{newTreatment.instructions}} | 
+                    <span ng-hide="hideAdditionalInstructions">{{newTreatment.instructions}} |</span>
                 </div>
                 <div ng-if="newTreatment.additionalInstructions">
                     {{newTreatment.additionalInstructions}} | 

diff --git a/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html b/ui/app/clinical/consultation/views/treatmentSections/drugOrderHistory.html
@@ -63,7 +63,7 @@
                                     <div>
                                         <span ng-if="drugOrder.asNeeded">{{drugOrder.getAsNeededText(drugOrder.asNeeded)}}, </span>
                                         <span nf-if="drugOrder.route"> {{drugOrder.route}}, </span>
-                                        {{drugOrder.instructions}} | 
+                                        <span ng-hide="hideAdditionalInstructions">{{drugOrder.instructions}} |</span>
                                     </div>
                                     <div ng-if="drugOrder.additionalInstructions">{{drugOrder.additionalInstructions}} | </div>
                                     <div>{{drugOrder.getQuantityWithUnit()}}</div>

diff --git a/ui/test/unit/clinical/controllers/drugOrderHistoryController.spec.js b/ui/test/unit/clinical/controllers/drugOrderHistoryController.spec.js
@@ -13,6 +13,14 @@ describe("DrugOrderHistoryController", function () {
         }
     }
 
+    var mockAppDescriptor = jasmine.createSpyObj('appDescriptor', ['getConfigValue']);
+    var mockAppService = jasmine.createSpyObj("appService", ["getAppDescriptor"]);
+
+    beforeEach(function() {
+        mockAppDescriptor.getConfigValue.and.returnValue(treatmentConfig);
+        mockAppService.getAppDescriptor.and.returnValue(mockAppDescriptor);
+    });
+
     var translate;
     beforeEach(module(function ($provide) {
         translate = jasmine.createSpyObj('$translate', ['instant']);
@@ -57,7 +65,8 @@ describe("DrugOrderHistoryController", function () {
             visitContext: {},
             spinner: spinner,
             visitHistory: visitHistory,
-            treatmentConfig: treatmentConfig
+            treatmentConfig: treatmentConfig,
+            appService: mockAppService
         });
         rootScope.$apply();
     };