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-sdmx-export-widget@149237 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2017-05-30 10:18:04 +00:00 committed by Giancarlo Panichi
parent 27b1a7d826
commit 890196705e
35 changed files with 122 additions and 94 deletions

View File

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/tabular-data-sdmx-export-widget-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/tabular-data-sdmx-export-widget-1.10.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-sdmx-export-widget-1.9.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<classpathentry excluding="**" kind="src" output="target/tabular-data-sdmx-export-widget-1.10.0-SNAPSHOT/WEB-INF/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
@ -45,5 +45,5 @@
<attribute name="org.eclipse.jst.component.nondependency" value=""/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/tabular-data-sdmx-export-widget-1.9.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/tabular-data-sdmx-export-widget-1.10.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

View File

@ -1,4 +1,8 @@
<ReleaseNotes>
<Changeset component="${groupId}.${artifactId}.1-10-0" date="2017-07-01">
<Change>Added excel parameter for Template export [ticket #8781]
</Change>
</Changeset>
<Changeset component="${groupId}.${artifactId}.1-9-0" date="2017-04-01">
<Change>Added support for template export in SDMX [issue #8033]
</Change>

View File

@ -13,7 +13,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gcube.portlets.user</groupId>
<artifactId>tabular-data-sdmx-export-widget</artifactId>
<version>1.9.0-SNAPSHOT</version>
<version>1.10.0-SNAPSHOT</version>
<name>tabular-data-sdmx-export-widget</name>

View File

@ -54,8 +54,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class AgenciesSelectionPanel extends ContentPanel implements

View File

@ -54,8 +54,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class CodelistSelectionPanel extends ContentPanel implements HasSelectionHandlers<Codelist> {

View File

@ -50,8 +50,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class DatasetSelectionPanel extends ContentPanel implements HasSelectionHandlers<Dataset> {

View File

@ -14,8 +14,8 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class MeasureColumnSelectionCard extends WizardCard {

View File

@ -56,8 +56,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class MeasureColumnSelectionPanel extends ContentPanel implements

View File

@ -14,8 +14,8 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXAgenciesSelectionCard extends WizardCard {

View File

@ -18,8 +18,8 @@ import com.sencha.gxt.widget.core.client.form.Radio;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXAgencyTypeCard extends WizardCard {

View File

@ -15,8 +15,8 @@ import com.google.gwt.user.client.Command;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXCodelistSelectionCard extends WizardCard {

View File

@ -11,8 +11,8 @@ import com.google.gwt.user.client.Command;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXDatasetSelectionCard extends WizardCard {

View File

@ -17,10 +17,9 @@ import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
* Entry point classes define <code>onModuleLoad()</code>.
*
*/
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);

View File

@ -8,8 +8,8 @@ import com.google.web.bindery.event.shared.SimpleEventBus;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXExportWizardTDEntry implements EntryPoint {

View File

@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXOperationInProgressCard extends WizardCard implements

View File

@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXRegistrySelectionCard extends WizardCard {

View File

@ -23,8 +23,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTableDetailCard extends WizardCard {

View File

@ -14,8 +14,8 @@ import com.google.gwt.event.logical.shared.SelectionHandler;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class ViewColumnSelectionCard extends WizardCard {

View File

@ -55,8 +55,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class ViewColumnSelectionPanel extends ContentPanel implements

View File

@ -15,8 +15,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public interface AgenciesProperties extends PropertyAccess<Agencies> {

View File

@ -14,8 +14,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public interface CodelistProperties extends PropertyAccess<Codelist> {

View File

@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public interface ColumnDataProperties extends

View File

@ -13,8 +13,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public interface DatasetProperties extends PropertyAccess<Dataset> {

View File

@ -9,8 +9,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
* @author "Giancarlo Panichi"
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public interface TemplateColumnDataProperties extends

View File

@ -13,8 +13,8 @@ import com.sencha.gxt.data.shared.PropertyAccess;
/**
*
* @author giancarlo
* email: <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public interface TemplateDataProperties extends PropertyAccess<TemplateData> {

View File

@ -14,8 +14,8 @@ import com.google.gwt.user.client.Command;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTemplateExportAgenciesSelectionCard extends WizardCard {

View File

@ -54,8 +54,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTemplateExportAgenciesSelectionPanel extends ContentPanel implements

View File

@ -14,8 +14,8 @@ import com.google.gwt.user.client.Command;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTemplateExportMeasureColumnSelectionCard extends WizardCard {

View File

@ -56,8 +56,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTemplateExportMeasureColumnSelectionPanel extends ContentPanel

View File

@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.container.VBoxLayoutContainer.VBoxLayou
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTemplateExportOperationInProgressCard extends WizardCard implements

View File

@ -30,8 +30,8 @@ import com.sencha.gxt.widget.core.client.form.TextField;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTemplateExportRegistrySelectionCard extends WizardCard {

View File

@ -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" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
* <a href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
*
*/
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<HasValue<Boolean>>() {
@Override
public void onValueChange(ValueChangeEvent<HasValue<Boolean>> 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);

View File

@ -7,10 +7,9 @@ import com.google.web.bindery.event.shared.EventBus;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
* Entry point classes define <code>onModuleLoad()</code>.
*
*/
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);

View File

@ -14,8 +14,8 @@ import com.google.gwt.user.client.Command;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTemplateSelectionCard extends WizardCard {

View File

@ -56,8 +56,8 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
/**
*
* @author "Giancarlo Panichi" <a
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* @author Giancarlo Panichi
*
*
*/
public class SDMXTmplateExportTemplateSelectionPanel extends ContentPanel