A-1206201729443040 | Navigation to clinical dashboard and discharge s…

…ummary tab from IPD dashboard (#802) * add. navigation for discharge summary * add. navigation to discharge summary for ipd patient * fix. test failures * handle navigations from adt to new ipd screen * fix. test failures
Bahmni · vikramdasvaishnav-thoughtworks · Jul 24, 2023 · Jul 24, 2023 · Jul 24, 2023 · Jul 27, 2023
commit 10801ffd3abf5be62e2c005cf07ed640460ce8c2
diff --git a/micro-frontends/src/ipd/IpdDashboard.jsx b/micro-frontends/src/ipd/IpdDashboard.jsx
@@ -9,6 +9,7 @@ export function IpdDashboard(props) {
       <Suspense fallback={<p>Loading...</p>}>
         <LazyApp
           hostData={props.hostData}
+          hostApi={props.hostApi}
         />
       </Suspense>
     </>
@@ -21,4 +22,9 @@ IpdDashboard.propTypes = {
     patientId: PropTypes.string,
     forDate: PropTypes.instanceOf(Date),
   }).isRequired,
+  hostApi: PropTypes.shape({
+    navigation: PropTypes.shape({
+      dischargeSummary: PropTypes.func.isRequired,
+    }).isRequired,
+  }).isRequired,
 };
diff --git a/ui/app/adt/constants.js b/ui/app/adt/constants.js
@@ -7,7 +7,8 @@ Bahmni.ADT.Constants = (function () {
     return {
         patientsListUrl: "/patient/search",
         ipdDashboard: "#/patient/{{patientUuid}}/visit/{{visitUuid}}/",
-        admissionLocationUrl: "/openmrs/ws/rest/v1/admissionLocation/"
+        admissionLocationUrl: "/openmrs/ws/rest/v1/admissionLocation/",
+        mfeIpdDashboard: Bahmni.Common.Constants.hostURL + '/bahmni/clinical/#/default/patient/{{patientUuid}}/dashboard/visit/ipd/{{visitUuid}}/'
     };
 })();
 
diff --git a/ui/app/adt/controllers/adtController.js b/ui/app/adt/controllers/adtController.js
@@ -16,9 +16,6 @@ angular.module('bahmni.adt')
             $scope.dashboardConfig = appService.getAppDescriptor().getConfigValue('dashboard');
             $scope.enableIPDFeature = appService.getAppDescriptor().getConfigValue('enableIPDFeature');
             $scope.getAdtConceptConfig = $scope.dashboardConfig.conceptName;
-            $scope.hostData = {
-                patient: $scope.patient
-            };
 
             var getVisitTypeUuid = function (visitTypeName) {
                 var visitType = _.find(visitTypes, {name: visitTypeName});

diff --git a/ui/app/adt/controllers/wardListController.js b/ui/app/adt/controllers/wardListController.js
@@ -3,10 +3,15 @@
 angular.module('bahmni.adt')
     .controller('WardListController', ['$scope', 'queryService', 'spinner', '$q', '$window', '$stateParams', 'appService', '$rootScope',
         function ($scope, queryService, spinner, $q, $window, $stateParams, appService, $rootScope) {
+            const enableIPDFeature = appService.getAppDescriptor().getConfigValue('enableIPDFeature');
             $scope.gotoPatientDashboard = function (patientUuid, visitUuid) {
                 var options = $.extend({}, $stateParams);
                 $.extend(options, {patientUuid: patientUuid, visitUuid: visitUuid || null});
-                $window.location = appService.getAppDescriptor().formatUrl(Bahmni.ADT.Constants.ipdDashboard, options, true);
+                if (enableIPDFeature) {
+                    $window.location = appService.getAppDescriptor().formatUrl(Bahmni.ADT.Constants.mfeIpdDashboard, options, true);
+                } else {
+                    $window.location = appService.getAppDescriptor().formatUrl(Bahmni.ADT.Constants.ipdDashboard, options, true);
+                }
             };
 
             $scope.searchText = '';

diff --git a/ui/app/adt/views/dashboard.html b/ui/app/adt/views/dashboard.html
@@ -1,4 +1,4 @@
-<div ng-hide="enableIPDFeature" class="adt">
+<div class="adt">
     <div class="box">
         <div>
             <label>
@@ -33,4 +33,3 @@
     </div>
     <dashboard patient="patient" config="dashboardConfig" section-groups="sectionGroups" active-visit-uuid="visitSummary.uuid" visit-summary="visitSummary"></dashboard>
 </div>
-<mfe-ipd-dashboard ng-if="enableIPDFeature" style="display: block;width: 100vw;margin-left: calc(50% - 50vw);" host-data="hostData"></mfe-ipd-dashboard>
diff --git a/ui/app/clinical/app.js b/ui/app/clinical/app.js
@@ -346,6 +346,23 @@ angular.module('consultation')
                     }
                 }
             })
