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

notifications all done hopefully 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerSocial@68617 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2013-01-31 15:58:54 +00:00
parent 655745e344
commit 2e619a7f9a
2 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,8 +393,8 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
documentWorkflowId, //the workflowid documentWorkflowId, //the workflowid
new Date(), new Date(),
getApplicationUrl()+"?oid="+documentWorkflowId, getApplicationUrl()+"?oid="+documentWorkflowId,
"has performed the last needed forward on a Document Workflow titled: " + escapeHtml(documentName) + " in . " + aslSession.getGroupName() + "." + "has performed the last needed forward on a Document Workflow titled: " + escapeHtml(documentName) + ". " +
"Step \"" + fromStepName + "\" is now complete. The next step is \"" + toStepName +"\". On " + aslSession.getGroupName() + " Virtual Research Environment. ", "Step \"" + fromStepName + "\" is now complete. The next step is \"" + toStepName +"\". In " + aslSession.getGroupName(),
false, false,
aslSession.getUsername(), aslSession.getUsername(),
aslSession.getUserFullName(), aslSession.getUserFullName(),
@ -408,7 +408,7 @@ public class ApplicationNotificationsManager extends SocialPortalBridge implemen
@Override @Override
public boolean notifyDocumentWorkflowFirstStepRequest(String userIdToNotify, String documentWorkflowId, String documentName, String assignedRole) { public boolean notifyDocumentWorkflowFirstStepRequest(String userIdToNotify, String documentWorkflowId, String documentName, String assignedRole) {
String notificationText = "involved you in the Document Workflow titled: " + escapeHtml(documentName) + ". " + String notificationText = "involved you in the Document Workflow titled: " + escapeHtml(documentName) + ". " +
"You are requested to perform a task. Your role is: " + assignedRole+"."; "You are requested to perform a task. Your role is: " + assignedRole+"";
Notification not = new Notification( Notification not = new Notification(
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
NotificationType.DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT, NotificationType.DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT,

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

@ -36,6 +36,9 @@ public class EmailPlugin {
String sender = notification2Save.getSenderFullName(); String sender = notification2Save.getSenderFullName();
if (notification2Save.getType() == NotificationType.DOCUMENT_WORKFLOW_STEP_REQUEST_TASK) if (notification2Save.getType() == NotificationType.DOCUMENT_WORKFLOW_STEP_REQUEST_TASK)
sender = ""; sender = "";
String portalHost = portalURL.replaceAll("https://", "");
portalHost = portalHost.replaceAll("http://", "");
StringBuilder body = new StringBuilder(); StringBuilder body = new StringBuilder();
@ -43,11 +46,13 @@ public class EmailPlugin {
.append("<p>").append(sender).append(" ").append(removedMarkup) // has done something .append("<p>").append(sender).append(" ").append(removedMarkup) // has done something
.append(getActionLink(notification2Save, portalURL)).append("</p>") //Goto .append(getActionLink(notification2Save, portalURL)).append("</p>") //Goto
.append("<br />") .append("<br />")
.append("<p><div style=\"color:#999999; font-size:11px; font-family:'lucida grande',tahoma,verdana,arial,sans-serif; padding-top:30px;\">") .append("<p><div style=\"color:#999999; font-size:11px; font-family:'lucida grande',tahoma,verdana,arial,sans-serif; padding-top:20px;\">")
.append("This message was sent to <a href=\"mailto:") .append("This message was sent to <a href=\"mailto:")
.append(email).append("\" style=\"color:#3B5998;text-decoration:none\" target=\"_blank\">").append(email).append("</a> by ") .append(email)
.append(portalURL).append(".") .append("\" style=\"color:#3B5998;text-decoration:none\" target=\"_blank\">").append(email).append("</a> by ")
.append("If you don't want to receive these emails in the future, please <a href=\"") .append("<a href=\"").append(portalURL).append("\" style=\"color:#3B5998;text-decoration:none\" target=\"_blank\">").append(portalHost)
.append("</a>. ")
.append(" If you don't want to receive these emails in the future, please <a href=\"")
.append(portalURL).append("/group/data-e-infrastructure-gateway/notifications\" style=\"color:#3b5998;text-decoration:none\" target=\"_blank\">unsubscribe</a>.") .append(portalURL).append("/group/data-e-infrastructure-gateway/notifications\" style=\"color:#3b5998;text-decoration:none\" target=\"_blank\">unsubscribe</a>.")
.append("</div></p>") .append("</div></p>")
.append("<p><div style=\"color:#999999; font-size:10px; font-family:'lucida grande',tahoma,verdana,arial,sans-serif; padding-top:15px;\">") .append("<p><div style=\"color:#999999; font-size:10px; font-family:'lucida grande',tahoma,verdana,arial,sans-serif; padding-top:15px;\">")
@ -170,67 +175,67 @@ public class EmailPlugin {
switch (notification2Save.getType()) { switch (notification2Save.getType()) {
case LIKE: case LIKE:
actionLink.append("\">").append("See the Post").append("</a>"); actionLink.append("\">.").append(" See the Post").append("</a>");
break; break;
case COMMENT: case COMMENT:
actionLink.append("\">").append("See the Post").append("</a>"); actionLink.append("\">.").append(" See the Post").append("</a>");
break; break;
case MESSAGE: case MESSAGE:
actionLink.append("\">").append("Go to Message").append("</a>"); actionLink.append("\">.").append(" Go to Message").append("</a>");
break; break;
case WP_FOLDER_ADDEDUSER: case WP_FOLDER_ADDEDUSER:
actionLink.append("\">").append("Go to Folder").append("</a>"); actionLink.append("\">.").append(" Go to Folder").append("</a>");
break; break;
case WP_FOLDER_REMOVEDUSER: case WP_FOLDER_REMOVEDUSER:
actionLink.append("\">").append("Go to Folder").append("</a>"); actionLink.append("\">.").append(" Go to Folder").append("</a>");
break; break;
case WP_FOLDER_SHARE: case WP_FOLDER_SHARE:
actionLink.append("\">").append("Go to Folder").append("</a>"); actionLink.append("\">.").append(" Go to Folder").append("</a>");
break; break;
case WP_ITEM_NEW: case WP_ITEM_NEW:
actionLink.append("\">").append("Go to Folder").append("</a>"); actionLink.append("\">.").append(" Go to Folder").append("</a>");
break; break;
case WP_ITEM_DELETE: case WP_ITEM_DELETE:
actionLink.append("\">").append("Go to Folder").append("</a>"); actionLink.append("\">.").append(" Go to Folder").append("</a>");
break; break;
case WP_ITEM_UPDATED: case WP_ITEM_UPDATED:
actionLink.append("\">").append("Go to Folder").append("</a>"); actionLink.append("\">.").append(" Go to Folder").append("</a>");
break; break;
case OWN_COMMENT: case OWN_COMMENT:
actionLink.append("\">").append("See the Post").append("</a>"); actionLink.append("\">.").append(" See the Post").append("</a>");
break; break;
case REQUEST_CONNECTION: case REQUEST_CONNECTION:
actionLink.append("\">").append("Go to Contacts Center").append("</a>"); actionLink.append("\">.").append(" Go to Contacts Center").append("</a>");
break; break;
case JOB_COMPLETED_NOK: case JOB_COMPLETED_NOK:
actionLink.append("\">").append("Go to Application").append("</a>"); actionLink.append("\">.").append(" Go to Application").append("</a>");
break; break;
case JOB_COMPLETED_OK: case JOB_COMPLETED_OK:
actionLink.append("\">").append("Go to Application").append("</a>"); actionLink.append("\">.").append(" Go to Application").append("</a>");
break; break;
case DOCUMENT_WORKFLOW_EDIT: case DOCUMENT_WORKFLOW_EDIT:
actionLink.append("\">").append("Go to Document Workflow Manager").append("</a>"); actionLink.append("\">.").append(" Go to Document Workflow Manager").append("</a>");
break; break;
case DOCUMENT_WORKFLOW_VIEW: case DOCUMENT_WORKFLOW_VIEW:
actionLink.append("\">").append("Go to Document Workflow Manager").append("</a>"); actionLink.append("\">.").append(" Go to Document Workflow Manager").append("</a>");
break; break;
case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK: case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK:
actionLink.append("\">").append("Go to Your Document Workflows").append("</a>"); actionLink.append("\">.").append(" Go to Your Document Workflows").append("</a>");
break; break;
case DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT: case DOCUMENT_WORKFLOW_FIRST_STEP_REQUEST_INVOLVMENT:
actionLink.append("\">").append("Go to Your Document Workflows").append("</a>"); actionLink.append("\">.").append(" Go to Your Document Workflows").append("</a>");
break; break;
case DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER: case DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER:
actionLink.append("\">").append("Go to Document Workflow Manager").append("</a>"); actionLink.append("\">.").append(" Go to Document Workflow Manager").append("</a>");
break; break;
case DOCUMENT_WORKFLOW_STEP_FORWARD_PEER: case DOCUMENT_WORKFLOW_STEP_FORWARD_PEER:
actionLink.append("\">").append("Go to Document Workflow Manager").append("</a>"); actionLink.append("\">.").append(" Go to Document Workflow Manager").append("</a>");
break; break;
case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER: case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER:
actionLink.append("\">").append("Go to Document Workflow Manager").append("</a>"); actionLink.append("\">.").append(" Go to Document Workflow Manager").append("</a>");
break; break;
default: default:
actionLink.append("\">").append("").append("</a>"); actionLink.append("\">.").append("").append("</a>");
break; break;
} }