diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/duplicates.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/duplicates.html index db47887f..0b16e19c 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/duplicates.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/duplicates.html @@ -27,13 +27,22 @@ - - - + + + - +
OrganizationPlace# pending duplicates + Organization + + + Place + + + # pending duplicates + +
{{d.name}} diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/pendingOrgs.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/pendingOrgs.html index 1d7c693b..41be4376 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/pendingOrgs.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/pendingOrgs.html @@ -25,14 +25,26 @@ - - - - + + + + - + diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js index aa1f04f2..6073f556 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/js/organizations.js @@ -581,6 +581,8 @@ orgsModule.controller('pendingOrgsCtrl', function ($scope, $http, $routeParams, $scope.loading = true; $scope.orgs = []; $scope.country = $routeParams.country; + $scope.sortProperty = 'name'; + $scope.sortReverse = false; $scope.getInfo = function() { suggestionInfo.updateInfo(function(info) { @@ -595,6 +597,11 @@ orgsModule.controller('pendingOrgsCtrl', function ($scope, $http, $routeParams, } }); }; + + $scope.sortBy = function(sortProperty) { + $scope.sortReverse = ($scope.sortProperty == sortProperty) ? !$scope.sortReverse : false; + $scope.sortProperty = sortProperty; + }; $scope.refresh = function() { $scope.orgs = []; @@ -616,6 +623,8 @@ orgsModule.controller('duplicatesCtrl', function ($scope, $http, $routeParams, $ $scope.country = $routeParams.country; $scope.currentOrg = {}; $scope.currentOrgDetails = {}; + $scope.sortProperty = 'name'; + $scope.sortReverse = false; $scope.prepareDuplicatesModal = function(org) { $scope.currentOrg = org; @@ -664,6 +673,11 @@ orgsModule.controller('duplicatesCtrl', function ($scope, $http, $routeParams, $ }); }; + + $scope.sortBy = function(sortProperty) { + $scope.sortReverse = ($scope.sortProperty == sortProperty) ? !$scope.sortReverse : false; + $scope.sortProperty = sortProperty; + }; $scope.refresh = function() { $scope.duplicates = [];
Organization namePlaceAcronymsType + Organization name + + + Place + + + Acronyms + + + Type + +
{{o.name}}