diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalytics.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalytics.java
index e425bd0..cabda21 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalytics.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/PerformFishAnalytics.java
@@ -7,7 +7,9 @@ import java.util.Map;
import org.gcube.portlets.user.performfishanalytics.client.PerformFishAnalyticsConstant.POPULATION_LEVEL;
import org.gcube.portlets.user.performfishanalytics.client.annualcontrollers.PerformFishAnnualAnalyticsController;
import org.gcube.portlets.user.performfishanalytics.client.controllers.PerformFishAnalyticsController;
+import org.gcube.portlets.user.performfishanalytics.client.controllers.PerformFishAnalyticsViewController;
import org.gcube.portlets.user.performfishanalytics.client.event.LoadPopulationTypeEvent;
+import org.gcube.portlets.user.performfishanalytics.client.resources.PerformFishResources;
import org.gcube.portlets.user.performfishanalytics.client.view.util.DecodeParameterUtil;
import org.gcube.portlets.user.performfishanalytics.shared.performfishservice.PerformFishInitParameter;
@@ -15,8 +17,14 @@ import com.google.gwt.core.client.EntryPoint;
import com.google.gwt.core.client.Scheduler;
import com.google.gwt.core.client.Scheduler.ScheduledCommand;
import com.google.gwt.core.shared.GWT;
+import com.google.gwt.dom.client.DivElement;
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.TextResource;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.RootPanel;
/**
* Entry point classes define onModuleLoad()
.
@@ -50,7 +58,9 @@ public class PerformFishAnalytics implements EntryPoint {
final String farmidParam = initParams.get(PerformFishAnalyticsConstant.QUERY_STRING_FARMID_PARAM);
if(farmidParam==null || farmidParam.isEmpty()){
- Window.alert("Error: no '"+PerformFishAnalyticsConstant.QUERY_STRING_FARMID_PARAM+"' param detected");
+ String msg = "No '"+PerformFishAnalyticsConstant.QUERY_STRING_FARMID_PARAM+"' param detected";
+ showErrorPage(msg);
+ Window.alert("Error: "+msg);
return;
}
@@ -100,7 +110,9 @@ public class PerformFishAnalytics implements EntryPoint {
//CALLING THE PORTLET WITHOUT ANNUAL CONFIGURATION
if(batchtypeParam==null || batchtypeParam.isEmpty()){
- Window.alert("Error: no '"+PerformFishAnalyticsConstant.PERFORM_FISH_BATCH_TYPE_PARAM+"' param detected");
+ String msg = "No '"+PerformFishAnalyticsConstant.PERFORM_FISH_BATCH_TYPE_PARAM+"' param detected";
+ showErrorPage(msg);
+ Window.alert("Error: "+msg);
return;
}
@@ -127,4 +139,13 @@ public class PerformFishAnalytics implements EntryPoint {
}
});
}
+
+ private void showErrorPage(String msg) {
+ TextResource errorHtmlPage = PerformFishResources.INSTANCE.errorPage();
+ HTML asHtml = new HTML(errorHtmlPage.getText());
+ //asHtml.asWidget().getElement().
+ RootPanel.get(PerformFishAnalyticsViewController.PERFORM_FISH_ANALYTICS_DIV).add(asHtml);
+ DivElement errorID = (DivElement) Document.get().getElementById("error-page");
+ errorID.setInnerHTML(msg);
+ }
}
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 3d84693..c8be090 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
@@ -84,104 +84,6 @@ public class PerformFishAnalyticsController {
registerHandlers();
viewController = new PerformFishAnalyticsViewController();
-
- /*viewAnnualController = new PerformFishAnnualAnalyticsViewController();
-
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
- @Override
- public void execute() {
-
- Map initParams = new HashMap();
- for (String key : Window.Location.getParameterMap().keySet()) {
- try {
- String dKeY = DecodeParameterUtil.base64Decode(key);
- String eValue = Window.Location.getParameter(key);
- String dParam = DecodeParameterUtil.base64Decode(eValue);
- initParams.put(dKeY, dParam);
- } catch (Exception e) {
- GWT.log("Error: "+e.getMessage());
- }
- }
-
- GWT.log("Decoded parameters: "+initParams);
-
-
- final String farmidParam = initParams.get(PerformFishAnalyticsConstant.QUERY_STRING_FARMID_PARAM);
-
- if(farmidParam==null || farmidParam.isEmpty()){
- Window.alert("Error: no '"+PerformFishAnalyticsConstant.QUERY_STRING_FARMID_PARAM+"' param detected");
- return;
- }
-
- final String annual = initParams.get(PerformFishAnalyticsConstant.QUERY_STRING_ANNUAL_PARAMETER);
-
- boolean isAnnualCall = false;
-
- try {
- isAnnualCall = Boolean.parseBoolean(annual);
- GWT.log("Read decoded isAnnual at: "+isAnnualCall);
- }catch (Exception e) {
- GWT.log("Forcing isAnnual at TRUE");
- isAnnualCall = false;
- }
-
- String batchtypeParam = initParams.get(PerformFishAnalyticsConstant.QUERY_STRING_BATCHTYPE_PARAM);
-
- //IS ANNUAL CALL
- if(isAnnualCall) {
-
- //CALLING THE PORTLET WITH ANNUAL CONFIGURATION
- batchtypeParam = PerformFishAnalyticsConstant.BATCH_LEVEL.GROW_OUT_AGGREGATED_CLOSED_BATCHES.name();
- GWT.log("Hard cabling batchtypeParam as: "+batchtypeParam);
-
- PerformFishInitParameter performFishInitParams = new PerformFishInitParameter();
- performFishInitParams.addParameter(PerformFishAnalyticsConstant.PERFORM_FISH_BATCH_TYPE_PARAM, batchtypeParam);
- performFishInitParams.addParameter(PerformFishAnalyticsConstant.PERFORM_FISH_FARMID_PARAM, farmidParam);
-
- PerformFishAnalyticsServiceAsync.Util.getInstance().validParameters(performFishInitParams, new AsyncCallback() {
-
- @Override
- public void onSuccess(PerformFishInitParameter result) {
- decryptParameters = result;
- eventBus.fireEvent(new LoadPopulationTypeEvent(POPULATION_LEVEL.FARM.name(), null));
- }
-
- @Override
- public void onFailure(Throwable caught) {
-
- Window.alert(caught.getMessage());
- }
- });
-
- }else {
-
- //CALLING THE PORTLET WITHOUT ANNUAL CONFIGURATION
- if(batchtypeParam==null || batchtypeParam.isEmpty()){
- Window.alert("Error: no '"+PerformFishAnalyticsConstant.PERFORM_FISH_BATCH_TYPE_PARAM+"' param detected");
- return;
- }
-
- PerformFishInitParameter performFishInitParams = new PerformFishInitParameter();
- performFishInitParams.addParameter(PerformFishAnalyticsConstant.PERFORM_FISH_BATCH_TYPE_PARAM, batchtypeParam);
- performFishInitParams.addParameter(PerformFishAnalyticsConstant.PERFORM_FISH_FARMID_PARAM, farmidParam);
-
- PerformFishAnalyticsServiceAsync.Util.getInstance().validParameters(performFishInitParams, new AsyncCallback() {
-
- @Override
- public void onSuccess(PerformFishInitParameter result) {
- decryptParameters = result;
- eventBus.fireEvent(new LoadPopulationTypeEvent(POPULATION_LEVEL.BATCH.name(), null));
- }
-
- @Override
- public void onFailure(Throwable caught) {
-
- Window.alert(caught.getMessage());
- }
- });
- }
- }
- });*/
}
/**
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/dialog/DialogConfirm.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/dialog/DialogConfirm.java
index d61e53c..af01ea4 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/dialog/DialogConfirm.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/dialog/DialogConfirm.java
@@ -6,7 +6,7 @@ package org.gcube.portlets.user.performfishanalytics.client.dialog;
-import org.gcube.portlets.user.performfishanalytics.client.resources.Icons;
+import org.gcube.portlets.user.performfishanalytics.client.resources.PerformFishResources;
import com.google.gwt.dom.client.Style.Unit;
import com.google.gwt.event.dom.client.ClickEvent;
@@ -34,7 +34,7 @@ public class DialogConfirm extends DialogBox implements ClickHandler {
private DockPanel dock = new DockPanel();
private Button yesButton;
private VerticalPanel vpContainer;
- private ImageResource loading = Icons.ICONS.loading();
+ private ImageResource loading = PerformFishResources.INSTANCE.loading();
private HorizontalPanel hpButtons = new HorizontalPanel();
private Button noButton;
/**
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/dialog/PanelConfirmBuilder.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/dialog/PanelConfirmBuilder.java
index d8c8983..5076374 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/dialog/PanelConfirmBuilder.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/dialog/PanelConfirmBuilder.java
@@ -5,7 +5,7 @@ package org.gcube.portlets.user.performfishanalytics.client.dialog;
-import org.gcube.portlets.user.performfishanalytics.client.resources.Icons;
+import org.gcube.portlets.user.performfishanalytics.client.resources.PerformFishResources;
import com.github.gwtbootstrap.client.ui.Alert;
import com.github.gwtbootstrap.client.ui.constants.AlertType;
@@ -35,7 +35,7 @@ public abstract class PanelConfirmBuilder {
private DockPanel dock = new DockPanel();
private Button yesButton;
private VerticalPanel vpContainer;
- private ImageResource loading = Icons.ICONS.loading();
+ private ImageResource loading = PerformFishResources.INSTANCE.loading();
private HorizontalPanel hpButtons = new HorizontalPanel();
private Button noButton;
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/Error_Page.html b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/Error_Page.html
new file mode 100644
index 0000000..c39ceaa
--- /dev/null
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/Error_Page.html
@@ -0,0 +1,153 @@
+
+
+
+
+
+
+
+
+
+PerformFish Error Page
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
:(
+
+
PerformFISH Error Page
+
+
+
+
+
+
+
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/Icons.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/PerformFishResources.java
similarity index 76%
rename from src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/Icons.java
rename to src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/PerformFishResources.java
index 4def083..c80704a 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/Icons.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/resources/PerformFishResources.java
@@ -6,17 +6,19 @@ package org.gcube.portlets.user.performfishanalytics.client.resources;
import com.google.gwt.core.client.GWT;
import com.google.gwt.resources.client.ClientBundle;
import com.google.gwt.resources.client.ImageResource;
+import com.google.gwt.resources.client.TextResource;
/**
- * The Interface Icons.
+ * The Interface PerformFishResources.
*
* @author Francesco Mangiacrapa at ISTI-CNR (francesco.mangiacrapa@isti.cnr.it)
- * Jan 16, 2019
+ *
+ * May 8, 2019
*/
-public interface Icons extends ClientBundle {
+public interface PerformFishResources extends ClientBundle {
- public static final Icons ICONS = GWT.create(Icons.class);
+ public static final PerformFishResources INSTANCE = GWT.create(PerformFishResources.class);
/**
* Loading.
@@ -73,4 +75,7 @@ public interface Icons extends ClientBundle {
*/
@Source("github.png")
ImageResource github();
+
+ @Source("Error_Page.html")
+ public TextResource errorPage();
}
diff --git a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/LoaderIcon.java b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/LoaderIcon.java
index de4e449..a2264b7 100644
--- a/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/LoaderIcon.java
+++ b/src/main/java/org/gcube/portlets/user/performfishanalytics/client/view/LoaderIcon.java
@@ -3,7 +3,7 @@
*/
package org.gcube.portlets.user.performfishanalytics.client.view;
-import org.gcube.portlets.user.performfishanalytics.client.resources.Icons;
+import org.gcube.portlets.user.performfishanalytics.client.resources.PerformFishResources;
import com.google.gwt.user.client.ui.FocusPanel;
import com.google.gwt.user.client.ui.HTML;
@@ -19,7 +19,7 @@ import com.google.gwt.user.client.ui.Image;
public class LoaderIcon extends FocusPanel{
- private Image imgLoading = new Image(Icons.ICONS.loading());
+ private Image imgLoading = new Image(PerformFishResources.INSTANCE.loading());
private HTML txtLoading = new HTML("");
private HorizontalPanel hp = new HorizontalPanel();