gCubeSystem
/
aslsocial
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suuport for calendar events completed, testing phase inititated 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerSocial@79064 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2013-07-12 13:37:32 +00:00
parent bc56343b1c
commit db7b98657d
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -10,7 +10,7 @@
<groupId>org.gcube.applicationsupportlayer</groupId>
<artifactId>aslsocial</artifactId>
<version>0.4.1-SNAPSHOT</version>
<version>0.5.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Social Portal ASL Extension</name>
<description>

10
src/main/java/org/gcube/applicationsupportlayer/social/ApplicationNotificationsManager.java
View File

@ -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 <b>").append(aslSession.getGroupName()).append("</b> shared calendar: <br />") // has done something
.append("<br /><b>Summary:</b> ").append(eventTitle).append("<br />")
.append("<br /><b>Time:</b> ").append(spf.format(startDate)).append(endDateToDisplay).append("<br />")
.append("<br /><b>Category:</b> ").append(eventType);
notificationText.append("added the following event in the <b>").append(aslSession.getGroupName()).append("</b> shared calendar: ") // has done something
.append("<strong>").append(eventTitle).append("</strong><br />")
.append("<br /><strong> Time:</strong> ").append(spf.format(startDate)).append(endDateToDisplay).append("<br />")
.append("<br /><strong> Category: </strong> ").append(eventType);
Notification not = new Notification(
UUID.randomUUID().toString(),

6
src/main/java/org/gcube/applicationsupportlayer/social/mailing/EmailPlugin.java
View File

@ -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";
}