From aab54e17e99874e8b708afcb92aae7f7a98b1610 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 11 Jun 2015 16:48:37 +0000 Subject: [PATCH] Added Creation Date to Template git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@115337 82a268e6-3cf1-43bd-a215-b396298e98cf --- pom.xml | 23 ++++++++++++++----- .../portlets/user/td/client/Constants.java | 22 ------------------ .../user/td/client/TabularDataController.java | 13 ++++++----- .../client/template/TemplateApplyDialog.java | 2 +- .../client/template/TemplateApplyPanel.java | 7 +++++- .../template/TemplateDataProperties.java | 1 + .../client/template/TemplateDeleteDialog.java | 2 +- .../client/template/TemplateDeletePanel.java | 9 ++++++-- .../client/template/TemplateOpenDialog.java | 2 +- .../td/client/template/TemplateOpenPanel.java | 8 +++++-- .../client/template/TemplateShareDialog.java | 2 +- .../client/template/TemplateSharePanel.java | 6 ++++- 12 files changed, 53 insertions(+), 44 deletions(-) delete mode 100644 src/main/java/org/gcube/portlets/user/td/client/Constants.java diff --git a/pom.xml b/pom.xml index e5cf40d..c316826 100644 --- a/pom.xml +++ b/pom.xml @@ -144,11 +144,7 @@ - - org.gcube.applicationsupportlayer - aslsocial - - + org.gcube.core @@ -171,7 +167,22 @@ org.gcube.applicationsupportlayer accesslogger - + + + + + org.gcube.portal + social-networking-library + provided + + + + org.gcube.applicationsupportlayer + aslsocial + provided + + + org.gcube.portlets.user gcube-widgets diff --git a/src/main/java/org/gcube/portlets/user/td/client/Constants.java b/src/main/java/org/gcube/portlets/user/td/client/Constants.java deleted file mode 100644 index 71ce7cd..0000000 --- a/src/main/java/org/gcube/portlets/user/td/client/Constants.java +++ /dev/null @@ -1,22 +0,0 @@ -/** - * - */ -package org.gcube.portlets.user.td.client; - - -/** - * - * @author "Giancarlo Panichi" - * g.panichi@isti.cnr.it - * - * Constants for portlet - * - */ -public class Constants { - - - public static final String TDX_DATASOURCE_FACTORY_ID = "TDXDataSourceFactory"; - - public static final String APPLICATION_ID = "org.gcube.portlets.user.td.server.portlet.TabularDataPortlet"; - -} 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 ee8e74b..c989c8a 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 @@ -69,6 +69,7 @@ import org.gcube.portlets.user.td.widgetcommonevent.client.type.TaskType; import org.gcube.portlets.user.td.widgetcommonevent.client.type.UIStateType; import org.gcube.portlets.user.td.widgetcommonevent.client.type.WidgetRequestType; import org.gcube.portlets.user.td.widgetcommonevent.shared.CellData; +import org.gcube.portlets.user.td.widgetcommonevent.shared.Constants; import org.gcube.portlets.user.td.widgetcommonevent.shared.GridHeaderOperationId; import org.gcube.portlets.user.td.widgetcommonevent.shared.GridOperationId; import org.gcube.portlets.user.td.widgetcommonevent.shared.RequestProperties; @@ -107,7 +108,7 @@ import com.sencha.gxt.widget.core.client.event.DialogHideEvent.DialogHideHandler */ public class TabularDataController { - private static final String TD_LANG_COOKIE = "TDLangCookie"; + private SimpleEventBus eventBus; private MainBoxPanel mainBoxPanel; private UIStateType uiState = UIStateType.START; @@ -360,7 +361,7 @@ public class TabularDataController { String currentLocaleCookie = Cookies.getCookie(LocaleInfo .getLocaleCookieName()); - Log.debug(TD_LANG_COOKIE + ":" + currentLocaleCookie); + Log.debug(Constants.TD_LANG_COOKIE + ":" + currentLocaleCookie); LocaleInfo currentLocaleInfo = LocaleInfo.getCurrentLocale(); Log.debug("Current Locale:" + currentLocaleInfo.getLocaleName()); @@ -372,11 +373,11 @@ public class TabularDataController { long nowLong = now.getTime(); nowLong = nowLong + (1000 * 60 * 60 * 24 * 21); now.setTime(nowLong); - String cookieLang = Cookies.getCookie(TD_LANG_COOKIE); + String cookieLang = Cookies.getCookie(Constants.TD_LANG_COOKIE); if (cookieLang != null) { - Cookies.removeCookie(TD_LANG_COOKIE); + Cookies.removeCookie(Constants.TD_LANG_COOKIE); } - Cookies.setCookie(TD_LANG_COOKIE, localeName, now); + Cookies.setCookie(Constants.TD_LANG_COOKIE, localeName, now); com.google.gwt.user.client.Window.Location.reload(); } @@ -385,7 +386,7 @@ public class TabularDataController { checkLocale(); String value = com.google.gwt.user.client.Window.Location - .getParameter("TabularResourceId"); + .getParameter(Constants.TABULAR_RESOURCE_ID); TRId startTRId = new TRId(value); TDGWTServiceAsync.INSTANCE.restoreUISession(startTRId, diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyDialog.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyDialog.java index 25397d2..c57fec1 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyDialog.java @@ -32,7 +32,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; */ public class TemplateApplyDialog extends Window implements MonitorDialogListener { - private static final String WIDTH = "720px"; + private static final String WIDTH = "800px"; private static final String HEIGHT = "530px"; private EventBus eventBus; diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java index 66f348b..08c7ac3 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java @@ -61,7 +61,7 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; * */ public class TemplateApplyPanel extends FramedPanel { - private static final String WIDTH = "630px"; + private static final String WIDTH = "790px"; private static final String HEIGHT = "520px"; private EventBus eventBus; private TemplateApplyDialog parent; @@ -121,13 +121,18 @@ public class TemplateApplyPanel extends FramedPanel { ColumnConfig descriptionCol = new ColumnConfig( props.description(), 120, "Description"); + + ColumnConfig creationDateCol = new ColumnConfig( + props.creationDate(), 56, "Creation Date"); + List> l = new ArrayList>(); l.add(nameCol); l.add(categoryCol); l.add(ownerCol); l.add(agencyCol); l.add(descriptionCol); + l.add(creationDateCol); ColumnModel cm = new ColumnModel(l); diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDataProperties.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDataProperties.java index acc04b5..d29a49c 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDataProperties.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDataProperties.java @@ -25,6 +25,7 @@ public interface TemplateDataProperties extends PropertyAccess { ValueProvider ownerLogin(); ValueProvider agency(); ValueProvider description(); + ValueProvider creationDate(); diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeleteDialog.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeleteDialog.java index e917f75..a49304f 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeleteDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeleteDialog.java @@ -23,7 +23,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; * */ public class TemplateDeleteDialog extends Window { - private static final String WIDTH = "720px"; + private static final String WIDTH = "800px"; private static final String HEIGHT = "530px"; private EventBus eventBus; diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java index e554dc5..ef7725c 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java @@ -54,7 +54,7 @@ import com.sencha.gxt.widget.core.client.toolbar.LabelToolItem; import com.sencha.gxt.widget.core.client.toolbar.ToolBar; public class TemplateDeletePanel extends FramedPanel { - private static final String WIDTH = "630px"; + private static final String WIDTH = "790px"; private static final String HEIGHT = "520px"; private EventBus eventBus; private TemplateDeleteDialog parent; @@ -111,14 +111,19 @@ public class TemplateDeletePanel extends FramedPanel { ColumnConfig descriptionCol = new ColumnConfig( props.description(), 120, "Description"); + + ColumnConfig creationDateCol = new ColumnConfig( + props.creationDate(), 56, "Creation Date"); + List> l = new ArrayList>(); l.add(nameCol); l.add(categoryCol); l.add(ownerCol); l.add(agencyCol); l.add(descriptionCol); - + l.add(creationDateCol); + ColumnModel cm = new ColumnModel(l); store = new ExtendedListStore(props.id()); diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java index fb8b2bd..2cc6fe2 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java @@ -17,7 +17,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; * */ public class TemplateOpenDialog extends Window { - private static final String WIDTH = "720px"; + private static final String WIDTH = "800px"; private static final String HEIGHT = "530px"; private EventBus eventBus; diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java index 93e4b13..425c62e 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java @@ -59,7 +59,7 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; * */ public class TemplateOpenPanel extends FramedPanel { - private static final String WIDTH = "630px"; + private static final String WIDTH = "790px"; private static final String HEIGHT = "520px"; private EventBus eventBus; @@ -117,13 +117,17 @@ public class TemplateOpenPanel extends FramedPanel { ColumnConfig descriptionCol = new ColumnConfig( props.description(), 120, "Description"); - + + ColumnConfig creationDateCol = new ColumnConfig( + props.creationDate(), 56, "Creation Date"); + List> l = new ArrayList>(); l.add(nameCol); l.add(categoryCol); l.add(ownerCol); l.add(agencyCol); l.add(descriptionCol); + l.add(creationDateCol); ColumnModel cm = new ColumnModel(l); diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateShareDialog.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateShareDialog.java index 4b945c4..693477a 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateShareDialog.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateShareDialog.java @@ -17,7 +17,7 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; * */ public class TemplateShareDialog extends Window { - private static final String WIDTH = "720px"; + private static final String WIDTH = "800px"; private static final String HEIGHT = "530px"; private EventBus eventBus; diff --git a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java index e9c75a2..b4b6945 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java +++ b/src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java @@ -59,7 +59,7 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar; * */ public class TemplateSharePanel extends FramedPanel { - private static final String WIDTH = "630px"; + private static final String WIDTH = "790px"; private static final String HEIGHT = "520px"; private EventBus eventBus; private TemplateShareDialog parent; @@ -115,6 +115,9 @@ public class TemplateSharePanel extends FramedPanel { ColumnConfig descriptionCol = new ColumnConfig( props.description(), 120, "Description"); + + ColumnConfig creationDateCol = new ColumnConfig( + props.creationDate(), 56, "Creation Date"); List> l = new ArrayList>(); l.add(nameCol); @@ -122,6 +125,7 @@ public class TemplateSharePanel extends FramedPanel { l.add(ownerCol); l.add(agencyCol); l.add(descriptionCol); + l.add(creationDateCol); ColumnModel cm = new ColumnModel(l);