From 71ecb09a2fa270d755f0bdedd365ebbb5c18720a Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Fri, 24 May 2019 08:44:40 +0000
Subject: [PATCH] Changed (in the case of the batch interface) the label in the
 "BATCH ID" drop-down menu from ALL to "ALL the above"

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/performfish-analytics-portlet@179547 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../client/PerformFishAnalyticsConstant.java                | 3 ++-
 .../client/viewbinder/BatchIDAndListKPIView.java            | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsConstant.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsConstant.java
index 5775bd7..c76e849 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsConstant.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalyticsConstant.java
@@ -41,7 +41,8 @@ public class PerformFishAnalyticsConstant {
 
 
 
-	public static final String DM_FOCUS_ID_ALL_VALUE = "ALL";
+	public static final String DM_FOCUS_ID_ALL_ITEM_VALUE = "ALL";
+	public static final String DM_FOCUS_ID_ALL_ITEM_TEXT = "ALL the above";
 
 
 
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/BatchIDAndListKPIView.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/BatchIDAndListKPIView.java
index 2a27848..369bfa9 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/BatchIDAndListKPIView.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/BatchIDAndListKPIView.java
@@ -146,7 +146,7 @@ public class BatchIDAndListKPIView extends Composite {
 		List<String> selected = new ArrayList<String>();
 		for (int i=0; i<listBox.getItemCount(); i++) {
 			if (listBox.isItemSelected(i)) {
-				selected.add(listBox.getItemText(i));
+				selected.add(listBox.getValue(i)); //reading the value
 	        }
 		}
 		return selected;
@@ -237,8 +237,8 @@ public class BatchIDAndListKPIView extends Composite {
 							listBatchesID.add(valuePerScaleP);
 						}
 
-						uib_list_batch_id.addItem(PerformFishAnalyticsConstant.DM_FOCUS_ID_ALL_VALUE, PerformFishAnalyticsConstant.DM_FOCUS_ID_ALL_VALUE);
-						listBatchesID.add(PerformFishAnalyticsConstant.DM_FOCUS_ID_ALL_VALUE);
+						uib_list_batch_id.addItem(PerformFishAnalyticsConstant.DM_FOCUS_ID_ALL_ITEM_TEXT, PerformFishAnalyticsConstant.DM_FOCUS_ID_ALL_ITEM_VALUE);
+						listBatchesID.add(PerformFishAnalyticsConstant.DM_FOCUS_ID_ALL_ITEM_VALUE);
 
 						PerformFishAnalyticsController.eventBus.fireEvent(new AddedBatchIdEvent());
 					}