From e4d7b8346c1bda1e53bcd25e6417666592c24625 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Fri, 12 Jul 2013 13:34:05 +0000 Subject: [PATCH] suuport for calendar events completed, testing phase inititated git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@79061 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/view/NotificationSettingsDialog.java | 6 +++--- .../view/templates/SingleNotificationView.java | 14 ++++++++++++-- .../templates/images/NotificationImages.java | 9 +++++++++ .../client/view/templates/images/calendar.png | Bin 0 -> 601 bytes .../view/templates/images/calendar_delete.png | Bin 0 -> 3457 bytes .../view/templates/images/calendar_edit.png | Bin 0 -> 646 bytes .../server/NotificationsServiceImpl.java | 3 ++- src/main/webapp/images/savedok.png | Bin 0 -> 4091 bytes 8 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/calendar.png create mode 100644 src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/calendar_delete.png create mode 100644 src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/calendar_edit.png create mode 100644 src/main/webapp/images/savedok.png diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationSettingsDialog.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationSettingsDialog.java index 101caeb..fb7095c 100644 --- a/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationSettingsDialog.java +++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/NotificationSettingsDialog.java @@ -127,7 +127,7 @@ public class NotificationSettingsDialog extends GCubeDialog { mainPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_MIDDLE); if (success) { setText("Notifications Settings Saved"); - mainPanel.add(new HTML("Notifications Settings correctly saved.")); + mainPanel.add(new HTML("Notifications Settings correctly saved.")); mainPanel.add(new Image(mailSentOK)); } else { @@ -143,8 +143,8 @@ public class NotificationSettingsDialog extends GCubeDialog { }); } Button close = new Button("Close"); - close.setSize("200px", "70px"); - close.getElement().getStyle().setFontSize(24, Unit.PX); + close.setSize("150px", "40px"); + close.getElement().getStyle().setFontSize(16, Unit.PX); close.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java index 6ef489d..2be8b24 100644 --- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java +++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java @@ -51,8 +51,7 @@ public class SingleNotificationView extends Composite { String removeMarkup = notificationToShow.replaceAll("&", "&"); String actualHTML = new HTML(removeMarkup).getText(); - - + //in case of links behave differently, i know is terrible //TODO: write better code here i think if (new HTML(actualHTML).getText().equalsIgnoreCase(LINK_TEXT)) { actualHTML = actualHTML.replace("your post:", ""); @@ -104,6 +103,11 @@ public class SingleNotificationView extends Composite { case WP_ITEM_UPDATED: goApp.setHTML(" Go to Folder."); break; + case CALENDAR_ADDED_EVENT: + case CALENDAR_UPDATED_EVENT: + case CALENDAR_DELETED_EVENT: + goApp.setHTML(" Go to Calendar."); + break; } } @@ -151,6 +155,12 @@ public class SingleNotificationView extends Composite { return images.workflowForward(); case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER: return images.workflowForwardComplete(); + case CALENDAR_ADDED_EVENT: + return images.calendar(); + case CALENDAR_UPDATED_EVENT: + return images.calendarEdit(); + case CALENDAR_DELETED_EVENT: + return images.calendarDelete(); default: return images.generic(); } diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java index 2115562..6106524 100644 --- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java +++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/NotificationImages.java @@ -16,6 +16,15 @@ public interface NotificationImages extends ClientBundle { @Source("mail.png") ImageResource message(); + @Source("calendar.png") + ImageResource calendar(); + + @Source("calendar_edit.png") + ImageResource calendarEdit(); + + @Source("calendar_delete.png") + ImageResource calendarDelete(); + @Source("share_blue.png") ImageResource share(); diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/calendar.png b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..a20f5fc31b1c501b853950681a89328243e925ac GIT binary patch literal 601 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 literal 0 HcmV?d00001 diff --git a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java index c20026c..882f347 100644 --- a/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/notifications/server/NotificationsServiceImpl.java @@ -131,7 +131,8 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No toReturn.put(dateWithoutTime, nots); } else { toReturn.get(dateWithoutTime).add(notification); - } + } + System.out.println(notification.getDescription()); } } catch (Exception e) { _log.error("While trying to get User notifications"); diff --git a/src/main/webapp/images/savedok.png b/src/main/webapp/images/savedok.png new file mode 100644 index 0000000000000000000000000000000000000000..a1b225d8973ddbd2a0a437cdcf00d0319ed08809 GIT binary patch literal 4091 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 s&X}UDV*0dd#p