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

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@98825 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-07-18 18:03:12 +00:00
parent 8a6bcf09fe
commit 285ebafb54
6 changed files with 68 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.settings/org.eclipse.wst.common.component
View File

@ -25,12 +25,21 @@
<dependent-module archiveName="tabular-data-wizard-widget-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-wizard-widget/tabular-data-wizard-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-csv-import-widget-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-import-widget/tabular-data-csv-import-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-sdmx-import-widget-2.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-import-widget/tabular-data-sdmx-import-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-open-widget-2.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-open-widget/tabular-data-open-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-csv-export-widget-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-csv-export-widget/tabular-data-csv-export-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-sdmx-export-widget-1.2.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-sdmx-export-widget/tabular-data-sdmx-export-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="tabular-data-codelistmapping-import-widget-1.1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-codelistmapping-import-widget/tabular-data-codelistmapping-import-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
@ -52,6 +61,9 @@
<dependent-module archiveName="tabular-data-extractcodelist-widget-1.1.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>
<dependent-module archiveName="tabular-data-unionwizard-widget-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-unionwizard-widget/tabular-data-unionwizard-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="tabular-data-portlet"/>
<property name="java-output-path" value="/tabular-data-portlet/target/tabular-data-portlet-2.0.0-SNAPSHOT/WEB-INF/classes"/>
</wb-module>

8
pom.xml
View File

@ -320,6 +320,14 @@
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!-- tabular-data-unionwizard-widget -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-unionwizard-widget</artifactId>
<version>[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)</version>
</dependency>
<!--tabular-data-tasks-widget -->
<dependency>
<groupId>org.gcube.portlets.user</groupId>

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

@ -28,6 +28,7 @@ import org.gcube.portlets.user.td.tablewidget.client.rows.DeleteRows;
import org.gcube.portlets.user.td.tablewidget.client.rows.EditRowDialog;
import org.gcube.portlets.user.td.tablewidget.client.util.UtilsGXT3;
import org.gcube.portlets.user.td.taskswidget.client.TdTaskController;
import org.gcube.portlets.user.td.unionwizardwidget.client.UnionWizardTD;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.ChangeTableRequestEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.GridContextMenuItemEvent;
import org.gcube.portlets.user.td.widgetcommonevent.client.event.GridHeaderColumnMenuItemEvent;
@ -525,6 +526,7 @@ public class TabularDataController {
case TABLEFILTER:
break;
case TABLEUNION:
openTableUnionWizard();
break;
case TABLEGROUPBY:
openGroupBy();
@ -822,6 +824,41 @@ public class TabularDataController {
}
protected void openTableUnionWizard() {
GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() {
openWizard();
UnionWizardTD unionWizard = new UnionWizardTD(
trId,"Union", eventBus);
unionWizard.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();
}
});
unionWizard.show();
}
public void onFailure(Throwable reason) {
asyncCodeLoadingFailed(reason);
}
});
}
/**
*

11
src/main/java/org/gcube/portlets/user/td/client/ribbon/ModifyToolBar.java
View File

@ -83,8 +83,7 @@ public class ModifyToolBar {
filterButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));
//eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEFILTER));
}
});
@ -101,8 +100,7 @@ public class ModifyToolBar {
unionButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));
eventBus.fireEvent(new RibbonEvent(RibbonType.TABLEUNION));
}
});
@ -206,8 +204,7 @@ public class ModifyToolBar {
annotationButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
// eventBus.fireEvent(new
// ImportTableEvent(ImportTableType.JSON));
//eventBus.fireEvent(new RibbonEvent(RibbonType.ANNOTATIONADD));
}
});
@ -332,7 +329,7 @@ public class ModifyToolBar {
case TABLECURATION:
// Table
filterButton.disable();
unionButton.disable();
unionButton.enable();
groupbyButton.enable();
aggregateButton.disable();
addRowButton.enable();

6
src/main/java/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml
View File

@ -40,13 +40,17 @@
name='org.gcube.portlets.user.td.extractcodelistwidget.ExtractCodelistWizardTD' />
<inherits
name='org.gcube.portlets.user.td.codelistmappingimportwidget.CodelistMappingImportWizardTD' />
<inherits name='org.gcube.portlets.user.td.unionwizardwidget.UnionWizardTD' />
<inherits
name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />
<inherits name='org.gcube.portlets.user.td.taskswidget.TdTasksWidget' />
<inherits name="org.gcube.portlets.user.tdtemplate.TabularDataTemplate" />
<inherits name="org.gcube.portlets.user.tdcolumnoperation.TdColumnOperation"/>
<inherits name="org.gcube.portlets.user.tdcolumnoperation.TdColumnOperation" />
<inherits name='org.gcube.portlets.widgets.sessionchecker.SessionChecker' />

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

@ -39,6 +39,8 @@
name='org.gcube.portlets.user.td.extractcodelistwidget.ExtractCodelistWizardTD' />
<inherits
name='org.gcube.portlets.user.td.codelistmappingimportwidget.CodelistMappingImportWizardTD' />
<inherits name='org.gcube.portlets.user.td.unionwizardwidget.UnionWizardTD' />
<inherits
name='org.gcube.portlets.widgets.lighttree.WorkspacePortletLightTree' />