From c7a9e51bb84473acd5cd05d37a62d652a2c3a076 Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Tue, 13 Apr 2021 14:45:27 +0200
Subject: [PATCH] ui

---
 .../resources/html/pages/advanced/conflicts.html   |  2 +-
 .../resources/html/pages/advanced/duplicates.html  |  2 +-
 .../resources/html/pages/advanced/pendingOrgs.html |  2 +-
 .../resources/static/resources/js/organizations.js | 14 ++++++++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/conflicts.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/conflicts.html
index e18a7f3a..531b27b1 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/conflicts.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/pages/advanced/conflicts.html
@@ -16,7 +16,7 @@
     </div>
 </div>
 
-<h5 class="text-muted" ng-if="conflicts.length == 0">No conflicts</h5>
+<h5 class="text-muted" ng-if="!loading && conflicts.length == 0">No conflicts</h5>
 
 <p ng-show="conflicts.length > 0">
 	<input type="text" class="form-control form-control-sm" ng-model="conflictFilter" placeholder="Filter..." />
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 a8c4cb43..db47887f 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
@@ -17,7 +17,7 @@
     </div>
 </div>
 
-<h5 class="text-muted" ng-if="duplicates.length == 0">No duplicates</h5>
+<h5 class="text-muted" ng-if="!loading && duplicates.length == 0">No duplicates</h5>
 
 <p ng-show="duplicates.length > 0">
 	 <input type="text" class="form-control" ng-model="duplicateFilter" placeholder="Filter..." />
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 5158c9a9..1d7c693b 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
@@ -16,7 +16,7 @@
     </div>
 </div>
 
-<h5 class="text-muted" ng-if="orgs.length == 0">No pending organizations</h5>
+<h5 class="text-muted" ng-if="!loading && orgs.length == 0">No pending organizations</h5>
 
 <p ng-show="orgs.length > 0">
 	<input type="text" class="form-control form-control-sm" ng-model="orgFilter" placeholder="Filter..."/>
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 52ca47ee..56ca6c06 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
@@ -575,6 +575,7 @@ orgsModule.controller('showEditCtrl', function ($scope, $http, $routeParams, $ro
 
 orgsModule.controller('pendingOrgsCtrl', function ($scope, $http, $routeParams, $location, suggestionInfo) {
 	$scope.info = suggestionInfo.getInfo();
+	$scope.loading = true;
 	$scope.orgs = [];
 	$scope.country = $routeParams.country;
 	
@@ -594,9 +595,10 @@ orgsModule.controller('pendingOrgsCtrl', function ($scope, $http, $routeParams,
 
 	$scope.refresh = function() {
 		$scope.orgs = [];
-		
+		$scope.loading = true;
+			
 		if ($scope.country != '_') {
-			call_http_get($http, 'api/organizations/byCountry/suggested/' + $scope.country, function(res) { $scope.orgs = res.data; });
+			call_http_get($http, 'api/organizations/byCountry/suggested/' + $scope.country, function(res) { $scope.orgs = res.data; $scope.loading = false; });
 		}
 		$scope.getInfo();
 	}
@@ -606,6 +608,7 @@ orgsModule.controller('pendingOrgsCtrl', function ($scope, $http, $routeParams,
 
 orgsModule.controller('duplicatesCtrl', function ($scope, $http, $routeParams, $location, $timeout, $route, suggestionInfo) {
 	$scope.info = suggestionInfo.getInfo();
+	$scope.loading = true;
 	$scope.duplicates = [];
 	$scope.country = $routeParams.country;
 	$scope.currentOrg = {};
@@ -661,9 +664,10 @@ orgsModule.controller('duplicatesCtrl', function ($scope, $http, $routeParams, $
 	
 	$scope.refresh = function() {
 		$scope.duplicates = [];
+		$scope.loading = true;		
 		
 		if ($scope.country != '_') {
-			call_http_get($http, 'api/organizations/duplicates/byCountry/' + $scope.country, function(res) { $scope.duplicates = res.data; });
+			call_http_get($http, 'api/organizations/duplicates/byCountry/' + $scope.country, function(res) { $scope.duplicates = res.data; $scope.loading = false; });
 		}
 		$scope.getInfo();
 	}
@@ -673,6 +677,7 @@ orgsModule.controller('duplicatesCtrl', function ($scope, $http, $routeParams, $
 
 orgsModule.controller('conflictsCtrl', function ($scope, $http, $routeParams, $location, $route, $q, suggestionInfo) {
 	$scope.info = suggestionInfo.getInfo();
+	$scope.loading = true;
 	$scope.conflicts = [];
 	$scope.country = $routeParams.country;
 	$scope.orgs = [];
@@ -745,9 +750,10 @@ orgsModule.controller('conflictsCtrl', function ($scope, $http, $routeParams, $l
 	
 	$scope.refresh = function() {
 		$scope.conflicts = [];
+		$scope.loading = true;
 		
 		if ($scope.country != '_') {
-			call_http_get($http, 'api/organizations/conflicts/byCountry/' + $scope.country, function(res) { $scope.conflicts = res.data; });
+			call_http_get($http, 'api/organizations/conflicts/byCountry/' + $scope.country, function(res) { $scope.conflicts = res.data; $scope.loading = false; });
 		}
 		$scope.getInfo();
 	}