Merge pull request #1599 from openhealthcare/1597-remove-jump-to-epis…

…ode-from-search 1597 remove jump to episode from search
openhealthcare · Oct 8, 2018 · e5fb95e · e5fb95e
2 parents e335dd7 + 8c14c51
commit e5fb95e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 51 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 ### 0.13.0 (Major Release)
 
+#### Removes scope.jumpToEpisode and scope.getEpisodeId from Search and Extract
+
+We no longer use these functions, instead we use an HTML link to the patient detail view.
 
 #### Removes Patient.to_dict().active_episode_id
 

diff --git a/opal/core/search/static/js/search/controllers/extract.js b/opal/core/search/static/js/search/controllers/extract.js
@@ -343,9 +343,4 @@ angular.module('opal.controllers').controller(
         $scope.filters.push(result);
       });
     };
-
-    $scope.jumpToEpisode = function(episode){
-        window.open('#/episode/'+episode.id, '_blank');
-    };
-
 });
diff --git a/opal/core/search/static/js/search/controllers/search.js b/opal/core/search/static/js/search/controllers/search.js
@@ -108,13 +108,4 @@ angular.module('opal.controllers').controller(
 
     $window.location.href = searchUrl + '/#/' + "?" + $.param(params);
   };
-
-  $scope.getEpisodeID = function(patient){
-    return _.first(_.keys(patient.episodes));
-  };
-
-  $scope.jumpToEpisode = function(patient){
-    $location.path('/episode/'+$scope.getEpisodeID(patient));
-  };
-
 });
diff --git a/opal/core/search/static/js/test/extract.controller.test.js b/opal/core/search/static/js/test/extract.controller.test.js
@@ -768,16 +768,6 @@ describe('ExtractCtrl', function(){
 
     });
 
-    describe('jumpToEpisode()', function() {
-
-        it('should open the tab', function() {
-            spyOn($window, 'open');
-            $scope.jumpToEpisode({id: 2});
-            expect($window.open).toHaveBeenCalledWith('#/episode/2', '_blank');
-        });
-
-    });
-
     describe('Getting searchable columns', function(){
         it('should only get the columns that are advanced searchable', function(){
             expect($scope.columns).toEqual([

diff --git a/opal/core/search/static/js/test/search.controller.test.js b/opal/core/search/static/js/test/search.controller.test.js
@@ -169,31 +169,4 @@ describe('SearchCtrl', function (){
             $httpBackend.flush();
         });
     });
-
-    describe('getEpisodeId', function() {
-
-        it('should use the first episode', function() {
-            var patient = {
-                episodes: {
-                    42: {}, //dummy episode
-                    8738: {} // another dummy episode
-                }
-            }
-            expect($scope.getEpisodeID(patient)).toEqual('42');
-        });
-
-    });
-
-    describe('jumpToEpisode()', function (){
-        it('Should call location.path()', function () {
-          $scope.jumpToEpisode({
-            episodes: {
-              555: {},
-              8492: {}
-            }
-          });
-          expect(location.path).toHaveBeenCalledWith('/episode/555');
-        });
-    });
-
 });