Skip to content

Commit

Permalink
Merge pull request #1293 from openhealthcare/352-our-progressbar-is-a…
Browse files Browse the repository at this point in the history 
…-liar

352 our progressbar is a liar
  • Loading branch information
@fredkingham
fredkingham committed Nov 18, 2017
2 parents 6a36779 + 0a7275f commit 9cfa0be
Show file tree
Hide file tree
Showing 10 changed files with 144 additions and 71 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
@@ -1,3 +1,9 @@
### 0.9.1 (Minor Release)

### Misc Changes

Fixes some instances of progressbars not being set if unexpected error states occur.

### 0.9.0 (Major Release)

#### Good bye date_of_episode, discharge_date, date_of_admission
Expand Down
33 changes: 19 additions & 14 deletions opal/core/search/static/js/search/controllers/save_filter.js
View file
@@ -1,20 +1,25 @@
angular.module('opal.controllers')
.controller('SaveFilterCtrl', function($scope, $modalInstance, ngProgressLite, Filter, params) {
$scope.model = params;
$scope.model = params;

$scope.save = function(result) {
var filter = new Filter($scope.model);
ngProgressLite.set(0);
ngProgressLite.start();
filter.save($scope.model).then(function(result) {
ngProgressLite.done();
$modalInstance.close(result);
});
};
$scope.save = function(result) {
var filter = new Filter($scope.model);
ngProgressLite.set(0);
ngProgressLite.start();
filter.save($scope.model).then(
function(result) {
ngProgressLite.done();
$modalInstance.close(result);
},
function() {
ngProgressLite.done();
}
);
};


$scope.cancel = function() {
$modalInstance.close('cancel');
};
$scope.cancel = function() {
$modalInstance.close('cancel');
};

})
})
15 changes: 10 additions & 5 deletions opal/core/search/static/js/search/controllers/search.js
View file
Expand Up @@ -53,11 +53,16 @@ angular.module('opal.controllers').controller(
ngProgressLite.set(0);
ngProgressLite.start();
var queryParams = $location.search();
queryBackend(queryParams).then(function(response){
ngProgressLite.done();
$scope.searched = true;
$scope.paginator = new Paginator($scope.search, response.data);
});
queryBackend(queryParams).then(
function(response){
ngProgressLite.done();
$scope.searched = true;
$scope.paginator = new Paginator($scope.search, response.data);
},
function(){
ngProgressLite.done();
}
);
}
};

Expand Down
1 change: 1 addition & 0 deletions opal/core/search/static/js/search/services/filter.js
View file
Expand Up @@ -33,6 +33,7 @@ recently changed it - refresh the page and try again');
} else {
$window.alert('Item could not be saved');
};
deferred.reject()
}
);
return deferred.promise;
Expand Down
34 changes: 22 additions & 12 deletions opal/core/search/static/js/test/save_filter.controller.test.js
View file
@@ -1,31 +1,31 @@
describe('SaveFilterCtrl', function() {
"use strict";

var $scope, $httpBackend, $controller, $rootScope, $modal;
var modalInstance;
var mock_ng_progress;
var $scope, $httpBackend, $controller, $rootScope, $modal, $window;
var modalInstance, ngProgressLite;


beforeEach(function(){
module('opal.controllers');

inject(function($injector){
$httpBackend = $injector.get('$httpBackend');
$rootScope = $injector.get('$rootScope');
$scope = $rootScope.$new();
$controller = $injector.get('$controller');
$modal = $injector.get('$modal');
$httpBackend = $injector.get('$httpBackend');
$rootScope = $injector.get('$rootScope');
$scope = $rootScope.$new();
$controller = $injector.get('$controller');
$modal = $injector.get('$modal');
ngProgressLite = $injector.get('ngProgressLite');
$window = $injector.get('$window');

});

modalInstance = $modal.open({template: 'notatemplate'});
mock_ng_progress = {

}

$controller('SaveFilterCtrl', {
$scope: $scope,
$modalInstance: modalInstance,
params: {}
params: {},
ngProgressLite: ngProgressLite
})
});

Expand All @@ -39,6 +39,16 @@ describe('SaveFilterCtrl', function() {
$httpBackend.flush();
});

it('should kill the progressbar if we error', function() {
$httpBackend.expectPOST('/search/filters/').respond(500)
spyOn(ngProgressLite, 'done');
spyOn($window, 'alert');
$scope.save();
$rootScope.$apply();
$httpBackend.flush();
expect(ngProgressLite.done).toHaveBeenCalledWith();
});

});

