diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/DataMinerAlgorithms.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/DataMinerAlgorithms.java index c9983a1..86fbbc3 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/DataMinerAlgorithms.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/DataMinerAlgorithms.java @@ -13,16 +13,16 @@ package org.gcube.portlets.user.performfishanalytics.client; */ public enum DataMinerAlgorithms { - DEA_CHART("DEA_CHART", "DEA_CHART", "DEA_CHART"), - SCATTER("SCATTER", "SCATTER", "SCATTER"), + DEA_CHART("DEA_CHART", "DEA_CHART", "Dea Chart"), + SCATTER("SCATTER", "SCATTER", "Scatter"), SPEEDOMETER("SPEEDOMETER","SPEEDOMETER", "Performeter"), - BOXPLOT("BOXPLOT","BOXPLOT","BOXPLOT"), - DEA_ANALYSIS("DEA_ANALYSIS", "DEA_ANALYSIS", "DEA_ANALYSIS"), - CORRELATION("CORRELATION", "CORRELATION","CORRELATION"), - PERFORMFISH_SYNOPTICTABLE_BATCH("PERFORMFISH_SYNOPTICTABLE_BATCH", "PERFORMFISH_SYNOPTICTABLE_BATCH","PERFORMFISH_SYNOPTICTABLE_BATCH"), - PERFORMFISH_SYNOPTIC_TABLE_FARM("PERFORMFISH_SYNOPTIC_TABLE_FARM","PERFORMFISH_SYNOPTIC_TABLE_FARM","PERFORMFISH_SYNOPTIC_TABLE_FARM"), - PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY("PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY", "PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY", "PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY"), - PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW("PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW","PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW","PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW"); + BOXPLOT("BOXPLOT","BOXPLOT","Descriptive Statistics"), + DEA_ANALYSIS("DEA_ANALYSIS", "DEA_ANALYSIS", "DEA"), + CORRELATION("CORRELATION", "CORRELATION","Correlation"), + PERFORMFISH_SYNOPTICTABLE_BATCH("PERFORMFISH_SYNOPTICTABLE_BATCH", "PERFORMFISH_SYNOPTICTABLE_BATCH","PerformFish synoptic table batch"), + PERFORMFISH_SYNOPTIC_TABLE_FARM("PERFORMFISH_SYNOPTIC_TABLE_FARM","PERFORMFISH_SYNOPTIC_TABLE_FARM","PerformFish synoptic table farm"), + PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY("PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY", "PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY", "PerformFish synoptic table batch hatchery"), + PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW("PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW","PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW","PerformFish synoptic table batch pregrow"); String id; String name; 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 6d5fdc2..55a03aa 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 @@ -551,7 +551,9 @@ public class PerformFishAnnualAnalyticsController { final SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1); submitRequestPanel.showLoader(false, null); - final Tab tab = viewAnnualController.createTab("Dea #" + (viewAnnualController.currentNumberOfTab() + 1), + + String tabTitle = DataMinerAlgorithms.DEA_ANALYSIS.getTitle(); + final Tab tab = viewAnnualController.createTab(tabTitle+" #" + (viewAnnualController.currentNumberOfTab() + 1), PerformFishResources.INSTANCE.farm_DEAANALYSIS().getText(), submitRequestPanel); viewAnnualController.noSpinner(tab); @@ -648,11 +650,8 @@ public class PerformFishAnnualAnalyticsController { final SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1); submitRequestPanel.showLoader(true, - "Submitting " + DataMinerAlgorithms.CORRELATION.getName() + " request to DM Service..."); - String tabTitle = DataMinerAlgorithms.CORRELATION.getName().substring(0, 1).toUpperCase() - + DataMinerAlgorithms.CORRELATION.getName().toLowerCase().substring(1, - DataMinerAlgorithms.CORRELATION.getName().length()); // CAMEL - // CASE + "Submitting " + DataMinerAlgorithms.CORRELATION.getTitle() + " request to DM Service..."); + String tabTitle = DataMinerAlgorithms.CORRELATION.getTitle(); final Tab tab = viewAnnualController.createTab( tabTitle + " #" + (viewAnnualController.currentNumberOfTab() + 1), @@ -733,10 +732,8 @@ public class PerformFishAnnualAnalyticsController { SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1); // submitRequestPanel.getElement().addClassName("ext-horizontal-panel"); - String tabTitle = algorithm.getTitle().substring(0, 1).toUpperCase() - + algorithm.getTitle().toLowerCase().substring(1, algorithm.getTitle().length()); // CAMEL - // CASE - + String tabTitle = algorithm.getTitle(); + // TO MANAGE ALGORITHMS DESCRIPTION TextResource algDescr = null; switch (algorithm) { @@ -1055,6 +1052,16 @@ public class PerformFishAnnualAnalyticsController { break; case DEA_CHART: break; + case PERFORMFISH_SYNOPTICTABLE_BATCH: + break; + case PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY: + break; + case PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW: + break; + case PERFORMFISH_SYNOPTIC_TABLE_FARM: + break; + default: + break; } ShowResult showResult = new ShowResult(title); @@ -1118,6 +1125,14 @@ public class PerformFishAnnualAnalyticsController { showResultSin); return; + case PERFORMFISH_SYNOPTICTABLE_BATCH: + break; + case PERFORMFISH_SYNOPTICTABLE_BATCH_HATCHERY: + break; + case PERFORMFISH_SYNOPTICTABLE_BATCH_PREGROW: + break; + default: + break; } ShowResult showResult = new ShowResult(title); 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 7fa7828..8677d55 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 @@ -512,7 +512,9 @@ public class PerformFishAnalyticsController { final SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1); submitRequestPanel.showLoader(false, null); - final Tab tab = viewController.createTab("Dea #" + (viewController.currentNumberOfTab() + 1), + + String tabTitle = DataMinerAlgorithms.DEA_ANALYSIS.getTitle(); + final Tab tab = viewController.createTab(tabTitle+" #" + (viewController.currentNumberOfTab() + 1), PerformFishResources.INSTANCE.batch_DEAANALYSIS().getText(), submitRequestPanel); viewController.noSpinner(tab); final List selectedKPI = new ArrayList(viewController.getSelectedKPIs()); @@ -579,11 +581,9 @@ public class PerformFishAnalyticsController { final SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1); submitRequestPanel.showLoader(true, - "Submitting " + DataMinerAlgorithms.CORRELATION.getName() + " request to DM Service..."); - String tabTitle = DataMinerAlgorithms.CORRELATION.getName().substring(0, 1).toUpperCase() - + DataMinerAlgorithms.CORRELATION.getName().toLowerCase().substring(1, - DataMinerAlgorithms.CORRELATION.getName().length()); // CAMEL - // CASE + "Submitting " + DataMinerAlgorithms.CORRELATION.getTitle() + " request to DM Service..."); + + String tabTitle = DataMinerAlgorithms.CORRELATION.getTitle(); final Tab tab = viewController.createTab(tabTitle + " #" + (viewController.currentNumberOfTab() + 1), PerformFishResources.INSTANCE.batch_CORRELATION().getText(), submitRequestPanel); @@ -658,10 +658,8 @@ public class PerformFishAnalyticsController { Window.alert("Something seems wrong, no selected BatchID, try again"); // submitRequestPanel.getElement().addClassName("ext-horizontal-panel"); - String tabTitle = algorithm.getTitle().substring(0, 1).toUpperCase() - + algorithm.getTitle().toLowerCase().substring(1, algorithm.getTitle().length()); // CAMEL - // CASE - + String tabTitle = algorithm.getTitle(); + // TO MANAGE ALGORITHMS DESCRIPTION TextResource algDescr = null; switch (algorithm) { diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/DeaAnnualPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/DeaAnnualPanelResult.java index 0049c37..a0381dd 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/DeaAnnualPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/DeaAnnualPanelResult.java @@ -546,8 +546,9 @@ public class DeaAnnualPanelResult extends Composite { flexTable.setWidget(0, 0, new HTML("Batch Type:")); flexTable.setWidget(0, 1, new HTML(toShowBatchTypeValue)); - //flexTable.setWidget(1, 0, new HTML("Level:")); - //flexTable.setWidget(1, 1, new HTML(dataInputParameters.get(PerformFishAnalyticsConstant.DM_SCALEP_PARAM))); + // flexTable.setWidget(1, 0, new HTML("Level:")); + // flexTable.setWidget(1, 1, new + // HTML(dataInputParameters.get(PerformFishAnalyticsConstant.DM_SCALEP_PARAM))); String KPINames = ""; for (KPI kpi : selectedKPIs) { @@ -775,7 +776,7 @@ public class DeaAnnualPanelResult extends Composite { } - ShowResult showResult = new ShowResult(title,TextAlign.LEFT); + ShowResult showResult = new ShowResult(title, TextAlign.LEFT); showResult.showImage(base64Content); container.add(showResult); @@ -825,7 +826,7 @@ public class DeaAnnualPanelResult extends Composite { } - ShowResult showResult = new ShowResult(title,TextAlign.LEFT); + ShowResult showResult = new ShowResult(title, TextAlign.LEFT); showResult.showCSVFile(result, cssTableStyle); container.add(showResult); } @@ -935,7 +936,8 @@ public class DeaAnnualPanelResult extends Composite { Map> mapParameters = new HashMap>(); mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters)); - final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to Dea Analysis..."); + final LoaderIcon loaderIcon = new LoaderIcon( + "Submitting request to " + DataMinerAlgorithms.DEA_ANALYSIS.getTitle() + " Analysis..."); loaderIcon.getElement().getStyle().setMarginTop(10, Unit.PX); loaderIcon.setVisible(true); panel.setVisible(true); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/DeaPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/DeaPanelResult.java index 35df777..313435c 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/DeaPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/DeaPanelResult.java @@ -105,7 +105,7 @@ public class DeaPanelResult extends Composite { @UiField ListBox list_dea_output_kpi; - + @UiField HorizontalPanel uib_vp_deanalanlysis_request_container; @@ -145,7 +145,7 @@ public class DeaPanelResult extends Composite { private List selectedKPIs; - //private List selectedAreas; + // private List selectedAreas; /** * Because this class has a default constructor, it can be used as a binder @@ -248,7 +248,7 @@ public class DeaPanelResult extends Composite { resetListFields(KpiButtonType.OUTPUT_KPI); } }); - + validateKPIList(); } @@ -311,7 +311,7 @@ public class DeaPanelResult extends Composite { default: break; } - + validateKPIList(); } @@ -359,7 +359,7 @@ public class DeaPanelResult extends Composite { default: break; } - + validateKPIList(); } @@ -471,11 +471,13 @@ public class DeaPanelResult extends Composite { * @param listAreas * the list areas */ - /*public void addSelectedAreas(List listAreas) { - - this.selectedAreas = listAreas; - - }*/ + /* + * public void addSelectedAreas(List listAreas) { + * + * this.selectedAreas = listAreas; + * + * } + */ /** * Gets the KPI for name. @@ -736,7 +738,7 @@ public class DeaPanelResult extends Composite { public void onSuccess(String base64Content) { String title = toTitle; - ShowResult showResult = new ShowResult(title,TextAlign.LEFT); + ShowResult showResult = new ShowResult(title, TextAlign.LEFT); showResult.showImage(base64Content); container.add(showResult); @@ -759,7 +761,7 @@ public class DeaPanelResult extends Composite { String cssTableStyle = "simpletable"; String title = toTitle; - ShowResult showResult = new ShowResult(title,TextAlign.LEFT); + ShowResult showResult = new ShowResult(title, TextAlign.LEFT); showResult.showCSVFile(result, cssTableStyle); container.add(showResult); } @@ -839,8 +841,9 @@ public class DeaPanelResult extends Composite { Map> mapParameters = new HashMap>(); mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters)); - - final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to Dea Analysis..."); + + final LoaderIcon loaderIcon = new LoaderIcon( + "Submitting request to " + DataMinerAlgorithms.DEA_ANALYSIS.getTitle() + " Analysis..."); loaderIcon.getElement().getStyle().setMarginTop(10, Unit.PX); loaderIcon.setVisible(true); panel.setVisible(true); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/RecapSubmitPage.ui.xml b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/RecapSubmitPage.ui.xml index 7b2f608..12903fb 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/RecapSubmitPage.ui.xml +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/RecapSubmitPage.ui.xml @@ -35,7 +35,7 @@ text="Correlation Analysis" name="CORRELATION" addStyleNames="the_margin_top" enabled="false">