From 035d1da34fd899b5a9caf795558a1e608804c93d Mon Sep 17 00:00:00 2001
From: "michele.artini" <michele.artini@isti.cnr.it>
Date: Tue, 19 Apr 2022 09:47:20 +0200
Subject: [PATCH] multiple selection

---
 .../resources/html/parts/org_results_page.html    |  3 ++-
 .../resources/html/parts/select_org.modal.html    | 15 ++++++++++-----
 .../static/resources/js/organizations.js          | 10 +++-------
 3 files changed, 15 insertions(+), 13 deletions(-)

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 01bfe0a5..1d34c035 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
@@ -49,7 +49,8 @@
 		<tbody>
 			<tr ng-repeat="o in orgs.content" class="d-flex" ng-class="{'table-warning' : showStatus && o.status != 'approved'}">
 				<td class="col-6">
-					<a ng-if="mode == 'select-modal'" href="javascript:void(0)" title="{{o.id}}" ng-click="selectOrg(o)" data-dismiss="modal">{{o.name}}</a>
+					<a ng-if="(mode == 'select-modal') && !o.selected" href="javascript:void(0)" title="{{o.id}}" ng-click="selectOrg(o)">{{o.name}}</a>
+					<span ng-if="(mode == 'select-modal') && o.selected" title="{{o.id}}" class="text-muted">{{o.name}} <b>(SELECTED)</b></span>
 					<a ng-if="mode != 'select-modal'" href="#!/edit/0/{{o.id}}" title="{{o.id}}">{{o.name}}</a>
 					<span class="badge badge-warning" ng-if="showStatus && o.status != 'approved'">{{o.status}}</span>
 				</td>
diff --git a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html
index 243eede8..57b78402 100644
--- a/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html
+++ b/apps/dnet-orgs-database-application/src/main/resources/static/resources/html/parts/select_org.modal.html
@@ -6,12 +6,14 @@
 				<button type="button" class="close" data-dismiss="modal">&times;</button>
 			</div>
 			<div class="modal-body" style="min-height: 300px">
-				<div class="input-group input-group-sm">
-					<input type="text" class="form-control" ng-model="searchText" />
-					<div class="input-group-append">
-						<button type="button" class="btn btn-outline-primary" ng-click="search(searchText, 0, 25)">Search</button>
+				<form>
+					<div class="input-group input-group-sm">
+						<input type="text" class="form-control" ng-model="searchText" />
+						<div class="input-group-append">
+							<button type="submit" class="btn btn-outline-primary" ng-click="search(searchText, 0, 25)">Search</button>
+						</div>
 					</div>
-				</div>
+				</form>
 				<div ng-show="searchValue">
 					<org-results-page orgs="searchOrgs" 
 						prev-function="search(searchValue, searchOrgs.number - 1, searchOrgs.size)" 
@@ -22,6 +24,9 @@
 					
 				</div>
 			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+			</div>
 		</div>
 	</div>
 </div>
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 cb1a8df0..8c2cfbe9 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
@@ -63,12 +63,6 @@ orgsModule.directive('selectOrgModal', function($http, $timeout) {
 			}
 			
 			scope.selectOrg = function() {
-				$timeout(function() {
-					scope.searchText = '';
-					scope.searchValue = ''; 
-					scope.searchOrgs = {};
-				}, 1000);
-				
 				if (scope.onSelect) {
 					scope.onSelect();
 				}
@@ -219,6 +213,8 @@ orgsModule.directive('orgResultsPage', function($http, $location, $route) {
 		templateUrl: 'resources/html/parts/org_results_page.html',
 		link: function(scope, element, attrs, ctrl) {
 			scope.selectOrg = function(o) {
+				o.selected = true;
+
 				scope.selectedOrg.id = o.id;
 				scope.selectedOrg.name = o.name;
 				scope.selectedOrg.type = o.type;
@@ -555,7 +551,7 @@ orgsModule.controller('showEditCtrl', function ($scope, $http, $routeParams, $ro
 	$scope.saveDuplicates = function() {
 		call_http_post($http, 'api/organizations/duplicates', $scope.duplicates, function(res) {
 			$scope.getInfo();
-			alert('Events updated !!!');
+			alert('Duplicates updated !!!');
 			$scope.duplicates = res.data;
 		});
 	}