gCubeSystem
/
tabular-data-gwt-service
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ref 8781:TDM - Integration excel generator-tabman portlet 

https://support.d4science.org/issues/8781

Added excel to template

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@149238 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2017-05-30 10:18:18 +00:00
parent 37d3343940
commit 296f8deb2c
6 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/tabular-data-gwt-service-2.17.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/tabular-data-gwt-service-2.18.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/tabular-data-gwt-service-2.17.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/tabular-data-gwt-service-2.18.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -33,5 +33,5 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/tabular-data-gwt-service-2.17.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/tabular-data-gwt-service-2.18.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

4
distro/changelog.xml
View File

@ -1,4 +1,8 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-18-0"
date="2017-07-01">
<Change>Added excel parameter for Template export [ticket #8781]</Change>
</Changeset>
<Changeset component="org.gcube.portlets-user.tabular-data-gwt-service.2-17-0"
date="2017-06-12">
<Change>Support Java 8 compatibility [ticket #8580]</Change>

2
pom.xml
View File

@ -14,7 +14,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-gwt-service</artifactId>
<version>2.17.0-SNAPSHOT</version>
<version>2.18.0-SNAPSHOT</version>
<name>tabular-data-gwt-service</name>
<description>tabular-data-gwt-service allows communication between the GUI and services</description>

1
src/main/java/org/gcube/portlets/user/td/gwtservice/server/opexecution/OpExecution4SDMXTemplateExport.java
View File

@ -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);

1
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/Constants.java
View File

@ -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";

24
src/main/java/org/gcube/portlets/user/td/gwtservice/shared/sdmx/SDMXTemplateExportSession.java
View File

@ -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 + "]";
}
}