diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java index a9331c1c..82037224 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/controller/OrganizationController.java @@ -234,10 +234,12 @@ public class OrganizationController extends AbstractDnetController { @RequestParam(required = false, defaultValue = "false") final boolean reverse, final Authentication authentication) { + final PageRequest pageRequest = PageRequest.of(page, size, Sort.by(reverse ? Order.desc(orderBy) : Order.asc(orderBy))); + if (SPECIAL_STATUS_FOR_CANDIDATE_DUP.equals(status)) { return UserInfo.isSuperAdmin(authentication) - ? organizationSimpleViewRepository.searchCandidateDuplicates(q, PageRequest.of(page, size)) - : organizationSimpleViewRepository.searchCandidateDuplicatesForUser(q, UserInfo.getEmail(authentication), PageRequest.of(page, size)); + ? organizationSimpleViewRepository.searchCandidateDuplicates(q, pageRequest) + : organizationSimpleViewRepository.searchCandidateDuplicatesForUser(q, UserInfo.getEmail(authentication), pageRequest); } final List statuses; if (StringUtils.isNotBlank(status)) { @@ -248,8 +250,6 @@ public class OrganizationController extends AbstractDnetController { statuses = Arrays.asList(OrganizationStatus.approved.toString(), OrganizationStatus.suggested.toString()); } - final PageRequest pageRequest = PageRequest.of(page, size, Sort.by(reverse ? Order.desc(orderBy) : Order.asc(orderBy))); - return UserInfo.isSuperAdmin(authentication) ? organizationSimpleViewRepository.search(q, statuses, pageRequest) : organizationSimpleViewRepository.searchForUser(q, UserInfo.getEmail(authentication), statuses, pageRequest); diff --git a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/repository/readonly/OrganizationSimpleViewRepository.java b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/repository/readonly/OrganizationSimpleViewRepository.java index 9da4534e..9e95f100 100644 --- a/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/repository/readonly/OrganizationSimpleViewRepository.java +++ b/apps/dnet-orgs-database-application/src/main/java/eu/dnetlib/organizations/repository/readonly/OrganizationSimpleViewRepository.java @@ -77,12 +77,12 @@ public interface OrganizationSimpleViewRepository extends ReadOnlyRepository searchCandidateDuplicates(@Param("text") String text, Pageable pageable); // SEARCH FOR VALID DUPLICATE CANDIDATES FOR USER @Query(value = "SELECT\n" - + " org.id,\n" - + " org.name,\n" - + " org.type,\n" - + " org.city,\n" - + " org.country,\n" - + " org.status,\n" + + " org.id AS id,\n" + + " org.name AS name,\n" + + " org.type AS type,\n" + + " org.city AS city,\n" + + " org.country AS country,\n" + + " org.status AS status,\n" + " array_remove(array_agg(DISTINCT a.acronym), NULL) AS acronyms,\n" + " array_remove(array_agg(DISTINCT u.url), NULL) AS urls,\n" + " NULL AS n_similar_dups,\n" @@ -120,8 +119,7 @@ public interface OrganizationSimpleViewRepository extends ReadOnlyRepository searchCandidateDuplicatesForUser(@Param("text") String text, @Param("email") String email, Pageable pageable); } diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html index 740ec66d..ac569edf 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/search/resultsByType.html @@ -1,5 +1,5 @@ diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html index f9c7f9ec..84e331b4 100644 --- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html +++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/org_results_page.html @@ -8,7 +8,7 @@ {{searchMessage}} - Total elements:
+ Total elements:
fr {{searchMessage}}

@@ -21,29 +21,41 @@

No results

-
-
- -
- -
Ascending
- name - country - type - status -
Descending
- name - country - type - status - # accepted dups - # suggested dups - # rejected dups - +
+
+
+
+ +
+ + name + country + type + status + # accepted dups + # suggested dups + # rejected dups + +
+
+
+
+ reverse +
+
-
+
@@ -67,7 +79,9 @@
- +
+ +

Click the organization name to select the organization

@@ -95,7 +109,6 @@ {{o.name}} -
URL: {{ourl}} {{o.city || '-'}}, {{o.country}} 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 37c84725..f134a6ec 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 @@ -62,8 +62,10 @@ orgsModule.directive('selectOrgModal', function($http) { scope.search = function(text) { scope.searchOrgs = {}; - - call_http_get($http, 'api/organizations/search/0/25?status='+ scope.filterStatus + '&q=' + text, function(res) { + + var url = 'api/organizations/search/0/50?orderBy=name&status='+ scope.filterStatus + '&q=' + text; + + call_http_get($http, url, function(res) { scope.searchValue = text; scope.searchOrgs = res.data; }); @@ -227,6 +229,11 @@ orgsModule.directive('orgResultsPage', function($http, $location, $route, $route }, templateUrl: 'resources/html/parts/org_results_page.html', link: function(scope, element, attrs, ctrl) { + + scope.orderBy = $routeParams.orderBy ? $routeParams.orderBy : 'name'; + scope.orderType = $routeParams.orderType ? $routeParams.orderType : 'asc'; + scope.size = $routeParams.size ? $routeParams.size : 50; + scope.selectOrg = function(o) { o.selected = true; @@ -251,29 +258,38 @@ orgsModule.directive('orgResultsPage', function($http, $location, $route, $route return input; } - scope.gotoPageAndSort = function(page, pageSize, orderBy, orderType) { + scope.gotoPage = function(page, pageSize) { var url = scope.pageFunction() .replace(/__PAGE__/, page) .replace(/__SIZE__/, pageSize) - .replace(/__ORDER_BY__/, orderBy) - .replace(/__ORDER_TYPE__/, orderType); + .replace(/__ORDER_BY__/, scope.orderBy) + .replace(/__ORDER_TYPE__/, scope.orderType); if (scope.mode == 'select-modal' || scope.mode == 'multi-select-modal') { + url += '&orderBy=' + scope.orderBy; + if (scope.orderType == 'desc') { + url += '&reverse=true'; + } + scope.orgs = {}; call_http_get($http, url, function(res) { scope.orgs = res.data; + scope.size = res.data.size; }); } else { $location.url(url); } } - scope.changeSort = function(orderBy, orderType) { - scope.gotoPageAndSort(0, $routeParams.size, orderBy, orderType); + scope.changeSortField = function(orderBy) { + scope.orderBy = orderBy; + scope.gotoPage(0, scope.size); } - scope.gotoPage = function(page, pageSize) { - scope.gotoPageAndSort(page, pageSize, $routeParams.orderBy, $routeParams.orderType); + scope.changeSortOrder = function() { + if (scope.orderType == 'desc') { scope.orderType = 'asc'; } + else { scope.orderType = 'desc'; } + scope.gotoPage(0, scope.size); } }