+            .state('patient.dashboard.ipdVisit', {
+                url: '/dashboard/visit/ipd/:visitUuid/:tab',
+                data: {
+                    backLinks: [patientSearchBackLink]
+                },
+                views: {
+                    'dashboard-content': {
+                        templateUrl: 'common/views/visitIpd.html',
+                        controller: 'VisitController'
+                    }
+                },
+                resolve: {
+                    visitSummary: function (visitSummaryInitialization, $stateParams) {
+                        return visitSummaryInitialization($stateParams.visitUuid);
+                    }
+                }
+            })
             .state('patient.dashboard.visitPrint', {
                 url: '/dashboard/visit/:visitUuid/:tab/:print',
                 views: {

diff --git a/ui/app/clinical/common/controllers/visitController.js b/ui/app/clinical/common/controllers/visitController.js
@@ -1,8 +1,8 @@
 'use strict';
 
 angular.module('bahmni.clinical')
-    .controller('VisitController', ['$scope', '$state', '$rootScope', '$q', 'encounterService', 'clinicalAppConfigService', 'configurations', 'visitSummary', '$timeout', 'printer', 'visitConfig', 'visitHistory', '$stateParams', 'locationService', 'visitService', 'appService', 'diagnosisService', 'observationsService', 'allergyService',
-        function ($scope, $state, $rootScope, $q, encounterService, clinicalAppConfigService, configurations, visitSummary, $timeout, printer, visitConfig, visitHistory, $stateParams, locationService, visitService, appService, diagnosisService, observationsService, allergyService) {
+    .controller('VisitController', ['$scope', '$state', '$rootScope', '$q', 'encounterService', '$window', 'clinicalAppConfigService', 'configurations', 'visitSummary', '$timeout', 'printer', 'visitConfig', 'visitHistory', '$stateParams', 'locationService', 'visitService', 'appService', 'diagnosisService', 'observationsService', 'allergyService',
+        function ($scope, $state, $rootScope, $q, encounterService, $window, clinicalAppConfigService, configurations, visitSummary, $timeout, printer, visitConfig, visitHistory, $stateParams, locationService, visitService, appService, diagnosisService, observationsService, allergyService) {
             var encounterTypeUuid = configurations.encounterConfig().getPatientDocumentEncounterTypeUuid();
             $scope.documentsPromise = encounterService.getEncountersForEncounterType($scope.patient.uuid, encounterTypeUuid).then(function (response) {
                 return new Bahmni.Clinical.PatientFileObservationsMapper().map(response.data.results);
@@ -12,7 +12,6 @@ angular.module('bahmni.clinical')
             var showProviderInfo = appService.getAppDescriptor().getConfigValue('showProviderInfoinVisits');
             $scope.showProviderInfo = showProviderInfo !== false ? true : showProviderInfo;
             var showPatientInfo = appService.getAppDescriptor().getConfigValue('showPatientInfoInVisits');
-            var enableIPDFeature = appService.getAppDescriptor().getConfigValue('enableIPDFeature');
             $scope.showPatientInformation = showPatientInfo !== false ? true : showPatientInfo;
             $scope.visitHistory = visitHistory; // required as this visit needs to be overridden when viewing past visits
             $scope.visitSummary = visitSummary;
@@ -21,10 +20,17 @@ angular.module('bahmni.clinical')
             $scope.patientUuid = $stateParams.patientUuid;
             $scope.visitUuid = $stateParams.visitUuid;
             $scope.isActiveIpdVisit = $scope.visitSummary.visitType === "IPD" && $scope.visitSummary.stopDateTime === null;
-            $scope.showIPDDashboard = enableIPDFeature && $scope.isActiveIpdVisit;
             $scope.ipdDashboard = {
                 hostData: {
                     patient: {uuid: $scope.patientUuid}
+                },
+                hostApi: {
+                    navigation: {
+                        dischargeSummary: function () {
+                            const dischargeSummaryUrl = $state.href('patient.dashboard.visit', {visitUuid: $scope.visitUuid});
+                            $window.open(dischargeSummaryUrl, '_blank');
+                        }
+                    }
                 }
             };
             var tab = $stateParams.tab;

diff --git a/ui/app/clinical/common/controllers/visitHeaderController.js b/ui/app/clinical/common/controllers/visitHeaderController.js
@@ -10,14 +10,6 @@ angular.module('bahmni.clinical')
             $scope.visitTabConfig = visitConfig;
             $scope.showMobileMenu = false;
             $scope.visitPage = true;
-            var enableIPDFeature = clinicalAppConfigService.getIsIPDFeatureEnabled();
-
-            visitHistory.visits.forEach(function (visit) {
-                if (visit.uuid === $stateParams.visitUuid) {
-                    $scope.isActiveIpdVisit = visit.stopDatetime === null && visit.visitType.name === "IPD";
-                }
-            });
-            $scope.showPatientHeader = !(enableIPDFeature && $scope.isActiveIpdVisit);
             var encounterTypeUuid = configurations.encounterConfig().getPatientDocumentEncounterTypeUuid();
             $scope.patientDocumentsPromise = encounterService.getEncountersForEncounterType($scope.patient.uuid, encounterTypeUuid).then(function (response) {
                 return new Bahmni.Clinical.PatientFileObservationsMapper().map(response.data.results);

diff --git a/ui/app/clinical/common/models/auditLogEventDetails.js b/ui/app/clinical/common/models/auditLogEventDetails.js
@@ -11,6 +11,7 @@ Bahmni.Clinical.StateNameEvenTypeMap = {
     "patient.dashboard.show.investigation": "VIEWED_INVESTIGATION_TAB",
     "patient.visit.summaryprint": "VIEWED_SUMMARY_PRINT",
     "patient.dashboard.visit": "VIEWED_VISIT_DASHBOARD",
+    "patient.dashboard.ipdVisit": "VIEWED_VISIT_DASHBOARD",
     "patient.dashboard.visitPrint": "VIEWED_VISIT_PRINT",
     "patient.dashboard.observation": "VIEWED_DASHBOARD_OBSERVATION",
     "patient.patientProgram.show": "VIEWED_PATIENTPROGRAM"

diff --git a/ui/app/clinical/common/views/visit.html b/ui/app/clinical/common/views/visit.html
@@ -1,3 +1 @@
-<div ng-hide="showIPDDashboard" class="visit visit-summary-page" bindonce="visit" ng-include="'common/views/visitSummary.html'"></div>
-
-<mfe-ipd-dashboard ng-if="showIPDDashboard" style="display: block;width: 100vw;margin-left: calc(50% - 50vw);" host-data="ipdDashboard.hostData" host-api="ipdDashboard.hostApi"></mfe-ipd-dashboard>
+<div class="visit visit-summary-page" bindonce="visit" ng-include="'common/views/visitSummary.html'"></div>
diff --git a/ui/app/clinical/common/views/visitHeader.html b/ui/app/clinical/common/views/visitHeader.html
@@ -1,4 +1,4 @@
-<div ng-show="showPatientHeader" bindonce class="dashboard-header opd-header-wrapper" id="consultation-header">
+<div bindonce class="dashboard-header opd-header-wrapper" id="consultation-header">
     <div class="opd-header-bottom tabs hidden-mobile">
         <bm-back-links></bm-back-links>
 

diff --git a/ui/app/clinical/common/views/visitIpd.html b/ui/app/clinical/common/views/visitIpd.html
@@ -0,0 +1 @@
+<mfe-ipd-dashboard style="display: block;width: 100vw;margin-left: calc(50% - 50vw);" host-data="ipdDashboard.hostData" host-api="ipdDashboard.hostApi"></mfe-ipd-dashboard>
diff --git a/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js b/ui/app/clinical/displaycontrols/allvisits/directives/visitsTable.js
@@ -1,17 +1,22 @@
 'use strict';
 
 angular.module('bahmni.clinical')
-    .directive('visitsTable', ['patientVisitHistoryService', 'conceptSetService', 'spinner', '$state', '$q', '$translate',
-        function (patientVisitHistoryService, conceptSetService, spinner, $state, $q, $translate) {
+    .directive('visitsTable', ['patientVisitHistoryService', 'conceptSetService', 'spinner', '$state', '$q', '$translate', 'appService',
+        function (patientVisitHistoryService, conceptSetService, spinner, $state, $q, $translate, appService) {
             var controller = function ($scope) {
+                const enableIPDFeature = appService.getAppDescriptor().getConfigValue('enableIPDFeature');
                 var emitNoDataPresentEvent = function () {
                     $scope.$emit("no-data-present-event");
                 };
                 $scope.openVisit = function (visit) {
                     if ($scope.$parent.closeThisDialog) {
                         $scope.$parent.closeThisDialog("closing modal");
                     }
-                    $state.go('patient.dashboard.visit', {visitUuid: visit.uuid});
+                    if (visit.isActive() && enableIPDFeature) {
+                        $state.go('patient.dashboard.ipdVisit', {visitUuid: visit.uuid});
+                    } else {
+                        $state.go('patient.dashboard.visit', {visitUuid: visit.uuid});
+                    }
                 };
 
                 $scope.hasVisits = function () {

diff --git a/ui/test/unit/adt/controllers/wardListController.spec.js b/ui/test/unit/adt/controllers/wardListController.spec.js
@@ -7,14 +7,19 @@ describe('WardListController', function () {
     var scope;
     var queryService, appService, window;
 
-
     beforeEach(function () {
         module('bahmni.adt');
 
         module(function ($provide) {
-            appService = jasmine.createSpyObj('appService', ['getAppDescriptor']);
-            appService.getAppDescriptor.and.returnValue(new Bahmni.Common.AppFramework.AppDescriptor());
+            var realAppDescriptor = new Bahmni.Common.AppFramework.AppDescriptor();
+            realAppDescriptor.getConfigValue = function (config) {
+                if (config === 'enableIPDFeature') {
+                    return false;
+                }
+            };
 
+            appService = jasmine.createSpyObj('appService', ['getAppDescriptor']);
+            appService.getAppDescriptor.and.returnValue(realAppDescriptor);
             $provide.value('appService', {});
             queryService = jasmine.createSpyObj('queryService', ['getResponseFromQuery']);
             queryService.getResponseFromQuery.and.returnValue(specUtil.createServicePromise('queryService'));

diff --git a/ui/test/unit/clinical/displaycontrols/visitsTable.spec.js b/ui/test/unit/clinical/displaycontrols/visitsTable.spec.js
@@ -1,7 +1,7 @@
 'use strict';
 
 describe("Visits Table display control", function () {
-    var element, scope, $compile, mockBackend, conceptSetService, visitFormService,patientVisitHistoryService, $translate;
+    var element, scope, $compile, mockBackend, conceptSetService, visitFormService, patientVisitHistoryService, $translate, appService;
 
     beforeEach(module('ngHtml2JsPreprocessor'));
     beforeEach(module('bahmni.clinical'));
@@ -10,6 +10,14 @@ describe("Visits Table display control", function () {
         visitFormService = jasmine.createSpyObj('visitFormService', ['formData']);
         $translate = jasmine.createSpyObj('$translate', ['instant']);
         patientVisitHistoryService= jasmine.createSpyObj('patientVisitHistoryService', ['getVisitHistory']);
+        appService = jasmine.createSpyObj('appService', ['getAppDescriptor']);
+        appService.getAppDescriptor.and.returnValue({
+            getConfigValue: function (config) {
+                if (config == 'enableIPDFeature') {
+                    return true;
+                }
+            }
+        });
         $provide.value('$state', {});
         $provide.value('$bahmniCookieStore', {});
         $provide.value('clinicalAppConfigService', {getObsIgnoreList: function(){return []}});
@@ -18,6 +26,7 @@ describe("Visits Table display control", function () {
         $provide.value('visitFormService', visitFormService);
         $provide.value('patientVisitHistoryService', patientVisitHistoryService);
         $provide.value('$translate', $translate);
+        $provide.value('appService', appService);
     }));
 
     beforeEach(inject(function (_$compile_, $rootScope, $httpBackend) {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<mfe-ipd-dashboard style="display: block;width: 100vw;margin-left: calc(50% - 50vw);" host-data="ipdDashboard.hostData" host-api="ipdDashboard.hostApi"></mfe-ipd-dashboard>