diff --git a/.classpath b/.classpath
index 01ca856..ef1deaa 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -45,5 +45,5 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index ec68f9e..53250d0 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
+
+ Added excel parameter for Template export [ticket #8781]
+
+
Added support for template export in SDMX [issue #8033]
diff --git a/pom.xml b/pom.xml
index 4207858..a55465c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-sdmx-export-widget
- 1.9.0-SNAPSHOT
+ 1.10.0-SNAPSHOT
tabular-data-sdmx-export-widget
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/AgenciesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/AgenciesSelectionPanel.java
index cb54d26..458675e 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/AgenciesSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/AgenciesSelectionPanel.java
@@ -54,8 +54,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class AgenciesSelectionPanel extends ContentPanel implements
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/CodelistSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/CodelistSelectionPanel.java
index 55b7325..7e45db0 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/CodelistSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/CodelistSelectionPanel.java
@@ -54,8 +54,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class CodelistSelectionPanel extends ContentPanel implements HasSelectionHandlers {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/DatasetSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/DatasetSelectionPanel.java
index 1cf22f0..62abff8 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/DatasetSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/DatasetSelectionPanel.java
@@ -50,8 +50,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class DatasetSelectionPanel extends ContentPanel implements HasSelectionHandlers {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/MeasureColumnSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/MeasureColumnSelectionCard.java
index f97d531..c8706c0 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/MeasureColumnSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/MeasureColumnSelectionCard.java
@@ -14,8 +14,8 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class MeasureColumnSelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/MeasureColumnSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/MeasureColumnSelectionPanel.java
index b2e45ee..40017a1 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/MeasureColumnSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/MeasureColumnSelectionPanel.java
@@ -56,8 +56,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class MeasureColumnSelectionPanel extends ContentPanel implements
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgenciesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgenciesSelectionCard.java
index e1982f1..5af336e 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgenciesSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgenciesSelectionCard.java
@@ -14,8 +14,8 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXAgenciesSelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgencyTypeCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgencyTypeCard.java
index 2a093e5..390ea5c 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgencyTypeCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXAgencyTypeCard.java
@@ -18,8 +18,8 @@ import com.sencha.gxt.widget.core.client.form.Radio;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXAgencyTypeCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXCodelistSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXCodelistSelectionCard.java
index 784f11b..325fe50 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXCodelistSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXCodelistSelectionCard.java
@@ -15,8 +15,8 @@ import com.google.gwt.user.client.Command;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXCodelistSelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXDatasetSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXDatasetSelectionCard.java
index 3ab2031..9d054fc 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXDatasetSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXDatasetSelectionCard.java
@@ -11,8 +11,8 @@ import com.google.gwt.user.client.Command;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXDatasetSelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java
index 418ff9c..efcc824 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTD.java
@@ -17,10 +17,9 @@ import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
- * Entry point classes define onModuleLoad()
.
*
*/
public class SDMXExportWizardTD extends WizardWindow {
@@ -28,11 +27,11 @@ public class SDMXExportWizardTD extends WizardWindow {
protected SDMXExportSession exportSession;
/**
- * The id of the {@link CSVTarget} to use.
*
- * @param targetId
+ *
+ * @param title Title
+ * @param eventBus Event bus
*/
-
public SDMXExportWizardTD(String title, final EventBus eventBus) {
super(title, eventBus);
setWidth(550);
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTDEntry.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTDEntry.java
index e53cc75..d4e7f57 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTDEntry.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXExportWizardTDEntry.java
@@ -8,8 +8,8 @@ import com.google.web.bindery.event.shared.SimpleEventBus;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXExportWizardTDEntry implements EntryPoint {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java
index 871644b..cd1ba52 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXOperationInProgressCard.java
@@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXOperationInProgressCard extends WizardCard implements
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java
index 2c5c6ad..24b1f9b 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXRegistrySelectionCard.java
@@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXRegistrySelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
index ff39435..8a89790 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/SDMXTableDetailCard.java
@@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTableDetailCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/ViewColumnSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/ViewColumnSelectionCard.java
index 8ddd311..9a15b9c 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/ViewColumnSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/ViewColumnSelectionCard.java
@@ -14,8 +14,8 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class ViewColumnSelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/ViewColumnSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/ViewColumnSelectionPanel.java
index 2be694f..e4785b1 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/ViewColumnSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/ViewColumnSelectionPanel.java
@@ -55,8 +55,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class ViewColumnSelectionPanel extends ContentPanel implements
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/AgenciesProperties.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/AgenciesProperties.java
index 7def52e..55d0271 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/AgenciesProperties.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/AgenciesProperties.java
@@ -15,8 +15,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public interface AgenciesProperties extends PropertyAccess {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/CodelistProperties.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/CodelistProperties.java
index 32a915a..462d5c7 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/CodelistProperties.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/CodelistProperties.java
@@ -14,8 +14,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public interface CodelistProperties extends PropertyAccess {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/ColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/ColumnDataProperties.java
index 59a7e7c..ff30f58 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/ColumnDataProperties.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/ColumnDataProperties.java
@@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public interface ColumnDataProperties extends
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/DatasetProperties.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/DatasetProperties.java
index 7056c1f..a4d9921 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/DatasetProperties.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/DatasetProperties.java
@@ -13,8 +13,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public interface DatasetProperties extends PropertyAccess {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/TemplateColumnDataProperties.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/TemplateColumnDataProperties.java
index 2e75e93..993b976 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/TemplateColumnDataProperties.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/TemplateColumnDataProperties.java
@@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
- * @author "Giancarlo Panichi"
- * g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public interface TemplateColumnDataProperties extends
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/TemplateDataProperties.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/TemplateDataProperties.java
index 9aafcce..a917cc7 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/TemplateDataProperties.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/properties/TemplateDataProperties.java
@@ -13,8 +13,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
- * @author giancarlo
- * email: g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public interface TemplateDataProperties extends PropertyAccess {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportAgenciesSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportAgenciesSelectionCard.java
index bb03ad7..86bf509 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportAgenciesSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportAgenciesSelectionCard.java
@@ -14,8 +14,8 @@ import com.google.gwt.user.client.Command;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTemplateExportAgenciesSelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportAgenciesSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportAgenciesSelectionPanel.java
index c9efcb3..2339455 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportAgenciesSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportAgenciesSelectionPanel.java
@@ -54,8 +54,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTemplateExportAgenciesSelectionPanel extends ContentPanel implements
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportMeasureColumnSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportMeasureColumnSelectionCard.java
index 2da38d3..153c0f6 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportMeasureColumnSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportMeasureColumnSelectionCard.java
@@ -14,8 +14,8 @@ import com.google.gwt.user.client.Command;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTemplateExportMeasureColumnSelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportMeasureColumnSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportMeasureColumnSelectionPanel.java
index 58c9680..730e8df 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportMeasureColumnSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportMeasureColumnSelectionPanel.java
@@ -56,8 +56,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTemplateExportMeasureColumnSelectionPanel extends ContentPanel
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportOperationInProgressCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportOperationInProgressCard.java
index e60e780..c3ecc31 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportOperationInProgressCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportOperationInProgressCard.java
@@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTemplateExportOperationInProgressCard extends WizardCard implements
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportRegistrySelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportRegistrySelectionCard.java
index eb050f9..f09054e 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportRegistrySelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportRegistrySelectionCard.java
@@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTemplateExportRegistrySelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportTableDetailCard.java
index bac0186..fdf8bb7 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportTableDetailCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportTableDetailCard.java
@@ -9,8 +9,13 @@ import org.gcube.portlets.user.td.gwtservice.shared.source.SDMXRegistrySource;
import org.gcube.portlets.user.td.wizardwidget.client.WizardCard;
import com.allen_sauer.gwt.log.client.Log;
+import com.google.gwt.event.logical.shared.ValueChangeEvent;
+import com.google.gwt.event.logical.shared.ValueChangeHandler;
import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.ui.HasValue;
+import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
+import com.sencha.gxt.core.client.util.ToggleGroup;
import com.sencha.gxt.widget.core.client.FramedPanel;
import com.sencha.gxt.widget.core.client.box.AlertMessageBox;
import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer;
@@ -19,12 +24,13 @@ import com.sencha.gxt.widget.core.client.event.HideEvent;
import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler;
import com.sencha.gxt.widget.core.client.form.FieldLabel;
import com.sencha.gxt.widget.core.client.form.FieldSet;
+import com.sencha.gxt.widget.core.client.form.Radio;
import com.sencha.gxt.widget.core.client.form.TextField;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ * g.panichi@isti.cnr.it
*
*/
public class SDMXTemplateExportTableDetailCard extends WizardCard {
@@ -45,6 +51,8 @@ public class SDMXTemplateExportTableDetailCard extends WizardCard {
private TextField version;
private TextField templateName;
private TextField measureColumn;
+ private Radio excelTrue;
+
public SDMXTemplateExportTableDetailCard(final SDMXTemplateExportSession sdmxTemplateExportSession) {
super("SDMX Table Detail", "");
@@ -68,7 +76,7 @@ public class SDMXTemplateExportTableDetailCard extends WizardCard {
form.add(fieldSet);
templateViewConfig();
-
+
fieldSet.add(p);
tableDetailPanel.add(form);
@@ -99,15 +107,13 @@ public class SDMXTemplateExportTableDetailCard extends WizardCard {
registryBaseUrl = new TextField();
registryBaseUrl.setVisible(false);
registryBaseUrl.setEmptyText("Enter Registry URL...");
- String urlRegistry = ((SDMXRegistrySource) sdmxTemplateExportSession.getSource())
- .getUrl();
+ String urlRegistry = ((SDMXRegistrySource) sdmxTemplateExportSession.getSource()).getUrl();
if (urlRegistry == null || urlRegistry.isEmpty()) {
registryBaseUrl.setValue(null);
} else {
registryBaseUrl.setValue(urlRegistry);
}
- FieldLabel registryBaseUrlLabel = new FieldLabel(registryBaseUrl,
- "Registry URL");
+ FieldLabel registryBaseUrlLabel = new FieldLabel(registryBaseUrl, "Registry URL");
registryBaseUrlLabel.setVisible(false);
p.add(registryBaseUrlLabel, new VerticalLayoutData(1, -1));
@@ -117,21 +123,42 @@ public class SDMXTemplateExportTableDetailCard extends WizardCard {
version.setValue(Constants.SDMX_TEMPLATE_EXPORT_DEFAULT_VERSION);
p.add(new FieldLabel(version, "Version"), new VerticalLayoutData(1, -1));
-
templateName = new TextField();
templateName.setValue(sdmxTemplateExportSession.getTemplateData().getName());
templateName.setReadOnly(true);
- p.add(new FieldLabel(templateName, "Template"),
- new VerticalLayoutData(1, -1));
-
+ p.add(new FieldLabel(templateName, "Template"), new VerticalLayoutData(1, -1));
+
measureColumn = new TextField();
measureColumn.setValue(sdmxTemplateExportSession.getObsValueColumn().getLabel());
measureColumn.setReadOnly(true);
- p.add(new FieldLabel(measureColumn, "Measure Column"),
- new VerticalLayoutData(1, -1));
- }
+ p.add(new FieldLabel(measureColumn, "Measure Column"), new VerticalLayoutData(1, -1));
-
+ excelTrue = new Radio();
+ excelTrue.setBoxLabel("True");
+ excelTrue.setValue(true);
+
+ Radio excelFalse = new Radio();
+ excelFalse.setBoxLabel("False");
+
+ ToggleGroup excelToggle = new ToggleGroup();
+ excelToggle.add(excelTrue);
+ excelToggle.add(excelFalse);
+ excelToggle.addValueChangeHandler(new ValueChangeHandler>() {
+
+ @Override
+ public void onValueChange(ValueChangeEvent> event) {
+
+ }
+
+ });
+
+ HorizontalPanel hp = new HorizontalPanel();
+ hp.add(excelTrue);
+ hp.add(excelFalse);
+
+ p.add(new FieldLabel(hp, "Excel"), new VerticalLayoutData(-1, -1));
+
+ }
@Override
public void setup() {
@@ -175,9 +202,8 @@ public class SDMXTemplateExportTableDetailCard extends WizardCard {
}
};
- if (id.getValue() == null || id.getValue().isEmpty() || !id.isValid()
- || version.getValue() == null || version.getValue().isEmpty()
- || !version.isValid() || agencyId.getValue() == null
+ if (id.getValue() == null || id.getValue().isEmpty() || !id.isValid() || version.getValue() == null
+ || version.getValue().isEmpty() || !version.isValid() || agencyId.getValue() == null
|| agencyId.getValue().isEmpty() || !agencyId.isValid()) {
d = new AlertMessageBox("Attention!", "Fill in all fields");
@@ -185,8 +211,7 @@ public class SDMXTemplateExportTableDetailCard extends WizardCard {
d.show();
} else {
if (!version.getValue().matches("[0-9]+\\.[0-9]+")) {
- d = new AlertMessageBox("Attention!",
- "Version must match the regular expression [0-9]+\\.[0-9]+");
+ d = new AlertMessageBox("Attention!", "Version must match the regular expression [0-9]+\\.[0-9]+");
d.addHideHandler(hideHandler);
d.show();
} else {
@@ -206,6 +231,7 @@ public class SDMXTemplateExportTableDetailCard extends WizardCard {
sdmxTemplateExportSession.setAgencyId(agencyId.getCurrentValue());
sdmxTemplateExportSession.setVersion(version.getCurrentValue());
sdmxTemplateExportSession.setRegistryBaseUrl(registryBaseUrl.getCurrentValue());
+ sdmxTemplateExportSession.setExcel(excelTrue.getValue());
SDMXTemplateExportOperationInProgressCard sdmxOperationInProgressCard = new SDMXTemplateExportOperationInProgressCard(
sdmxTemplateExportSession);
getWizardWindow().addCard(sdmxOperationInProgressCard);
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportWizard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportWizard.java
index 31ae141..86c3153 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportWizard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateExportWizard.java
@@ -7,10 +7,9 @@ import com.google.web.bindery.event.shared.EventBus;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
- * Entry point classes define onModuleLoad()
.
*
*/
public class SDMXTemplateExportWizard extends WizardWindow {
@@ -20,11 +19,11 @@ public class SDMXTemplateExportWizard extends WizardWindow {
private static final String HEIGHT = "530px";
/**
- * The id of the {@link CSVTarget} to use.
*
- * @param targetId
+ *
+ * @param title Title
+ * @param eventBus Event bus
*/
-
public SDMXTemplateExportWizard(String title, final EventBus eventBus) {
super(title, eventBus);
setWidth(WIDTH);
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateSelectionCard.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateSelectionCard.java
index 5c17239..0352f61 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateSelectionCard.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTemplateSelectionCard.java
@@ -14,8 +14,8 @@ import com.google.gwt.user.client.Command;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTemplateSelectionCard extends WizardCard {
diff --git a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTmplateExportTemplateSelectionPanel.java b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTmplateExportTemplateSelectionPanel.java
index a4245a2..26f513f 100644
--- a/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTmplateExportTemplateSelectionPanel.java
+++ b/src/main/java/org/gcube/portlets/user/td/sdmxexportwidget/client/template/SDMXTmplateExportTemplateSelectionPanel.java
@@ -56,8 +56,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
- * @author "Giancarlo Panichi" g.panichi@isti.cnr.it
+ * @author Giancarlo Panichi
+ *
*
*/
public class SDMXTmplateExportTemplateSelectionPanel extends ContentPanel