diff --git a/pom.xml b/pom.xml
index 5b08023..2189f16 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
org.gcube.applicationsupportlayer
aslsocial
- 0.4.1-SNAPSHOT
+ 0.5.0-SNAPSHOT
jar
Social Portal ASL Extension
diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java
index bfa72ef..781177e 100644
--- a/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java
+++ b/src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java
@@ -80,7 +80,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
EmailPlugin.sendNotification(notification2Save, aslSession.getGroupName());
if (channels.isEmpty()) {
- _log.info("Notification was not needed as the user decided not to be notified");
+ _log.info("Notification was not needed as "+ notification2Save.getUserid() +" decided not to be notified for " + notification2Save.getType());
result = true;
}
return result;
@@ -590,10 +590,10 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
}
StringBuilder notificationText = new StringBuilder();
- notificationText.append("added the following event in the ").append(aslSession.getGroupName()).append(" shared calendar:
") // has done something
- .append("
Summary: ").append(eventTitle).append("
")
- .append("
Time: ").append(spf.format(startDate)).append(endDateToDisplay).append("
")
- .append("
Category: ").append(eventType);
+ notificationText.append("added the following event in the ").append(aslSession.getGroupName()).append(" shared calendar: ") // has done something
+ .append("").append(eventTitle).append("
")
+ .append("
Time: ").append(spf.format(startDate)).append(endDateToDisplay).append("
")
+ .append("
Category: ").append(eventType);
Notification not = new Notification(
UUID.randomUUID().toString(),
diff --git a/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java b/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
index 7ae9385..2b4ce20 100644
--- a/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
+++ b/src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
@@ -161,6 +161,12 @@ public class EmailPlugin {
return portalHost + " - " + vreName +": Done task notification";
case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
return portalHost + " - " + vreName +": Document workflow step completion notification";
+ case CALENDAR_ADDED_EVENT:
+ return portalHost + " - " + vreName +": New event in a shared calendar notification";
+ case CALENDAR_UPDATED_EVENT:
+ return portalHost + " - " + vreName +": Edited event in a shared calendar notification";
+ case CALENDAR_DELETED_EVENT:
+ return portalHost + " - " + vreName +": Deleted in a shared calendar notification";
default:
return "You have a new Notification";
}