diff --git a/pom.xml b/pom.xml
index 0dd83e8..6fe6569 100644
--- a/pom.xml
+++ b/pom.xml
@@ -377,27 +377,30 @@
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
+ org.gcube.portlets.user
+ tabular-data-charts-widget
+ [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
+
+
org.gcube.portlets.user
tabular-data-map-widget
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
-
+
org.gcube.portlets.user
tabular-data-statistical-widget
[1.0.0-SNAPSHOT,2.0.0-SNAPSHOT)
-
-
-
+
+
+
org.gcube.portlets.user
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 221188b..dda0157 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 java.util.ArrayList;
+import org.gcube.portlets.user.td.chartswidget.client.ChartsWidgetTD;
import org.gcube.portlets.user.td.client.logs.TDMLogs;
import org.gcube.portlets.user.td.client.template.TemplateApplyDialog;
import org.gcube.portlets.user.td.client.template.TemplateDeleteDialog;
@@ -843,13 +844,8 @@ public class TabularDataController {
break;
case ANALYSECOLUMNEDIT:
break;
- case CHARTPIE:
- break;
- case CHARTBAR:
- break;
- case CHARTCURVE:
- break;
- case CHARTBULLS:
+ case CHARTCREATE:
+ openCreateChart();
break;
case RSTUDIO:
break;
@@ -1281,6 +1277,48 @@ public class TabularDataController {
}
+
+
+ protected void openCreateChart() {
+ GWT.runAsync(new RunAsyncCallback() {
+
+ public void onSuccess() {
+ openWizard();
+ ChartsWidgetTD mapWizard = new ChartsWidgetTD(trId, userInfo,
+ "Charts Creation", eventBus);
+
+ mapWizard.addListener(new WizardListener() {
+ public void failed(String title, String message,
+ Throwable throwable) {
+ UtilsGXT3.alert(title, message);
+ resumeUIState();
+ }
+
+ public void completed(TRId id) {
+ openTable(id);
+
+ }
+
+ @Override
+ public void putInBackground() {
+ Log.debug("PutInBakground");
+ }
+
+ public void aborted() {
+ resumeUIState();
+ }
+ });
+
+ }
+
+ public void onFailure(Throwable reason) {
+ asyncCodeLoadingFailed(reason);
+ }
+ });
+
+ }
+
+
protected void openCreateMapWizard() {
GWT.runAsync(new RunAsyncCallback() {
diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java
index ef402ee..11aa39d 100644
--- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java
+++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/AnalyseToolBar.java
@@ -35,10 +35,10 @@ public class AnalyseToolBar {
protected EventBus eventBus;
protected ToolBar toolBar;
- protected TextButton pieButton;
- protected TextButton barButton;
- protected TextButton curveButton;
- protected TextButton scatterButton;
+ //protected TextButton pieButton;
+ protected TextButton chartCreateButton;
+ //protected TextButton curveButton;
+ //protected TextButton scatterButton;
protected TextButton statisticalButton;
protected TextButton rstudioButton;
@@ -253,12 +253,12 @@ public class AnalyseToolBar {
chartsGroup.setId("Charts");
chartsGroup.setStyleName("ribbon");
chartsGroup.setHeadingText("Charts");
- chartsGroup.disable();
+ chartsGroup.enable();
toolBar.add(chartsGroup);
FlexTable basicLayout = new FlexTable();
chartsGroup.add(basicLayout);
-
+ /*
pieButton = new TextButton("Pie",
TabularDataResources.INSTANCE.chartPie32());
pieButton.setScale(ButtonScale.LARGE);
@@ -275,24 +275,27 @@ public class AnalyseToolBar {
basicLayout.setWidget(0, 0, pieButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
-
- barButton = new TextButton("Bar",
+ */
+
+ chartCreateButton = new TextButton("Create",
TabularDataResources.INSTANCE.chartBar32());
- barButton.setScale(ButtonScale.LARGE);
- barButton.setIconAlign(IconAlign.TOP);
- barButton.setToolTip("Bar");
- barButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
- barButton.addSelectHandler(new SelectHandler() {
+ chartCreateButton.enable();
+ chartCreateButton.setScale(ButtonScale.LARGE);
+ chartCreateButton.setIconAlign(IconAlign.TOP);
+ chartCreateButton.setToolTip("Create charts");
+ chartCreateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+ chartCreateButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) {
- // eventBus.fireEvent(new
- // RibbonEvent(RibbonType.TABLEAGGREAGETE));
+ eventBus.fireEvent(new
+ RibbonEvent(RibbonType.CHARTCREATE));
}
});
- basicLayout.setWidget(0, 1, barButton);
- basicLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
-
+ basicLayout.setWidget(0, 0, chartCreateButton);
+ basicLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
+
+ /*
curveButton = new TextButton("Curve",
TabularDataResources.INSTANCE.chartCurve32());
curveButton.setScale(ButtonScale.LARGE);
@@ -326,7 +329,8 @@ public class AnalyseToolBar {
basicLayout.setWidget(0, 3, scatterButton);
basicLayout.getFlexCellFormatter().setRowSpan(0, 3, 2);
-
+ */
+
cleanCells(basicLayout.getElement());
// Process
@@ -452,21 +456,25 @@ public class AnalyseToolBar {
try {
switch (uiStateType) {
case START:
+ chartCreateButton.disable();
gisButton.disable();
statisticalButton.disable();
break;
case TR_CLOSE:
case TR_READONLY:
+ chartCreateButton.disable();
gisButton.disable();
statisticalButton.disable();
break;
case TR_OPEN:
case TABLEUPDATE:
case TABLECURATION:
+ chartCreateButton.enable();
gisButton.enable();
statisticalButton.enable();
break;
case WIZARD_OPEN:
+ chartCreateButton.disable();
gisButton.disable();
statisticalButton.disable();
break;
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 6517077..1cf9a79 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
@@ -48,6 +48,7 @@
name='org.gcube.portlets.user.td.codelistmappingimportwidget.CodelistMappingImportWizardTD' />
+
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 31f429f..9bdd888 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
@@ -46,9 +46,9 @@
name='org.gcube.portlets.user.td.codelistmappingimportwidget.CodelistMappingImportWizardTD' />
+
-