gCubeSystem
/
performfish-analytics-portlet
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed labels in Farm Data Charts according to Task #16756 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/performfish-analytics-portlet@179522 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Francesco Mangiacrapa 2019-05-23 09:01:37 +00:00
parent 1336c20569
commit 3960abe967
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/gcube/portlets/user/performfishanalytics/client/annualcontrollers/PerformFishAnnualAnalyticsController.java
View File

@ -685,8 +685,10 @@ public class PerformFishAnnualAnalyticsController {
String title = toTitle; String title = toTitle;
switch (chartType) { switch (chartType) {
case BOXPLOT: case BOXPLOT:
title = chartType.getName()+" - on all batches<br>"; //title = chartType.getName()+" - on all batches<br>";
title += "Blue dots indicate the selected batch(es): "+focusID; //title += "Blue dots indicate the selected batch(es): "+focusID;
title = chartType.getName()+" - on all farm data<br>";
title += "Blue dots indicate the selected farm: "+focusID;
break; break;
case CORRELATION: case CORRELATION:
break; break;
@ -696,8 +698,8 @@ public class PerformFishAnnualAnalyticsController {
break; break;
case SPEEDOMETER: case SPEEDOMETER:
title = "Speedometer<br>"; title = "Speedometer<br>";
title+= "Selected BATCH ID: "+focusID+"<br>"; title+= "Selected Farm: "+focusID+"<br>";
title+= "Normalized with respect to all batches in the VRE"; title+= "Normalized with respect to all farm data in the VRE";
break; break;
case DEA_CHART: case DEA_CHART:
break; break;
@ -726,10 +728,16 @@ public class PerformFishAnnualAnalyticsController {
String title = toTitle; String title = toTitle;
switch (chartType) { switch (chartType) {
case BOXPLOT: 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")){ if(result.getFileName().contains("_user")){
title = "My Batch(es)"; title = "My Batch(es)";
return;
}else{ }else{
title = "All batches in the VRE (including mine)"; title = "All farm data in the VRE (including mine)";
} }
break; break;
case CORRELATION: case CORRELATION: