git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/performfish-analytics-portlet@178512 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
32fd21051c
commit
7564c0984d
|
@ -248,73 +248,6 @@ public class PerformFishAnalyticsController {
|
||||||
viewController.enableLoadBatches(false);
|
viewController.enableLoadBatches(false);
|
||||||
viewController.enableAllAlgorithmsForSubmit(false);
|
viewController.enableAllAlgorithmsForSubmit(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/*if(isValidForm){
|
|
||||||
|
|
||||||
viewController.hideErrors();
|
|
||||||
|
|
||||||
final Map<String, List<String>> mapParameters = new HashMap<String, List<String>>();
|
|
||||||
|
|
||||||
String farmId = decryptParameters.getParameters().get(PerformFishAnalyticsConstant.FARMID_PARAM);
|
|
||||||
String batchType = viewController.getForm().getBatchType();
|
|
||||||
String species = viewController.getForm().getSpecies();
|
|
||||||
List<String> listArea = viewController.getForm().getArea();
|
|
||||||
List<String> listPeriod = viewController.getForm().getPeriod();
|
|
||||||
List<String> listQuarter = viewController.getForm().getQuarter();
|
|
||||||
|
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.PERFORM_FISH_FARMID_PARAM, Arrays.asList(farmId));
|
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.PERFORM_FISH_BATCH_TYPE_PARAM, Arrays.asList(batchType));
|
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.PERFORM_FISH_SPECIES_ID_PARAM, Arrays.asList(species));
|
|
||||||
|
|
||||||
if(!listArea.isEmpty()){
|
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.PERFORM_FISH_AREA_PARAM, listArea);
|
|
||||||
}
|
|
||||||
if(!listPeriod.isEmpty()){
|
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.PERFORM_FISH_PERIOD_PARAM, listPeriod);
|
|
||||||
}
|
|
||||||
if(!listQuarter.isEmpty()){
|
|
||||||
mapParameters.put(PerformFishAnalyticsConstant.PERFORM_FISH_QUARTER_PARAM, listQuarter);
|
|
||||||
}
|
|
||||||
|
|
||||||
final Modal modal = new Modal(true);
|
|
||||||
modal.setCloseVisible(false);
|
|
||||||
modal.hide(false);
|
|
||||||
final VerticalPanel vp = new VerticalPanel();
|
|
||||||
LoaderIcon loader = new LoaderIcon("Submitting request to perform-fish service...");
|
|
||||||
vp.add(loader);
|
|
||||||
loader.show(true);
|
|
||||||
modal.add(vp);
|
|
||||||
PerformFishAnalyticsServiceAsync.Util.getInstance().submitRequestToPerformFishService(mapParameters, new AsyncCallback<PerformFishResponse>() {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFailure(Throwable caught) {
|
|
||||||
modal.hide();
|
|
||||||
Window.alert(caught.getMessage());
|
|
||||||
// Map<String, String> map = new HashMap<String, String>();
|
|
||||||
// map.put(PerformFishAnalyticsConstant.BATCHES_TABLE, "https://data.d4science.org/shub/d26ce359-ec85-44a5-84f6-50cc9ce05f03");
|
|
||||||
// map.put(PerformFishAnalyticsConstant.BATCHES_TABLE_INTERNAL, "https://data1-d.d4science.org/shub/E_WERuV1JhandFcWdUN0tUK2xtRVB3Tm9XT3AyLzlaWUVsVW9ZM2diRVU0V2wxWDNYUFlYVVhhQlU4K0FvV3h1Tg==");
|
|
||||||
// callDataMinerServiceForChartTypeCorrelation(new PerformFishResponse(map, null));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onSuccess(PerformFishResponse performFishResponse) {
|
|
||||||
modal.hide();
|
|
||||||
viewController.managePerformFishServiceResponse(performFishResponse, mapParameters, POPULATION_LEVEL.BATCH);
|
|
||||||
|
|
||||||
// Window.alert("FAKE ON-SUCCESS");
|
|
||||||
// Map<String, String> map = new HashMap<String, String>();
|
|
||||||
// map.put(PerformFishAnalyticsConstant.BATCHES_TABLE, "https://data.d4science.org/shub/d26ce359-ec85-44a5-84f6-50cc9ce05f03");
|
|
||||||
// map.put(PerformFishAnalyticsConstant.BATCHES_TABLE_INTERNAL, "https://data1-d.d4science.org/shub/E_WERuV1JhandFcWdUN0tUK2xtRVB3Tm9XT3AyLzlaWUVsVW9ZM2diRVU0V2wxWDNYUFlYVVhhQlU4K0FvV3h1Tg==");
|
|
||||||
// callDataMinerServiceForChartTypeCorrelation(new PerformFishResponse(map, null));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
modal.show();
|
|
||||||
}else{
|
|
||||||
//IF IT IS NOT A VALID FORM WE NEED TO DISABLE DATAMINER REQUESTS
|
|
||||||
viewController.enableAllAlgorithmsSubmits(false);
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -323,7 +256,10 @@ public class PerformFishAnalyticsController {
|
||||||
@Override
|
@Override
|
||||||
public void onAddedBatchId(AddedBatchIdEvent checkValidBatchIdEvent) {
|
public void onAddedBatchId(AddedBatchIdEvent checkValidBatchIdEvent) {
|
||||||
|
|
||||||
viewController.validateBatchIdSelection();
|
boolean isBatchIdValid = viewController.validateBatchIdSelection();
|
||||||
|
if(isBatchIdValid)
|
||||||
|
viewController.enableAllAlgorithmsForSubmit(true);
|
||||||
|
|
||||||
//viewController.resyncSelectedKPIs();
|
//viewController.resyncSelectedKPIs();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -28,6 +28,7 @@ import org.gcube.portlets.user.performfishanalytics.shared.performfishservice.Pe
|
||||||
import com.github.gwtbootstrap.client.ui.ControlGroup;
|
import com.github.gwtbootstrap.client.ui.ControlGroup;
|
||||||
import com.github.gwtbootstrap.client.ui.ListBox;
|
import com.github.gwtbootstrap.client.ui.ListBox;
|
||||||
import com.github.gwtbootstrap.client.ui.Tab;
|
import com.github.gwtbootstrap.client.ui.Tab;
|
||||||
|
import com.github.gwtbootstrap.client.ui.constants.AlertType;
|
||||||
import com.github.gwtbootstrap.client.ui.constants.ControlGroupType;
|
import com.github.gwtbootstrap.client.ui.constants.ControlGroupType;
|
||||||
import com.google.gwt.core.shared.GWT;
|
import com.google.gwt.core.shared.GWT;
|
||||||
import com.google.gwt.dom.client.Style.Unit;
|
import com.google.gwt.dom.client.Style.Unit;
|
||||||
|
@ -360,13 +361,13 @@ public class PerformFishAnalyticsViewController {
|
||||||
bodyPage.hideError();
|
bodyPage.hideError();
|
||||||
List<KPI> selectedKPIs = recapPage.getSelectedKPIs();
|
List<KPI> selectedKPIs = recapPage.getSelectedKPIs();
|
||||||
if(selectedKPIs.size()<1){
|
if(selectedKPIs.size()<1){
|
||||||
bodyPage.showError("You must select at least 1 KPI");
|
bodyPage.showAlert("Please select at least 1 KPI", AlertType.ERROR);
|
||||||
//recapPage.setError("You must select a KPI");
|
//recapPage.setError("You must select a KPI");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(selectedKPIs.size()>10){
|
if(selectedKPIs.size()>10){
|
||||||
bodyPage.showError("You must select 10 KPI at most");
|
bodyPage.showAlert("Please select 10 KPI at most", AlertType.ERROR);
|
||||||
//recapPage.setError("You must select a KPI");
|
//recapPage.setError("You must select a KPI");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -425,7 +426,7 @@ public class PerformFishAnalyticsViewController {
|
||||||
batchIDAndListKPI.showError(msgError, true);
|
batchIDAndListKPI.showError(msgError, true);
|
||||||
return false;*/
|
return false;*/
|
||||||
|
|
||||||
String msgError = "Could not find valid data. Please change the selection (Areas, Periods and so on) parameters";
|
String msgError = "Could not find valid data. Please change your selection (Areas, Periods and so on parameters)";
|
||||||
cg_batch_id.setType(ControlGroupType.INFO);
|
cg_batch_id.setType(ControlGroupType.INFO);
|
||||||
batchIDAndListKPI.showError(msgError, true);
|
batchIDAndListKPI.showError(msgError, true);
|
||||||
batchIDAndListKPI.enableButtonLoadBatches(false);
|
batchIDAndListKPI.enableButtonLoadBatches(false);
|
||||||
|
|
|
@ -9,6 +9,7 @@ import com.google.gwt.user.client.ui.FlowPanel;
|
||||||
import com.google.gwt.user.client.ui.HTML;
|
import com.google.gwt.user.client.ui.HTML;
|
||||||
import com.google.gwt.user.client.ui.VerticalPanel;
|
import com.google.gwt.user.client.ui.VerticalPanel;
|
||||||
|
|
||||||
|
// TODO: Auto-generated Javadoc
|
||||||
/**
|
/**
|
||||||
* The Class BodyPage.
|
* The Class BodyPage.
|
||||||
*
|
*
|
||||||
|
@ -17,7 +18,10 @@ import com.google.gwt.user.client.ui.VerticalPanel;
|
||||||
*/
|
*/
|
||||||
public class BodyPanel extends VerticalPanel{
|
public class BodyPanel extends VerticalPanel{
|
||||||
|
|
||||||
|
/** The loader. */
|
||||||
private LoaderIcon loader = new LoaderIcon();
|
private LoaderIcon loader = new LoaderIcon();
|
||||||
|
|
||||||
|
/** The panel error. */
|
||||||
private FlowPanel panelError = new FlowPanel();
|
private FlowPanel panelError = new FlowPanel();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -56,17 +60,18 @@ public class BodyPanel extends VerticalPanel{
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show error.
|
* Show alert.
|
||||||
*
|
*
|
||||||
* @param txt the txt
|
* @param txt the txt
|
||||||
|
* @param alertType the alert type
|
||||||
*/
|
*/
|
||||||
public void showError(String txt) {
|
public void showAlert(String txt, AlertType alertType) {
|
||||||
panelError.clear();
|
panelError.clear();
|
||||||
panelError.setVisible(true);
|
panelError.setVisible(true);
|
||||||
Alert msg = new Alert(txt);
|
Alert msg = new Alert(txt);
|
||||||
msg.setAnimation(true);
|
msg.setAnimation(true);
|
||||||
msg.setClose(false);
|
msg.setClose(false);
|
||||||
msg.setType(AlertType.ERROR);
|
msg.setType(alertType);
|
||||||
panelError.add(msg);
|
panelError.add(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue