From 13a3cb091924fb5675d4b85f51d077708187d67c Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Mon, 11 Nov 2019 15:06:28 +0000 Subject: [PATCH] ref 17252: Enable DEA Analysis https://support.d4science.org/issues/17252 Updated DEA Analysis git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/performfish-analytics-portlet@182242 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/viewannualbinder/DeaAnnualPanelResult.java | 5 ++++- .../client/viewbinder/DeaPanelResult.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 a3316cf..9d5cd4f 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 @@ -162,6 +162,7 @@ public class DeaAnnualPanelResult extends Composite { @Override public void onClick(ClickEvent event) { + button_dea_analys_request.setEnabled(false); alert_error.clear(); cg_list_dea_input_kpi.setType(ControlGroupType.NONE); cg_list_dea_output_kpi.setType(ControlGroupType.NONE); @@ -169,12 +170,14 @@ public class DeaAnnualPanelResult extends Composite { if (list_dea_input_kpi.getItemCount() < 1) { showAlert("You must select at least one Input KPI", AlertType.ERROR, true, alert_error); cg_list_dea_input_kpi.setType(ControlGroupType.ERROR); + button_dea_analys_request.setEnabled(true); return; } if (list_dea_output_kpi.getItemCount() < 1) { showAlert("You must select at least one Output KPI", AlertType.ERROR, true, alert_error); cg_list_dea_output_kpi.setType(ControlGroupType.ERROR); + button_dea_analys_request.setEnabled(true); return; } @@ -694,7 +697,7 @@ public class DeaAnnualPanelResult extends Composite { title = title.substring(0, title.length() - 1) + "]"; } - // title+= " Focus "+focusID; + button_dea_analys_request.setEnabled(true); if (displayError) { Alert alert = new Alert(title); 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 dba222c..76a6251 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 @@ -164,6 +164,7 @@ public class DeaPanelResult extends Composite { @Override public void onClick(ClickEvent event) { + button_dea_analys_request.setEnabled(false); alert_error.clear(); cg_list_dea_input_kpi.setType(ControlGroupType.NONE); cg_list_dea_output_kpi.setType(ControlGroupType.NONE); @@ -171,12 +172,14 @@ public class DeaPanelResult extends Composite { if (list_dea_input_kpi.getItemCount() < 1) { showAlert("You must select at least one Input KPI", AlertType.ERROR, true, alert_error); cg_list_dea_input_kpi.setType(ControlGroupType.ERROR); + button_dea_analys_request.setEnabled(true); return; } if (list_dea_output_kpi.getItemCount() < 1) { showAlert("You must select at least one Output KPI", AlertType.ERROR, true, alert_error); cg_list_dea_output_kpi.setType(ControlGroupType.ERROR); + button_dea_analys_request.setEnabled(true); return; } @@ -694,7 +697,7 @@ public class DeaPanelResult extends Composite { title = title.substring(0, title.length() - 1) + "]"; } - // title+= " Focus "+focusID; + button_dea_analys_request.setEnabled(true); if (displayError) { Alert alert = new Alert(title);