diff --git a/distro/changelog.xml b/distro/changelog.xml index 174eb59..8678805 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,9 +1,14 @@ + + [Task #17225] Change Speedometer to Performeter + - Task #17165 - Task #17166 Release Synoptic table functionality + [Task #17165] + []Task #17166] Release Synoptic table functionality org.gcube.portlets.user performfish-analytics-portlet war - 0.2.0-SNAPSHOT + 0.3.0-SNAPSHOT Maven Archetype for GWT 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 b055b1f..764c626 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 @@ -345,7 +345,7 @@ public class PerformFishAnnualAnalyticsController { mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters)); final HTMLPanel panelContainer = submitRequestPanel.getContainerPanel(); - final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+algorithm+"..."); + final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+algorithm.getTitle()+"..."); loaderIcon.setVisible(true); panelContainer.setVisible(true); panelContainer.add(loaderIcon); @@ -552,7 +552,7 @@ public class PerformFishAnnualAnalyticsController { SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1); //submitRequestPanel.getElement().addClassName("ext-horizontal-panel"); - String tabTitle = algorithm.getName().substring(0,1).toUpperCase()+algorithm.getName().toLowerCase().substring(1, algorithm.getName().length()); //CAMEL CASE + String tabTitle = algorithm.getTitle().substring(0,1).toUpperCase()+algorithm.getTitle().toLowerCase().substring(1, algorithm.getTitle().length()); //CAMEL CASE Tab tab = viewAnnualController.createTab(submitRequestPanel, tabTitle+" #"+(viewAnnualController.currentNumberOfTab()+1)); switch (algorithm) { @@ -660,7 +660,7 @@ public class PerformFishAnnualAnalyticsController { Map> mapParameters = new HashMap>(); mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters)); - final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+dmInputParameters.getChartType()+" Analysis..."); + final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+dmInputParameters.getChartType().getTitle()+" Analysis..."); loaderIcon.setVisible(true); panelContainer.setVisible(true); panelContainer.add(loaderIcon); @@ -774,7 +774,7 @@ public class PerformFishAnnualAnalyticsController { case BOXPLOT: //title = chartType.getName()+" - on all batches
"; //title += "Blue dots indicate the selected batch(es): "+focusID; - title = chartType.getName()+" - on all farm data
"; + title = chartType.getTitle()+" - on all farm data
"; title += "Blue dots indicate the selected farm: "+focusID; break; case CORRELATION: @@ -784,7 +784,7 @@ public class PerformFishAnnualAnalyticsController { case SCATTER: break; case SPEEDOMETER: - title = "Speedometer
"; + title = chartType.getTitle()+"
"; title+= "Selected Farm: "+focusID+"
"; title+= "Normalized with respect to all farm data in the VRE"; 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 9a75123..2697e08 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 @@ -365,7 +365,7 @@ public class PerformFishAnalyticsController { final Tab tab = viewController.createTab(submitRequestPanel, tabTitle+" #"+(viewController.currentNumberOfTab()+1)); final HTMLPanel panelContainer = submitRequestPanel.getContainerPanel(); - final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+DataMinerAlgorithms.PERFORMFISH_SYNOPTICTABLE_BATCH.getName()+"..."); + final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+DataMinerAlgorithms.PERFORMFISH_SYNOPTICTABLE_BATCH.getTitle()+"..."); loaderIcon.setVisible(true); panelContainer.setVisible(true); panelContainer.add(loaderIcon); @@ -504,7 +504,7 @@ public class PerformFishAnalyticsController { SubmitRequestPanel submitRequestPanel = new SubmitRequestPanel("", 1); //submitRequestPanel.getElement().addClassName("ext-horizontal-panel"); - String tabTitle = algorithm.getName().substring(0,1).toUpperCase()+algorithm.getName().toLowerCase().substring(1, algorithm.getName().length()); //CAMEL CASE + String tabTitle = algorithm.getTitle().substring(0,1).toUpperCase()+algorithm.getTitle().toLowerCase().substring(1, algorithm.getTitle().length()); //CAMEL CASE Tab tab = viewController.createTab(submitRequestPanel, tabTitle+" #"+(viewController.currentNumberOfTab()+1)); switch (algorithm) { @@ -609,7 +609,7 @@ public class PerformFishAnalyticsController { Map> mapParameters = new HashMap>(); mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters)); - final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType+" Analysis..."); + final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType.getTitle()+" Analysis..."); loaderIcon.setVisible(true); panelContainer.setVisible(true); panelContainer.add(loaderIcon); @@ -711,7 +711,7 @@ public class PerformFishAnalyticsController { case SCATTER: break; case SPEEDOMETER: - title = "Speedometer
"; + title = chartType.getTitle()+"
"; title+= "Selected BATCH ID: "+focusID+"
"; title+= "Normalized with respect to all batches in the VRE"; break; diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/AnalyticsAnnualPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/AnalyticsAnnualPanelResult.java index 0f64b91..c50ea7d 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/AnalyticsAnnualPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewannualbinder/AnalyticsAnnualPanelResult.java @@ -848,7 +848,7 @@ public class AnalyticsAnnualPanelResult extends Composite { private void displayOutputFilesAsStaticEntities(DataMinerResponse dmResponse, final DataMinerAlgorithms chartType, List inputKPIs, List outputKPIs, final String focusID, final Panel container, boolean displayError){ String title = displayError?"No results ":""; - title+=chartType; + title+=chartType.getTitle(); title+=inputKPIs.size()>1?" [Input KPIs: ":" [Input KPI: "; for (KPI kpi : inputKPIs) { @@ -1009,7 +1009,7 @@ public class AnalyticsAnnualPanelResult extends Composite { Map> mapParameters = new HashMap>(); mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters)); - final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType+" Analysis..."); + final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType.getTitle()+" Analysis..."); loaderIcon.setVisible(true); panel.setVisible(true); panel.add(loaderIcon); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/AnalyticsPanelResult.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/AnalyticsPanelResult.java index 58af06a..5d0f210 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/AnalyticsPanelResult.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/AnalyticsPanelResult.java @@ -310,41 +310,14 @@ public class AnalyticsPanelResult extends Composite { this.selectedKPIs = selectedKPIs; } - - -// /** -// * Gets the KPI for name. -// * -// * @param name the name -// * @return the KPI for name -// */ -// public KPI getKPIForName(String name){ -// -// //GWT.log("Selected KPIs: "+selectedKPIs); -// GWT.log("Searching KPI name: "+name); -// KPI foundKPI = null; -// //String purgedName = name.replaceAll("\\%", "").trim(); -// String purgedName = name.trim(); -// for (KPI kpi : selectedKPIs) { -// //String purgedKPIName = kpi.getName().replaceAll("\\%", "").trim(); -// String purgedKPIName = kpi.getName().trim(); -// if(purgedKPIName.compareToIgnoreCase(purgedName)==0) { -// foundKPI = kpi; -// break; -// } -// -// } -// GWT.log("FOUND KPI: "+foundKPI); -// return foundKPI; -// } /** - * Gets the KPI for name. - * - * @param name the name - * @return the KPI for name - */ -public KPI getKPIForName(String name){ + * Gets the KPI for name. + * + * @param name the name + * @return the KPI for name + */ + public KPI getKPIForName(String name){ GWT.log("Searching KPI name: "+name); KPI foundKPI = null; @@ -359,6 +332,34 @@ public KPI getKPIForName(String name){ GWT.log("FOUND KPI: "+foundKPI); return foundKPI; } + + /** + * Gets the KPI for name. + * + * @param name the name + * @return the KPI for name + */ + /*public KPI getKPIForName(String name){ + + //GWT.log("Selected KPIs: "+selectedKPIs); + GWT.log("Searching KPI name: "+name); + KPI foundKPI = null; + String purgedName = name.replaceAll("\\%", "").trim(); + GWT.log("Searching pureged KPI name: "+purgedName); + //String purgedName = name.trim(); + for (KPI kpi : selectedKPIs) { + String purgedKPIName = kpi.getName().replaceAll("\\%", "").trim(); + //String purgedKPIName = kpi.getName().trim(); + GWT.log("The purged KPI name: "+purgedName); + if(purgedKPIName.compareToIgnoreCase(purgedName)==0) { + foundKPI = kpi; + break; + } + + } + GWT.log("FOUND KPI: "+foundKPI); + return foundKPI; + }*/ /** * Adds the parameters. @@ -852,7 +853,7 @@ public KPI getKPIForName(String name){ private void displayOutputFilesAsStaticEntities(DataMinerResponse dmResponse, final DataMinerAlgorithms chartType, List inputKPIs, List outputKPIs, final String focusID, final Panel container, boolean displayError){ String title = displayError?"No results ":""; - title+=chartType; + title+=chartType.getTitle(); title+=inputKPIs.size()>1?" [Input KPIs: ":" [Input KPI: "; for (KPI kpi : inputKPIs) { @@ -1013,7 +1014,7 @@ public KPI getKPIForName(String name){ Map> mapParameters = new HashMap>(); mapParameters.put(PerformFishAnalyticsConstant.DATA_INPUTS, Arrays.asList(dataInParameters)); - final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType+" Analysis..."); + final LoaderIcon loaderIcon = new LoaderIcon("Submitting request to "+chartType.getTitle()+" Analysis..."); loaderIcon.setVisible(true); panel.setVisible(true); panel.add(loaderIcon); diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/RecapSubmitPage.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/RecapSubmitPage.java index a5c78fd..476e054 100644 --- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/RecapSubmitPage.java +++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/viewbinder/RecapSubmitPage.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.Set; import org.gcube.portlets.user.performfishanalytics.client.DataMinerAlgorithms; -import org.gcube.portlets.user.performfishanalytics.client.controllers.PerformFishAnalyticsController; import org.gcube.portlets.user.performfishanalytics.client.event.LoadSynopticTableEvent; import org.gcube.portlets.user.performfishanalytics.client.event.SubmitRequestEvent; import org.gcube.portlets.user.performfishanalytics.shared.KPI;