From 72d1ccc46eff00983181c77a65ccab24f275badb Mon Sep 17 00:00:00 2001
From: Giancarlo Panichi <giancarlo.panichi@isti.cnr.it>
Date: Tue, 24 Jun 2014 09:57:45 +0000
Subject: [PATCH] Added GroupBy

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@97681 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .settings/org.eclipse.wst.common.component    |  3 +++
 .../user/td/client/TabularDataController.java | 19 +++++++++++++++++++
 .../user/td/client/ribbon/ModifyToolBar.java  |  7 +++----
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 324626b..a7ba65f 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -37,6 +37,9 @@
         <dependent-module archiveName="tabular-data-column-widget-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-column-widget/tabular-data-column-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
+        <dependent-module archiveName="tabular-data-toolbox-widget-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-toolbox-widget/tabular-data-toolbox-widget">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="tabular-data-extractcodelist-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-extractcodelist-widget/tabular-data-extractcodelist-widget">
             <dependency-type>uses</dependency-type>
         </dependent-module>
diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
index 27360bb..ec4f10f 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
@@ -525,6 +525,7 @@ public class TabularDataController {
 			case TABLEUNION:
 				break;
 			case TABLEGROUPBY:
+				openGroupBy();
 				break;
 			case TABLEAGGREAGETE:
 				break;
@@ -1097,6 +1098,24 @@ public class TabularDataController {
 			UtilsGXT3.alert("Error", "No tabular resource present");
 		}
 	}
+	
+	protected void openGroupBy() {
+		openGroupBy(null);
+	}
+
+	protected void openGroupBy(String columnName) {
+		Log.debug("Request Group By Tab");
+		if (trId != null) {
+			WidgetRequestEvent e = new WidgetRequestEvent(
+					WidgetRequestType.GROUPBYPANEL);
+			e.setTrId(trId);
+			e.setColumnName(columnName);
+			eventBus.fireEvent(e);
+		} else {
+			Log.error("TRId is null");
+			UtilsGXT3.alert("Error", "No tabular resource present");
+		}
+	}
 
 	protected void openColumnLabel() {
 		openColumnLabel(null);
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
index 1349d29..4b2256f 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
@@ -120,8 +120,7 @@ public class ModifyToolBar {
 		groupbyButton.addSelectHandler(new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
-				// eventBus.fireEvent(new
-				// ImportTableEvent(ImportTableType.JSON));
+				eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEGROUPBY));
 			}
 		});
 
@@ -138,7 +137,7 @@ public class ModifyToolBar {
 		aggregateButton.addSelectHandler(new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
-				//eventBus.fireEvent(new RibbonEvent(RibbonType.AGGREGATE));
+				eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEAGGREAGETE));
 			}
 		});
 
@@ -334,7 +333,7 @@ public class ModifyToolBar {
 				// Table
 				filterButton.disable();
 				unionButton.disable();
-				groupbyButton.disable();
+				groupbyButton.enable();
 				aggregateButton.disable();
 				addRowButton.enable();
 				deleteRowButton.enable();