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 @@ + + Task #17165 + + date="${buildDate}"> first release 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+="
"; + 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+="
"; + title+="Data aggregation is performed by considering batches as base units"; break; case CORRELATION: break;