From b8863b21f5307ae60ec7b64b44032ccba7ab6e29 Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 4 Nov 2014 17:33:31 +0000
Subject: [PATCH] Fixed wizard navigation

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-map-widget@101455 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../mapwidget/client/MapWidgetConfigCard.java |  2 +-
 .../mapwidget/client/MapWidgetDetailCard.java |  3 ++-
 .../MapWidgetGeometrySelectionCard.java       | 22 +++++++++++++++----
 .../grid/GeometrySelectionGridPanel.java      |  2 +-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetConfigCard.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetConfigCard.java
index b073a09..53104da 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetConfigCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetConfigCard.java
@@ -166,7 +166,7 @@ public class MapWidgetConfigCard extends WizardCard {
 				getWizardWindow().addCard(mapWidgetDetailCard);
 				getWizardWindow().nextCard();
 			} else {
-				MapWidgetGeometrySelectionCard mapGeometrySeslectionCard = new MapWidgetGeometrySelectionCard(
+			    MapWidgetGeometrySelectionCard mapGeometrySeslectionCard = new MapWidgetGeometrySelectionCard(
 						mapCreationSession);
 				getWizardWindow().addCard(mapGeometrySeslectionCard);
 				getWizardWindow().nextCard();
diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetDetailCard.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetDetailCard.java
index 2d8520c..69ff4ef 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetDetailCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetDetailCard.java
@@ -240,6 +240,7 @@ public class MapWidgetDetailCard extends WizardCard {
 
 		getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
 		getWizardWindow().setEnableNextButton(true);
+		getWizardWindow().setEnableBackButton(true);
 
 	}
 
@@ -251,7 +252,7 @@ public class MapWidgetDetailCard extends WizardCard {
 
 			public void onHide(HideEvent event) {
 				getWizardWindow().setEnableNextButton(true);
-				getWizardWindow().setEnableBackButton(false);
+				getWizardWindow().setEnableBackButton(true);
 
 			}
 		};
diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetGeometrySelectionCard.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetGeometrySelectionCard.java
index 3324866..e9b8276 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetGeometrySelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/MapWidgetGeometrySelectionCard.java
@@ -25,13 +25,13 @@ import com.sencha.gxt.widget.core.client.form.FormPanel;
 public class MapWidgetGeometrySelectionCard extends WizardCard {
 
 	protected MapCreationSession mapCreationSession;
-
+	private MapWidgetGeometrySelectionCard thisCard;
 	private GeometrySelectionGridPanel geometrySelectionGridPanel;
 
 	public MapWidgetGeometrySelectionCard(
 			final MapCreationSession mapCreationSession) {
 		super("Geometry Selection", "");
-
+		this.thisCard=this;
 		if (mapCreationSession == null) {
 			Log.error("MapCreationSession is null");
 		}
@@ -78,8 +78,22 @@ public class MapWidgetGeometrySelectionCard extends WizardCard {
 			}
 
 		};
-
+		
+		Command sayPreviousCard = new Command() {
+			public void execute() {
+				try {
+					getWizardWindow().previousCard();
+					getWizardWindow().removeCard(thisCard);
+					Log.info("Remove MapWidgetGeometrySelectionCard");
+				} catch (Exception e) {
+					Log.error("sayPreviousCard :" + e.getLocalizedMessage());
+				}
+			}
+		};
+		
+		getWizardWindow().setPreviousButtonCommand(sayPreviousCard);
 		getWizardWindow().setNextButtonCommand(sayNextCard);
+		
 		setEnableBackButton(true);
 		setEnableNextButton(true);
 	}
@@ -112,7 +126,7 @@ public class MapWidgetGeometrySelectionCard extends WizardCard {
 
 	protected void goNext() {
 		try {
-			MapWidgetDetailCard mapWidgetDetailCard = new MapWidgetDetailCard(
+		    MapWidgetDetailCard mapWidgetDetailCard = new MapWidgetDetailCard(
 					mapCreationSession);
 			getWizardWindow().addCard(mapWidgetDetailCard);
 			getWizardWindow().nextCard();
diff --git a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/GeometrySelectionGridPanel.java b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/GeometrySelectionGridPanel.java
index 44e01e1..594a1f3 100644
--- a/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/GeometrySelectionGridPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/mapwidget/client/grid/GeometrySelectionGridPanel.java
@@ -33,7 +33,7 @@ import com.sencha.gxt.widget.core.client.grid.Grid;
 public class GeometrySelectionGridPanel extends ContentPanel implements
 		HasSelectionHandlers<ColumnData> {
 	//private static final String GRID_WIDTH  ="524px";
-	private static final String GRID_HEIGHT = "320px";
+	private static final String GRID_HEIGHT = "340px";
 	protected static final ColumnDataProperties props = GWT
 			.create(ColumnDataProperties.class);
 	protected final CheckBoxSelectionModel<ColumnData> sm;