gCubeSystem
/
tabular-data-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

81: Allow the creation and use of expressions on multi column in TDM portlet 

Task-Url: https://support.d4science.org/issues/81

Updated TabularDataController

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@114768 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-05-15 16:50:36 +00:00
parent 43ffe916fc
commit 192806eec2
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
View File

@ -18,12 +18,13 @@ import org.gcube.portlets.user.td.client.template.TemplateDeleteDialog;
import org.gcube.portlets.user.td.client.template.TemplateOpenDialog;
import org.gcube.portlets.user.td.client.template.TemplateShareDialog;
import org.gcube.portlets.user.td.codelistmappingimportwidget.client.CodelistMappingImportWizardTD;
import org.gcube.portlets.user.td.columnwidget.client.batch.ReplaceBatchDialog;
import org.gcube.portlets.user.td.columnwidget.client.replace.ReplaceAllDialog;
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.expressionwidget.client.MultiColumnFilterDialog;
import org.gcube.portlets.user.td.expressionwidget.client.ReplaceColumnByExpressionDialog;
import org.gcube.portlets.user.td.expressionwidget.client.RowsDeleteByExpressionDialog;
import org.gcube.portlets.user.td.expressionwidget.client.ReplaceColumnByMultiColumnExpressionDialog;
import org.gcube.portlets.user.td.expressionwidget.client.RowsDeleteByMultiColumnExpressionDialog;
import org.gcube.portlets.user.td.expressionwidget.client.RuleDialog;
import org.gcube.portlets.user.td.extractcodelistwidget.client.ExtractCodelistWizardTD;
import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync;
@ -36,8 +37,6 @@ import org.gcube.portlets.user.td.mainboxwidget.client.MainBoxPanel;
import org.gcube.portlets.user.td.mapwidget.client.MapWidgetTD;
import org.gcube.portlets.user.td.openwidget.client.TDOpen;
import org.gcube.portlets.user.td.replacebyexternalwidget.client.ReplaceByExternalTD;
import org.gcube.portlets.user.td.columnwidget.client.batch.ReplaceBatchDialog;
import org.gcube.portlets.user.td.columnwidget.client.replace.ReplaceAllDialog;
import org.gcube.portlets.user.td.sdmxexportwidget.client.SDMXExportWizardTD;
import org.gcube.portlets.user.td.sdmximportwidget.client.SDMXImportWizardTD;
import org.gcube.portlets.user.td.sharewidget.client.TRShare;
@ -1825,9 +1824,13 @@ public class TabularDataController {
private void openColumnFilter(String columnLocalId, String columnName) {
Log.debug("Request Open Column Filter Dialog");
if (trId != null) {
ColumnFilterDialog cfDialog = new ColumnFilterDialog(trId,
/*ColumnFilterDialog cfDialog = new ColumnFilterDialog(trId,
columnLocalId, eventBus);
cfDialog.show();
cfDialog.show();*/
MultiColumnFilterDialog mcfDialog=new MultiColumnFilterDialog(trId, eventBus);
mcfDialog.show();
} else {
Log.error("TRId is null");
UtilsGXT3.alert("Error", "No current tabular resource present");
@ -1842,9 +1845,9 @@ public class TabularDataController {
String columnName) {
Log.debug("Request Open Row Delete By Expression Dialog");
if (trId != null) {
RowsDeleteByExpressionDialog cfDialog = new RowsDeleteByExpressionDialog(
trId, columnLocalId, eventBus);
cfDialog.show();
RowsDeleteByMultiColumnExpressionDialog rowsDeleteDialog = new RowsDeleteByMultiColumnExpressionDialog(
trId, eventBus);
rowsDeleteDialog.show();
} else {
Log.error("TRId is null");
UtilsGXT3.alert("Error", "No current tabular resource present");
@ -1859,7 +1862,7 @@ public class TabularDataController {
String columnName) {
Log.debug("Request Open Replace Column By Expression Dialog");
if (trId != null) {
ReplaceColumnByExpressionDialog rceDialog = new ReplaceColumnByExpressionDialog(
ReplaceColumnByMultiColumnExpressionDialog rceDialog = new ReplaceColumnByMultiColumnExpressionDialog(
trId, columnLocalId, eventBus);
rceDialog.show();
} else {

4
src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
View File

@ -99,11 +99,11 @@
<set-property name="log_ConsoleLogger" value="ENABLED" />
<set-property name="log_DivLogger" value="ENABLED" />
<set-property name="log_GWTLogger" value="ENABLED" />
<set-property name="log_SystemLogger" value="ENABLED" /> -->
<set-property name="log_SystemLogger" value="ENABLED" /> -->
<!-- Not in GWT 2.6 <set-property name="log_FirebugLogger" value="ENABLED"
/> -->
<set-property name="log_ConsoleLogger" value="DISABLED" />
<set-property name="log_DivLogger" value="DISABLED" />
<set-property name="log_GWTLogger" value="DISABLED" />