diff --git a/.classpath b/.classpath
index c06f2b4..a5ed0e6 100644
--- a/.classpath
+++ b/.classpath
@@ -1,12 +1,12 @@
-
+
-
+
@@ -33,5 +33,5 @@
-
+
diff --git a/distro/changelog.xml b/distro/changelog.xml
index 3a5cfce..cb02d2b 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
+
+ Added excel parameter for Template export [ticket #8781]
+
Support Java 8 compatibility [ticket #8580]
diff --git a/pom.xml b/pom.xml
index 1e8093f..26524d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
4.0.0
org.gcube.portlets.user
tabular-data-gwt-service
- 2.17.0-SNAPSHOT
+ 2.18.0-SNAPSHOT
tabular-data-gwt-service
tabular-data-gwt-service allows communication between the GUI and services
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXTemplateExport.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXTemplateExport.java
index 5571bff..f7e8889 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXTemplateExport.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXTemplateExport.java
@@ -124,6 +124,7 @@ public class OpExecution4SDMXTemplateExport extends OpExecutionBuilder {
sdmxTemplateExportSession.getVersion());
map.put(Constants.PARAMETER_OBSVALUECOLUMN, sdmxTemplateExportSession
.getObsValueColumn().getColumnId());
+ map.put(Constants.PARAMETER_EXCEL, sdmxTemplateExportSession.isExcel());
map.put(Constants.PARAMETER_TEMPLATE, templateMap);
OperationExecution invocation = new OperationExecution(
operationDefinition.getOperationId(), map);
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java
index 1620294..aaa1fa4 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java
@@ -55,6 +55,7 @@ public class Constants {
public static final String PARAMETER_AGENCY = "agency";
public static final String PARAMETER_VERSION = "version";
public static final String PARAMETER_OBSVALUECOLUMN = "obsValueColumn";
+ public static final String PARAMETER_EXCEL = "excel";
public static final String PARAMETER_TEMPLATE = "template";
public static final String PARAMETER_DATA_TYPE = "dataType";
diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXTemplateExportSession.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXTemplateExportSession.java
index c39fdde..3b75f69 100644
--- a/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXTemplateExportSession.java
+++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXTemplateExportSession.java
@@ -30,15 +30,14 @@ public class SDMXTemplateExportSession implements Serializable {
private String registryBaseUrl;
private TemplateColumnData obsValueColumn;
+ private boolean excel;
public SDMXTemplateExportSession() {
super();
}
- public SDMXTemplateExportSession(TemplateData templateData,
- Agencies agency, Source source, String id, String agencyId,
- String version, String registryBaseUrl,
- TemplateColumnData obsValueColumn) {
+ public SDMXTemplateExportSession(TemplateData templateData, Agencies agency, Source source, String id,
+ String agencyId, String version, String registryBaseUrl, TemplateColumnData obsValueColumn, boolean excel) {
super();
this.templateData = templateData;
this.agency = agency;
@@ -48,6 +47,7 @@ public class SDMXTemplateExportSession implements Serializable {
this.version = version;
this.registryBaseUrl = registryBaseUrl;
this.obsValueColumn = obsValueColumn;
+ this.excel = excel;
}
public TemplateData getTemplateData() {
@@ -114,13 +114,19 @@ public class SDMXTemplateExportSession implements Serializable {
this.obsValueColumn = obsValueColumn;
}
+ public boolean isExcel() {
+ return excel;
+ }
+
+ public void setExcel(boolean excel) {
+ this.excel = excel;
+ }
+
@Override
public String toString() {
- return "SDMXTemplateExportSession [templateData=" + templateData
- + ", agency=" + agency + ", source=" + source + ", id=" + id
- + ", agencyId=" + agencyId + ", version=" + version
- + ", registryBaseUrl=" + registryBaseUrl + ", obsValueColumn="
- + obsValueColumn + "]";
+ return "SDMXTemplateExportSession [templateData=" + templateData + ", agency=" + agency + ", source=" + source
+ + ", id=" + id + ", agencyId=" + agencyId + ", version=" + version + ", registryBaseUrl="
+ + registryBaseUrl + ", obsValueColumn=" + obsValueColumn + ", excel=" + excel + "]";
}
}