From ba6481fc9104a41a1e1e40aebe1fff7a5c58ead9 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 12 Jan 2018 16:15:28 +0000 Subject: [PATCH] ref #9944: TabMan - Enable Excel export operation for DataSet only https://support.d4science.org/issues/#9944 Added operation git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@162146 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +-- distro/changelog.xml | 4 ++ pom.xml | 11 +++- .../user/td/client/TabularDataController.java | 48 ++++++++++++++++++ .../client/TabularDataControllerMessages.java | 6 +++ .../client/resource/TabularDataResources.java | 6 +++ .../user/td/client/resource/excel.png | Bin 0 -> 485 bytes .../user/td/client/resource/excel_32.png | Bin 0 -> 788 bytes .../portlets/user/td/client/resource/sdmx.png | Bin 1364 -> 805 bytes .../user/td/client/ribbon/FileToolBar.java | 38 +++++++++++--- .../td/client/ribbon/FileToolBarMessages.java | 6 +++ .../user/td/tabulardataportlet.gwt.xml | 10 ++-- .../TabularDataControllerMessages.properties | 3 ++ ...abularDataControllerMessages_es.properties | 2 + ...abularDataControllerMessages_it.properties | 2 + .../user/td/client/resource/excel.png | Bin 0 -> 485 bytes .../user/td/client/resource/excel_32.png | Bin 0 -> 788 bytes .../portlets/user/td/client/resource/sdmx.png | Bin 1364 -> 805 bytes .../ribbon/FileToolBarMessages.properties | 2 + .../ribbon/FileToolBarMessages_es.properties | 2 + .../ribbon/FileToolBarMessages_it.properties | 2 + .../user/td/tabulardataportlet.gwt.xml | 12 +++-- 22 files changed, 141 insertions(+), 19 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/excel.png create mode 100644 src/main/java/org/gcube/portlets/user/td/client/resource/excel_32.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/excel.png create mode 100644 src/main/resources/org/gcube/portlets/user/td/client/resource/excel_32.png diff --git a/.classpath b/.classpath index 1d393ad..0f21a67 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -45,5 +45,5 @@ - + diff --git a/distro/changelog.xml b/distro/changelog.xml index 0108ff0..9fab5eb 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Added Excel Dataset Export support [ticket #9944] + Enable SDMX export operation for DataSet only for the tables diff --git a/pom.xml b/pom.xml index 12ae756..92ab1d5 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-manager - 2.17.0-SNAPSHOT + 2.18.0-SNAPSHOT war @@ -430,7 +430,14 @@ tabular-data-json-export-widget [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) - + + + + org.gcube.portlets.user + tabular-data-excel-export-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 d6aeceb..eacab8e 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 @@ -16,6 +16,7 @@ import org.gcube.portlets.user.td.columnwidget.client.batch.ReplaceBatchDialog; import org.gcube.portlets.user.td.columnwidget.client.replace.ReplaceAllDialog; import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD; import org.gcube.portlets.user.td.csvimportwidget.client.CSVImportWizardTD; +import org.gcube.portlets.user.td.excelexportwidget.client.ExcelExportWizardTD; import org.gcube.portlets.user.td.expressionwidget.client.MultiColumnFilterDialog; import org.gcube.portlets.user.td.expressionwidget.client.ReplaceColumnByMultiColumnExpressionDialog; import org.gcube.portlets.user.td.expressionwidget.client.RowsDeleteByMultiColumnExpressionDialog; @@ -830,6 +831,9 @@ public class TabularDataController { case EXPORT_SDMX: openSDMXExportWizard(); break; + case EXPORT_EXCEL: + openExcelExportWizard(); + break; case EXPORT_CSV: openCSVExportWizard(); break; @@ -1049,6 +1053,7 @@ public class TabularDataController { case TEST: testFeauture(); break; + case IMPORT_EXCEL: default: break; } @@ -1309,6 +1314,49 @@ public class TabularDataController { }); } + + + private void openExcelExportWizard() { + GWT.runAsync(new RunAsyncCallback() { + + public void onSuccess() { + openWizard(); + ExcelExportWizardTD exportWizard = new ExcelExportWizardTD(msgs + .excelExport(), eventBus); + + exportWizard.addListener(new WizardListener() { + public void failed(String title, String message, + String details, Throwable throwable) { + UtilsGXT3.alert(title, message + " " + details); + resumeUIState(); + } + + public void completed(TRId id) { + resumeUIState(); + + } + + @Override + public void putInBackground() { + Log.debug("PutInBakground"); + resumeUIState(); + } + + public void aborted() { + resumeUIState(); + } + }); + + exportWizard.show(); + } + + public void onFailure(Throwable reason) { + asyncCodeLoadingFailed(reason); + } + }); + + } + private void openExtractCodelistWizard() { GWT.runAsync(new RunAsyncCallback() { diff --git a/src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java b/src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java index d92c781..7990272 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/client/TabularDataControllerMessages.java @@ -40,6 +40,9 @@ public interface TabularDataControllerMessages extends Messages { @DefaultMessage("SDMX Import") String sdmxImport(); + @DefaultMessage("Excel Import") + String excelImport(); + @DefaultMessage("CSV Export") String csvExport(); @@ -49,6 +52,9 @@ public interface TabularDataControllerMessages extends Messages { @DefaultMessage("SDMX Export") String sdmxExport(); + @DefaultMessage("Excel Export") + String excelExport(); + @DefaultMessage("Extract Codelist") String extractCodelist(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java index d749615..2317b2b 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java +++ b/src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java @@ -69,7 +69,13 @@ public interface TabularDataResources extends ClientBundle { @Source("sdmx_32.png") ImageResource sdmx32(); + + @Source("excel.png") + ImageResource excel(); + @Source("excel_32.png") + ImageResource excel32(); + @Source("gis.png") ImageResource gis(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/excel.png b/src/main/java/org/gcube/portlets/user/td/client/resource/excel.png new file mode 100644 index 0000000000000000000000000000000000000000..6c38dd495ae6202fbac247bcf9b94d7a382ebd93 GIT binary patch literal 485 zcmVos{gMRAYfAqZo~4bio(_-wib!wnmCGBG(v62!A22G z5B6T{zw&9m3&eO;uS|q`&Mg2*lw2qjLT!vj6{_qZFabhbWtuDyD)o6>tGN8~qxWNd z`vyP&SPAIm$ojk_C~Zd4A9dFP05D;-b+fvY<}v`#K?2<-0uLGp=!~@v;_8eT0_f#n zWaZ`l0e}T$$=LoBgJSW;{~K^6V*eIT?mqb^Q;XkP^hTfsHb0)6Ju7X_=r7$4p)vzD bfv>*-#PW5~i?`w@00000NkvXXu0mjft$4|F literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/td/client/resource/excel_32.png b/src/main/java/org/gcube/portlets/user/td/client/resource/excel_32.png new file mode 100644 index 0000000000000000000000000000000000000000..61f061955e92e0dcb889b3bdf58131f82f7d37b2 GIT binary patch literal 788 zcmV+v1MB>WP)swn}E5J7Jan!BW9vU7D zwWu3J0ClS)hWmP)yLT?%zwzuCbb$-N`TZ0ajsV}zcy{n8`vC9d{v<@T1h4uWES_5; zA}}+2Coiu(yuI<}$&2-Fw>we^8!sc+e8LJt$*>}!By28W$xsq1gb=c_r%+!BB}0Xj zd%3fE@A_CJY`=8Y6U&6mN_!^5%#c+6ww7%JY|gM$j?KS!me(HK+URsT30MKn92fwr zR#QP(O2|M(1AyJ$uu=hJhRr4QdbzWD_uA9bTHXdO?eBqRHj*IJU`m8L6o$F*ULJTs z6-W{(6{LkSp8_zQ`W%}-fa4PZK)GUiK5UXknj$+90TR;gN)jF@S_3BmsEtKkbHl@DY{EU#5r9H7C`1!L?3HQb5Tb-QLV$ff zxc&niZM1hm$TT}Mmd_4Gep$lRDIZQpp0||jWMtm~UbX>daXcRtzks*EH-JCZfBPTU SB6ef|0000gvz3*36F&;crjma=_~c5*vS~+I4KUSYm+sL=cq;@${gxYF!XAE$m%8UzX+5ltLe`qU4exht_w{Q72Rai;#ba zor}|Sb+l0^6n=LhHihD(G91}lV8!fuwiTM$)H$2{+%}GF>1IKlvS)do)?`4gskvq( zbEauQ6)PkAH!P(zQKGq}1y#jJ+8o`|h39!RG&a`60A{3U)y6tK61MGN+YV6_)q-uu z!AYeEf&dZ0Fyhynf^;A6eM)r<|9u;&@?o@;{RKx?Abq`#+(Q5W002ovPDHLkV1nJ+ BP?P`w delta 1282 zcmV+d1^xP^2Gj~6iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mz&1_(H1 zd)`-(XeWOJuSrBfR7l6ImdkHdRTRd5YoEux=f1eKw53Jbw4i_pnou>08a0NXk)RQb z&UE0wfrqnxA(mEa&Rw~)0UBO zPgYLOI^X)%xA*?mk)5xOMZlzj75<;43V;FnU0{Fmttamq3_K^30c5LXpH)Gm6IB(- z#LKG@B|QE1cMC3H1J5Dw-41|?APR_r3J55QAgx;M9NKlW;M%4SAR@TS+7oF30HV?Y zR$0dKa*lQy(++5MxnvTg-Fhoouwp?46$_S5kq*ntaxDU0tgp$o)A>*YF+!49-ub4+ zsmXu8uP|>%V+>y&JIBXA93u*wizLd*P94 zO)paPEf|M|#4_KE`Rq)C6ZH}guZ4oIM5)DbT|CDjL3!=K1fL%LlPFxcB2k#8`o>pB zI5ZVW;8;@0k*HVl5lK3B}vm(fi=}453Mg@a8V#~4Aq>^_}LkrAODr@r5Of`73OS$ zD*{Q%Kv#uNj!!e&4A|0>qtO(MD1=Q$da8_sQ#g)k70CHHv-{Rfa__aPG^&3uAaR1D z%I~Q#m*n|iy275`X|D4V>Pbqql&9n>zf3#4SexaOb8}Pzh!abHcbUi6=h$}BR*W%M zPEk-Ov3GM-?%%c!PaIU0LgeC;GE;BzL4AN-!)3O0=W@{=dIWBYcVzIBj5 z7Dy6HBMs@w3wuWb?%94DD_3?cy2+h;kTtTPQ0B2)hI!z+Dxs8l@cMrq%Her-?AU?h zd8`{A=DGW}(id1px>oSSjomcrbM*A~E}L#{)~d6yP_D9P)M2o4ilU9!a>FRT?|0a( zS>3}kcM3;phv-{*4O=&Dy6WI@vu2kyDpjRWDslS_8xRpZ&s#jLjA3nmHv_%*;JWTr z9Jy7<)r^N*YgLwvq%2PBEVC9NgV&zr*4hqm7Q#g_VWKLMv?rl18+%t9iA!yH>1xIn si{gsV|Lpq*u7>&Fe_H^oQV)~-zuHSyloTRxG5`Po07*qoM6N<$g0}Q=umAu6 diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java index b99b65f..ee17feb 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java @@ -54,7 +54,9 @@ public class FileToolBar { private TextButton importCSVButton; // private TextButton importJSONButton; private TextButton importSDMXButton; + private TextButton exportSDMXButton; + private TextButton exportExcelButton; private TextButton exportCSVButton; private TextButton exportJSONButton; @@ -272,12 +274,9 @@ public class FileToolBar { exportGroup.add(exportLayout); exportSDMXButton = new TextButton(msgs.exportSDMXButton(), - TabularDataResources.INSTANCE.sdmx32()); + TabularDataResources.INSTANCE.sdmx()); exportSDMXButton.disable(); exportSDMXButton.setToolTip(msgs.exportSDMXButtonToolTip()); - exportSDMXButton.setScale(ButtonScale.LARGE); - exportSDMXButton.setIconAlign(IconAlign.TOP); - exportSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM); exportSDMXButton.addSelectHandler(new SelectHandler() { public void onSelect(SelectEvent event) { @@ -286,8 +285,19 @@ public class FileToolBar { }); exportLayout.setWidget(0, 0, exportSDMXButton); - exportLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); + + exportExcelButton = new TextButton(msgs.exportExcelButton(), + TabularDataResources.INSTANCE.excel()); + exportExcelButton.disable(); + exportExcelButton.setToolTip(msgs.exportExcelButtonToolTip()); + exportExcelButton.addSelectHandler(new SelectHandler() { + public void onSelect(SelectEvent event) { + eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_EXCEL)); + } + }); + exportLayout.setWidget(1, 0, exportExcelButton); + exportCSVButton = new TextButton(msgs.exportCSVButton(), TabularDataResources.INSTANCE.csv()); exportCSVButton.disable(); @@ -298,7 +308,7 @@ public class FileToolBar { eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_CSV)); } }); - exportLayout.setWidget(0, 2, exportCSVButton); + exportLayout.setWidget(0, 1, exportCSVButton); exportJSONButton = new TextButton(msgs.exportJSONButton(), TabularDataResources.INSTANCE.json()); @@ -310,7 +320,7 @@ public class FileToolBar { eventBus.fireEvent(new RibbonEvent(RibbonType.EXPORT_JSON)); } }); - exportLayout.setWidget(1, 2, exportJSONButton); + exportLayout.setWidget(1, 1, exportJSONButton); cleanCells(exportLayout.getElement()); // TimeLine (Tasks) @@ -559,6 +569,7 @@ public class FileToolBar { exportCSVButton.disable(); exportJSONButton.disable(); exportSDMXButton.disable(); + exportExcelButton.disable(); timelineButton.disable(); backgroundButton.enable(); historyButton.disable(); @@ -579,6 +590,7 @@ public class FileToolBar { exportCSVButton.disable(); exportJSONButton.disable(); exportSDMXButton.disable(); + exportExcelButton.disable(); timelineButton.disable(); backgroundButton.enable(); historyButton.disable(); @@ -609,6 +621,17 @@ public class FileToolBar { } else { exportSDMXButton.disable(); } + + if (trId != null + && trId.getTableTypeName() != null + && (trId + .getTableTypeName().compareTo( + TableType.DATASET.getTableTypeLabel()) == 0)) { + exportExcelButton.enable(); + } else { + exportExcelButton.disable(); + } + exportCSVButton.enable(); exportJSONButton.enable(); timelineButton.enable(); @@ -630,6 +653,7 @@ public class FileToolBar { exportCSVButton.disable(); exportJSONButton.disable(); exportSDMXButton.disable(); + exportExcelButton.disable(); timelineButton.disable(); backgroundButton.disable(); historyButton.disable(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.java index 3e0dd8e..9595622 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.java @@ -85,6 +85,12 @@ public interface FileToolBarMessages extends Messages { @DefaultMessage("Export SDMX document") String exportSDMXButtonToolTip(); + @DefaultMessage("EXCEL") + String exportExcelButton(); + + @DefaultMessage("Export Excel document") + String exportExcelButtonToolTip(); + @DefaultMessage("CSV") String exportCSVButton(); 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 c01a3d3..ec3315c 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 @@ -59,7 +59,9 @@ name='org.gcube.portlets.user.td.csvexportwidget.CSVExportWizardTD' /> - + + - + /> --> diff --git a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages.properties b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages.properties index c866748..878a31f 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages.properties @@ -9,9 +9,11 @@ noTabularResourcePresent = No tabular resource present! noCurrentTabularResourcePresent = No current tabular resource present! csvImport = CSV import sdmxImport = SDMX Import +excelImport = Excel Import csvExport = CSV Export jsonExport = JSON Export sdmxExport = SDMX Export +excelExport = Excel Export extractCodelist = Extract Codelist codelistMappingImport = Codelist Mapping Import union = Union @@ -25,3 +27,4 @@ attentionNotOwnerTemplateApply = In order to apply a template you must be the ow You are not the owner of this Tabular Resource! attentionNotOwnerRuleApply = In order to apply a rule you must be the owner of the Tabular Resource. \ You are not the owner of this Tabular Resource! + diff --git a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_es.properties index 492e26a..1534cc1 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_es.properties @@ -9,9 +9,11 @@ noTabularResourcePresent = Ningúna tabular resource present! noCurrentTabularResourcePresent = Tabular resource actual sin present! csvImport = Importaciòn CSV sdmxImport = Importaciòn SDMX +excelImport = Importaciòn EXCEL csvExport = Exportaciòn CSV jsonExport = Exportaciòn JSON sdmxExport = Exportaciòm SDMX +excelExport = Exportaciòm EXCEL extractCodelist = Extraer Codelist codelistMappingImport = Mapa Importaciòn union = Unión diff --git a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_it.properties index f43b467..c5ed695 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_it.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/TabularDataControllerMessages_it.properties @@ -9,9 +9,11 @@ noTabularResourcePresent = Nessuna tabular resource presente! noCurrentTabularResourcePresent = Tabular resource corrente non presente! csvImport = Importa CSV sdmxImport = Importa SDMX +excelImport = Importa EXCEL csvExport = Esporta CSV jsonExport = Esporta JSON sdmxExport = Esporta SDMX +excelExport = Esporta Excel extractCodelist = Estrai Codelist codelistMappingImport = Codelist Mapping Importa union = Unione diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/excel.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/excel.png new file mode 100644 index 0000000000000000000000000000000000000000..6c38dd495ae6202fbac247bcf9b94d7a382ebd93 GIT binary patch literal 485 zcmVos{gMRAYfAqZo~4bio(_-wib!wnmCGBG(v62!A22G z5B6T{zw&9m3&eO;uS|q`&Mg2*lw2qjLT!vj6{_qZFabhbWtuDyD)o6>tGN8~qxWNd z`vyP&SPAIm$ojk_C~Zd4A9dFP05D;-b+fvY<}v`#K?2<-0uLGp=!~@v;_8eT0_f#n zWaZ`l0e}T$$=LoBgJSW;{~K^6V*eIT?mqb^Q;XkP^hTfsHb0)6Ju7X_=r7$4p)vzD bfv>*-#PW5~i?`w@00000NkvXXu0mjft$4|F literal 0 HcmV?d00001 diff --git a/src/main/resources/org/gcube/portlets/user/td/client/resource/excel_32.png b/src/main/resources/org/gcube/portlets/user/td/client/resource/excel_32.png new file mode 100644 index 0000000000000000000000000000000000000000..61f061955e92e0dcb889b3bdf58131f82f7d37b2 GIT binary patch literal 788 zcmV+v1MB>WP)swn}E5J7Jan!BW9vU7D zwWu3J0ClS)hWmP)yLT?%zwzuCbb$-N`TZ0ajsV}zcy{n8`vC9d{v<@T1h4uWES_5; zA}}+2Coiu(yuI<}$&2-Fw>we^8!sc+e8LJt$*>}!By28W$xsq1gb=c_r%+!BB}0Xj zd%3fE@A_CJY`=8Y6U&6mN_!^5%#c+6ww7%JY|gM$j?KS!me(HK+URsT30MKn92fwr zR#QP(O2|M(1AyJ$uu=hJhRr4QdbzWD_uA9bTHXdO?eBqRHj*IJU`m8L6o$F*ULJTs z6-W{(6{LkSp8_zQ`W%}-fa4PZK)GUiK5UXknj$+90TR;gN)jF@S_3BmsEtKkbHl@DY{EU#5r9H7C`1!L?3HQb5Tb-QLV$ff zxc&niZM1hm$TT}Mmd_4Gep$lRDIZQpp0||jWMtm~UbX>daXcRtzks*EH-JCZfBPTU SB6ef|0000gvz3*36F&;crjma=_~c5*vS~+I4KUSYm+sL=cq;@${gxYF!XAE$m%8UzX+5ltLe`qU4exht_w{Q72Rai;#ba zor}|Sb+l0^6n=LhHihD(G91}lV8!fuwiTM$)H$2{+%}GF>1IKlvS)do)?`4gskvq( zbEauQ6)PkAH!P(zQKGq}1y#jJ+8o`|h39!RG&a`60A{3U)y6tK61MGN+YV6_)q-uu z!AYeEf&dZ0Fyhynf^;A6eM)r<|9u;&@?o@;{RKx?Abq`#+(Q5W002ovPDHLkV1nJ+ BP?P`w delta 1282 zcmV+d1^xP^2Gj~6iBL{Q4GJ0x0000DNk~Le0000O0000O2nGNE0N{5$_>mz&1_(H1 zd)`-(XeWOJuSrBfR7l6ImdkHdRTRd5YoEux=f1eKw53Jbw4i_pnou>08a0NXk)RQb z&UE0wfrqnxA(mEa&Rw~)0UBO zPgYLOI^X)%xA*?mk)5xOMZlzj75<;43V;FnU0{Fmttamq3_K^30c5LXpH)Gm6IB(- z#LKG@B|QE1cMC3H1J5Dw-41|?APR_r3J55QAgx;M9NKlW;M%4SAR@TS+7oF30HV?Y zR$0dKa*lQy(++5MxnvTg-Fhoouwp?46$_S5kq*ntaxDU0tgp$o)A>*YF+!49-ub4+ zsmXu8uP|>%V+>y&JIBXA93u*wizLd*P94 zO)paPEf|M|#4_KE`Rq)C6ZH}guZ4oIM5)DbT|CDjL3!=K1fL%LlPFxcB2k#8`o>pB zI5ZVW;8;@0k*HVl5lK3B}vm(fi=}453Mg@a8V#~4Aq>^_}LkrAODr@r5Of`73OS$ zD*{Q%Kv#uNj!!e&4A|0>qtO(MD1=Q$da8_sQ#g)k70CHHv-{Rfa__aPG^&3uAaR1D z%I~Q#m*n|iy275`X|D4V>Pbqql&9n>zf3#4SexaOb8}Pzh!abHcbUi6=h$}BR*W%M zPEk-Ov3GM-?%%c!PaIU0LgeC;GE;BzL4AN-!)3O0=W@{=dIWBYcVzIBj5 z7Dy6HBMs@w3wuWb?%94DD_3?cy2+h;kTtTPQ0B2)hI!z+Dxs8l@cMrq%Her-?AU?h zd8`{A=DGW}(id1px>oSSjomcrbM*A~E}L#{)~d6yP_D9P)M2o4ilU9!a>FRT?|0a( zS>3}kcM3;phv-{*4O=&Dy6WI@vu2kyDpjRWDslS_8xRpZ&s#jLjA3nmHv_%*;JWTr z9Jy7<)r^N*YgLwvq%2PBEVC9NgV&zr*4hqm7Q#g_VWKLMv?rl18+%t9iA!yH>1xIn si{gsV|Lpq*u7>&Fe_H^oQV)~-zuHSyloTRxG5`Po07*qoM6N<$g0}Q=umAu6 diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.properties index cf36fba..b297d81 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages.properties @@ -21,6 +21,8 @@ importJSONButtonToolTip = Import table from JSON source exportGroupHeadingText = Export exportSDMXButton = SDMX exportSDMXButtonToolTip = Export SDMX document +exportExcelButton = EXCEL +exportExcelButtonToolTip = Export Excel document exportCSVButton = CSV exportCSVButtonToolTip = Export CSV document exportJSONButton = JSON diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_es.properties index 3042afe..e4fa63d 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_es.properties @@ -21,6 +21,8 @@ importJSONButtonToolTip = Importar una tabla de una fuente JSON exportGroupHeadingText = Exportaciòn exportSDMXButton = SDMX exportSDMXButtonToolTip = Documento de exportaciòn como SDMX +exportExcelButton = EXCEL +exportExcelButtonToolTip = Documento de exportaciòn como EXCEL exportCSVButton = CSV exportCSVButtonToolTip = Documento de exportaciòn como CSV exportJSONButton = JSON diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_it.properties index 92b4d54..d3f2b62 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_it.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/FileToolBarMessages_it.properties @@ -21,6 +21,8 @@ importJSONButtonToolTip = Importa una tabella da una sorgente JSON exportGroupHeadingText = Esporta exportSDMXButton = SDMX exportSDMXButtonToolTip = Esporta come documento SDMX +exportExcelButton = EXCEL +exportExcelButtonToolTip = Esporta come documento EXCEL exportCSVButton = CSV exportCSVButtonToolTip = Esporta come documento CSV exportJSONButton = JSON 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 c01a3d3..c9f02dd 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 @@ -59,6 +59,9 @@ name='org.gcube.portlets.user.td.csvexportwidget.CSVExportWizardTD' /> + + @@ -106,15 +109,16 @@ - - + /> --> - +