diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index 053b6a7..1d3727b 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -4,6 +4,9 @@
+
+ uses
+
uses
@@ -19,30 +22,15 @@
uses
-
- uses
-
uses
-
- uses
-
uses
uses
-
- uses
-
-
- uses
-
-
- uses
-
diff --git a/pom.xml b/pom.xml
index e14ab51..95bdd98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,9 +139,16 @@
[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
provided
+
+
+
+
+ org.gcube.portlets.user
+ tabular-data-expression-widget
+ [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
+
-
-
+
org.gcube.portlets.user
tabular-data-widgetx-tdx-source
@@ -173,27 +180,27 @@
[1.2.0-SNAPSHOT, 2.0.0-common)
-
+
org.gcube.portlets.user
tabular-data-widget-common-event
[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)
-
+
org.gcube.portlets.user
tabular-data-gwt-service
[2.0.0-SNAPSHOT,3.0.0-SNAPSHOT)
-
+
org.gcube.portlets.user
tabular-data-wizard-widget
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
-
+
@@ -221,7 +228,7 @@
org.gcube.portlets.user
tabular-data-csv-export-widget
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
-
+
@@ -229,7 +236,7 @@
tabular-data-sdmx-export-widget
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
-
+
org.gcube.portlets.user
@@ -244,13 +251,9 @@
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT]
-
+
@@ -263,7 +266,7 @@
slf4j-api
compile
-
+
ch.qos.logback
logback-classic
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 4699b05..553aefc 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
@@ -5,6 +5,7 @@ package org.gcube.portlets.user.td.client;
import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD;
import org.gcube.portlets.user.td.csvimportwidget.client.CSVImportWizardTD;
+import org.gcube.portlets.user.td.expressionwidget.client.ColumnFilterDialog;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
import org.gcube.portlets.user.td.openwidget.client.TDOpen;
import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD;
@@ -630,6 +631,15 @@ public class TabularDataController {
}
+ protected void openColumnFilter(String columnName) {
+ Log.debug("Request Open Column Filter Dialog");
+ if (trId != null) {
+ ColumnFilterDialog cfDialog=new ColumnFilterDialog(trId, columnName, eventBus);
+ cfDialog.show();
+ }
+ }
+
+
protected void openColumnType() {
openColumnType(null);
}
@@ -645,6 +655,10 @@ public class TabularDataController {
}
}
+
+
+
+
protected void openColumnDelete() {
openColumnDelete(null);
}
@@ -712,7 +726,7 @@ public class TabularDataController {
} else {
if (opId.compareTo(GridHeaderOperationId.COLUMNFILTER
.toString()) == 0) {
-
+ openColumnFilter(columnName);
} else {
if (opId.compareTo(GridHeaderOperationId.ANNOTATIONADD
.toString()) == 0) {
diff --git a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index 8e05ecd..b352287 100644
--- a/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -17,6 +17,7 @@
+
@@ -35,7 +36,7 @@
-
+
diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
index 1f8ac46..4975174 100644
--- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
+++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
@@ -17,6 +17,7 @@
+
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index d638468..75bfc33 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -29,6 +29,16 @@
org.gcube.portlets.user.td.gwtservice.server.TDGWTServiceImpl
+
+
+ ExpressionService
+ org.gcube.portlets.user.td.expressionwidget.server.ExpressionServiceImpl
+
+
+
+ CExpressionMapServlet
+ org.gcube.portlets.user.td.expressionwidget.server.CExpressionMapServlet
+
@@ -124,6 +134,19 @@
/tabulardataportlet/TDGWTService
+
+
+ ExpressionService
+ /tabulardataportlet/ExpressionService
+
+
+ CExpressionMapServlet
+ /tabulardataportlet/CExpressionMap
+
+
+
+
+
tabularDataTasksWidgetService
diff --git a/src/main/webapp/tabulardataportlet.html b/src/main/webapp/tabulardataportlet.html
index 9860255..54f1a70 100644
--- a/src/main/webapp/tabulardataportlet.html
+++ b/src/main/webapp/tabulardataportlet.html
@@ -13,7 +13,7 @@
- Tabular Data Porlet
+ Tabular Data Portlet