From 7d16cfbea5904223fb508ba583e69b09424a70e1 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 27 May 2014 16:21:39 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@96152 82a268e6-3cf1-43bd-a215-b396298e98cf --- .settings/org.eclipse.wst.common.component | 3 ++ pom.xml | 7 ++++ .../user/td/client/TabularDataController.java | 42 +++++++++++++++++++ .../td/client/ribbon/CurationToolBar.java | 4 +- .../user/td/tabulardataportlet.gwt.xml | 2 + .../user/td/tabulardataportlet.gwt.xml | 10 +++-- 6 files changed, 62 insertions(+), 6 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 2a4aeb7..86b9885 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -55,6 +55,9 @@ uses + + uses + diff --git a/pom.xml b/pom.xml index 4994b7f..7b5c7d0 100644 --- a/pom.xml +++ b/pom.xml @@ -302,6 +302,13 @@ tabular-data-toolbox-widget [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + + + + org.gcube.portlets.user + tabular-data-extractcodelist-widget + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + 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 ad907ab..5cabe22 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 @@ -14,6 +14,7 @@ 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.extractcodelistwidget.client.ExtractCodelistWizardTD; import org.gcube.portlets.user.td.gwtservice.client.rpc.TDGWTServiceAsync; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; import org.gcube.portlets.user.td.openwidget.client.TDOpen; @@ -504,6 +505,7 @@ public class TabularDataController { case NORMALIZE: break; case EXTRACTCODELIST: + openExtractCodelistWizard(); break; case GENERATESUMMARY: break; @@ -695,6 +697,10 @@ public class TabularDataController { } + + + + protected void openSDMXExportWizard() { GWT.runAsync(new RunAsyncCallback() { @@ -729,7 +735,43 @@ public class TabularDataController { }); } + + protected void openExtractCodelistWizard() { + GWT.runAsync(new RunAsyncCallback() { + public void onSuccess() { + openWizard(); + ExtractCodelistWizardTD extractCodelistWizard = new ExtractCodelistWizardTD( + "Extract Codelist", eventBus); + + extractCodelistWizard.addListener(new WizardListener() { + public void failed(Throwable throwable, String reason, + String details) { + UtilsGXT3.alert(reason, details); + resumeUIState(); + } + + public void completed(TRId id) { + openTable(id); + + } + + public void aborted() { + resumeUIState(); + } + }); + + extractCodelistWizard.show(); + } + + public void onFailure(Throwable reason) { + asyncCodeLoadingFailed(reason); + } + }); + + } + + /** * */ diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java index b29e153..fd98340 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/CurationToolBar.java @@ -282,7 +282,7 @@ public class CurationToolBar { helperGroup.setId("Helper"); helperGroup.setStyleName("ribbon"); helperGroup.setHeadingText("Helper"); - helperGroup.disable(); + helperGroup.enable(); toolBar.add(helperGroup); FlexTable helperLayout = new FlexTable(); @@ -394,7 +394,7 @@ public class CurationToolBar { tableTypeButton.enable(); addColumnButton.disable(); deleteColumnButton.enable(); - extractCodelistButton.disable(); + extractCodelistButton.enable(); generateSummaryButton.disable(); break; case WIZARD_OPEN: 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 3b0d9ba..ca030d5 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 @@ -36,6 +36,8 @@ name='org.gcube.portlets.user.td.csvimportwidget.CSVImportWizardTD' /> + 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 9f97716..67f7f57 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 @@ -35,6 +35,8 @@ name='org.gcube.portlets.user.td.csvimportwidget.CSVImportWizardTD' /> + @@ -45,18 +47,18 @@ - + - +