From 39382d8e51fa1d439fc4d07098ea5ab45e742d4d Mon Sep 17 00:00:00 2001
From: Francesco Mangiacrapa <francesco.mangiacrapa@isti.cnr.it>
Date: Wed, 10 Jul 2019 14:37:25 +0000
Subject: [PATCH] Completed Task #17165

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/performfish-analytics-portlet@181191 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                                       | 7 ++++++-
 .../PerformFishAnnualAnalyticsController.java              | 7 ++-----
 .../client/controllers/PerformFishAnalyticsController.java | 2 ++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 3a9dc97..62c6e23 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,7 +1,12 @@
 <ReleaseNotes>
+	<Changeset
+		component="org.gcube.portlets-user.performfish-analytics-portlet.0-2-0"
+		date="${buildDate}">
+		<Change>Task #17165</Change>
+	</Changeset>
 	<Changeset
 		component="org.gcube.portlets-user.performfish-analytics-portlet.0-1-0"
-		date="2019-03-08">
+		date="${buildDate}">
 		<Change>first release</Change>
 	</Changeset>
 </ReleaseNotes>
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java
index 2ba843a..b479a43 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java
@@ -728,17 +728,14 @@ public class PerformFishAnnualAnalyticsController {
 						String title = toTitle;
 						switch (chartType) {
 						case BOXPLOT:
-//							if(result.getFileName().contains("_user")){
-//								title = "My Batch(es)";
-//							}else{
-//								title = "All batches in the VRE (including mine)";
-//							}
 							if(result.getFileName().contains("_user")){
 								title = "My Batch(es)";
 								return;
 							}else{
 								title = "All farm data in the VRE (including mine)";
 							}
+							title+="<br>";
+							title+="Data aggregation is performed by considering farms as base units";
 							break;
 						case CORRELATION:
 							break;
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java
index f19f9f1..fe11f48 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/controllers/PerformFishAnalyticsController.java
@@ -650,6 +650,8 @@ public class PerformFishAnalyticsController {
 							}else{
 								title = "All batches in the VRE (including mine)";
 							}
+							title+="<br>";
+							title+="Data aggregation is performed by considering batches as base units";
 							break;
 						case CORRELATION:
 							break;