describe('cancel()', function(){
Expand Down
38 changes: 26 additions & 12 deletions opal/core/search/static/js/test/search.controller.test.js
View file
Expand Up @@ -2,6 +2,7 @@ describe('SearchCtrl', function (){
"use strict";

var $scope, $httpBackend, $window, $rootScope, $controller;
var ngProgressLite
var location;
var Flow;
var profile, schema, options, locationDetails, controller;
Expand All @@ -19,21 +20,21 @@ describe('SearchCtrl', function (){

inject(function($injector){

$rootScope = $injector.get('$rootScope');
$scope = $rootScope.$new();
$controller = $injector.get('$controller');
Flow = $injector.get('Flow');
PatientSummary = $injector.get('PatientSummary');
$httpBackend = $injector.get('$httpBackend');
location = $injector.get('$location');
$window = $injector.get('$window');
$analytics = $injector.get('$analytics');
$rootScope = $injector.get('$rootScope');
$scope = $rootScope.$new();
$controller = $injector.get('$controller');
Flow = $injector.get('Flow');
PatientSummary = $injector.get('PatientSummary');
$httpBackend = $injector.get('$httpBackend');
location = $injector.get('$location');
$window = $injector.get('$window');
$analytics = $injector.get('$analytics');
ngProgressLite = $injector.get('ngProgressLite');

schema = {};
options = {};
profile = {};


spyOn(location, 'path').and.returnValue("/search");

controller = $controller('SearchCtrl', {
Expand All @@ -44,10 +45,9 @@ describe('SearchCtrl', function (){
schema : schema,
profile : profile,
PatientSummary : PatientSummary,
$analytics: $analytics
$analytics : $analytics
});


});});

afterEach(function() {
Expand Down Expand Up @@ -122,6 +122,20 @@ describe('SearchCtrl', function (){
$httpBackend.flush();
});

it('loadResults() should reset the progressbar if we error.', function() {
location.search({
query: "Bond",
page_number: 1
});

var expectedUrl = "/search/simple/?query=Bond&page_number=1";
$httpBackend.expectGET().respond(500);
spyOn(ngProgressLite, 'done');
$scope.loadResults();
$httpBackend.flush();
expect(ngProgressLite.done).toHaveBeenCalledWith();
});

it("should redirect to the search page", function(){
locationDetails.href = "";
locationDetails.pathname = "/somewhere";
Expand Down
14 changes: 9 additions & 5 deletions opal/static/js/opal/controllers/edit_item.js
View file
Expand Up @@ -104,11 +104,15 @@ angular.module('opal.controllers').controller(
if(!angular.equals($scope.the_episode.makeCopy(), $scope.episode)){
to_save.push($scope.the_episode.save($scope.episode));
}

$q.all(to_save).then(function() {
ngProgressLite.done();
$modalInstance.close(result);
});
$q.all(to_save).then(
function() {
ngProgressLite.done();
$modalInstance.close(result);
},
function(){
ngProgressLite.done();
}
);
};

// Let's have a nice way to kill the modal.
Expand Down
15 changes: 10 additions & 5 deletions opal/static/js/opal/controllers/edit_teams.js
View file
Expand Up @@ -19,12 +19,17 @@ angular.module('opal.controllers').controller(
// Save the teams.
//
$scope.save = function(result) {
ngProgressLite.set(0);
ngProgressLite.start();
episode.tagging[0].save($scope.editing.tagging).then(function() {
ngProgressLite.done();
ngProgressLite.set(0);
ngProgressLite.start();
episode.tagging[0].save($scope.editing.tagging).then(
function() {
ngProgressLite.done();
$modalInstance.close(result);
});
},
function() {
ngProgressLite.done();
}
);
};

// Let's have a nice way to kill the modal.
Expand Down
28 changes: 20 additions & 8 deletions opal/static/js/test/edit_item.controller.test.js
View file
Expand Up @@ -24,17 +24,17 @@ describe('EditItemCtrl', function (){
$timeout = $injector.get('$timeout');
$modal = $injector.get('$modal');
ngProgressLite = $injector.get('ngProgressLite');
$rootScope = $injector.get('$rootScope');
$rootScope = $injector.get('$rootScope');
$modal = $injector.get('$modal');
opalTestHelper = $injector.get('opalTestHelper');
});

episode = opalTestHelper.newEpisode($rootScope);
metadataCopy = opalTestHelper.getMetaData();
profile = opalTestHelper.getUserProfile();
episode = opalTestHelper.newEpisode($rootScope);
metadataCopy = opalTestHelper.getMetaData();
profile = opalTestHelper.getUserProfile();
referencedata = opalTestHelper.getReferenceData();
$scope = $rootScope.$new();
item = new Item(
$scope = $rootScope.$new();
item = new Item(
{columnName: 'investigation'},
episode,
$rootScope.fields.investigation
Expand All @@ -55,8 +55,8 @@ describe('EditItemCtrl', function (){
profile : profile,
episode : episode,
ngProgressLite: ngProgressLite,
referencedata: referencedata,
$analytics: $analytics
referencedata : referencedata,
$analytics : $analytics
});

});
Expand Down Expand Up @@ -137,6 +137,18 @@ describe('EditItemCtrl', function (){
expect(callArgs[0]).toBe($scope.episode);
});

it('should cancel the progressbar if we fail to save', function() {
var deferred = $q.defer();
spyOn(ngProgressLite, 'done');
spyOn(item, 'save').and.callFake(function() {
return deferred.promise;
});
$scope.save('save');
deferred.reject("Failure !!!");
$scope.$digest();
expect(ngProgressLite.done).toHaveBeenCalledWith();
});

});

describe('delete()', function() {
Expand Down
31 changes: 21 additions & 10 deletions opal/static/js/test/edit_teams.controller.test.js
View file
Expand Up @@ -4,22 +4,23 @@ describe('EditTeamsCtrl', function(){
var $scope, $rootScope, $httpBackend, $window, $modal, $controller;
var Episode;
var UserProfile;
var modalInstance;
var modalInstance, ngProgressLite;
var episode, opalTestHelper;

beforeEach(function(){
module('opal.controllers');
module('opal.test');

inject(function($injector){
$httpBackend = $injector.get('$httpBackend');
$rootScope = $injector.get('$rootScope');
$scope = $rootScope.$new();
$window = $injector.get('$window');
$controller = $injector.get('$controller');
$modal = $injector.get('$modal');
Episode = $injector.get('Episode');
opalTestHelper = $injector.get('opalTestHelper');
$httpBackend = $injector.get('$httpBackend');
$rootScope = $injector.get('$rootScope');
$scope = $rootScope.$new();
$window = $injector.get('$window');
$controller = $injector.get('$controller');
$modal = $injector.get('$modal');
Episode = $injector.get('Episode');
opalTestHelper = $injector.get('opalTestHelper');
ngProgressLite = $injector.get('ngProgressLite');
});

UserProfile = opalTestHelper.getUserProfileLoader();
Expand All @@ -30,7 +31,7 @@ describe('EditTeamsCtrl', function(){
episode.tagging = [
{
save: function(a){
return {then: function(fn) { fn(); }}
return {then: function(fn, fn2) { fn(); }}
},
makeCopy: function(){
return {tropical: true};
Expand Down Expand Up @@ -85,6 +86,16 @@ describe('EditTeamsCtrl', function(){
expect(modalInstance.close).toHaveBeenCalledWith('close');
});

it('should reset the progressbar if we error', function() {
spyOn(ngProgressLite, 'done');
episode.tagging[0].save = function(a){
return {then: function(fn, fn2) { fn2(); }}
}
$scope.save('close');
$rootScope.$apply();
expect(ngProgressLite.done).toHaveBeenCalledWith()
});

});

describe('cancel()', function(){
Expand Down

0 comments on commit 9cfa0be

Please sign in to comment.