Skip to content

Commit

Permalink
Merge branch 'v0.23.0' into work-flows
Browse files Browse the repository at this point in the history
  • Loading branch information
fredkingham committed Aug 26, 2022
2 parents 5908ab3 + e1a57b8 commit 2ff1e1f
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
@@ -1,10 +1,9 @@
//
// This is the main PatientSummary class for OPAL.
//
angular.module('opal.services').factory('PatientSummary', function(UserProfile) {
angular.module('opal.services').factory('PatientSummary', function() {
var PatientSummary = function(jsonResponse){
var startYear, endYear;
var self = this;

if(jsonResponse.start_date){
startYear= moment(jsonResponse.start_date, 'DD/MM/YYYY').format("YYYY");
Expand Down
1 change: 0 additions & 1 deletion opal/core/search/static/js/test/extract.controller.test.js
Expand Up @@ -424,7 +424,6 @@ describe('ExtractCtrl', function(){
{categories: []}
]
});
$httpBackend.expectGET('/api/v0.1/userprofile/').respond({roles: {default: []}});
$scope.criteria[0] = {
combine : "and",
column : "symptoms",
Expand Down
1 change: 0 additions & 1 deletion opal/core/search/static/js/test/search.controller.test.js
Expand Up @@ -57,7 +57,6 @@ describe('SearchCtrl', function (){
$httpBackend.expectGET('/search/simple/?query=jane').respond(
{object_list: [{categories: []}]}
);
$httpBackend.expectGET('/api/v0.1/userprofile/').respond({roles: {default: []}});
expect($scope.query.searchTerm.length).toBe(0);
$scope.query.autocompleteSearchTerm = 'jane';
expect($scope.getQueryParam()).toEqual('jane');
Expand Down

0 comments on commit 2ff1e1f

Please sign in to comment.