From e3bc385ab8fc50c078738a99a50c3437bd0746f1 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Tue, 29 Jan 2013 17:51:54 +0000 Subject: [PATCH] added handling of notification type forward complete git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@68533 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 10 +++++----- .../view/templates/SingleNotificationView.java | 11 ++++++++--- .../templates/images/NotificationImages.java | 3 +++ .../images/workflow-forward-complete.jpg | Bin 0 -> 1508 bytes .../server/NotificationsServiceImpl.java | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/workflow-forward-complete.jpg diff --git a/.classpath b/.classpath index e003a06..030fc28 100644 --- a/.classpath +++ b/.classpath @@ -20,16 +20,16 @@ + + + + + - - - - - 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 9b5fb6c..eb48354 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 @@ -70,10 +70,13 @@ public class SingleNotificationView extends Composite { goApp.setHTML(" See this Document Workflow."); break; case DOCUMENT_WORKFLOW_VIEW: - goApp.setHTML(" See User Activity."); + goApp.setHTML(" See Users Activity."); break; case DOCUMENT_WORKFLOW_EDIT: - goApp.setHTML(" See User Activity."); + goApp.setHTML(" See Users Activity."); + break; + case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER: + goApp.setHTML(" See Users Activity."); break; } } @@ -112,10 +115,12 @@ public class SingleNotificationView extends Composite { return images.documentWorkflow(); case DOCUMENT_WORKFLOW_STEP_REQUEST_TASK: return images.documentWorkflow(); - case DOCUMENT_WORKFLOW_STEP_FORWARD_OWNER: + case DOCUMENT_WORKFLOW_USER_FORWARD_TO_OWNER: return images.workflowForward(); case DOCUMENT_WORKFLOW_STEP_FORWARD_PEER: return images.workflowForward(); + case DOCUMENT_WORKFLOW_FORWARD_STEP_COMPLETED_OWNER: + return images.workflowForwardComplete(); 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 0f19eac..796848d 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 @@ -31,6 +31,9 @@ public interface NotificationImages extends ClientBundle { @Source("workflow-forward.png") ImageResource workflowForward(); + @Source("workflow-forward-complete.jpg") + ImageResource workflowForwardComplete(); + @Source("notification-generic.png") ImageResource generic(); } diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/workflow-forward-complete.jpg b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/images/workflow-forward-complete.jpg new file mode 100644 index 0000000000000000000000000000000000000000..f5a16de8ac62c7188e2344d14e07c4ef94ba7e44 GIT binary patch literal 1508 zcmex=+4R@c$vRc1B4_ft9{~ zUa?+cN`6wRUUGh}ennz|zM-ChK7);YML}Y6c4~=2Qfhi;o~_dR-TRdkGE;1o!cBb* zd<&dYGcrA@ic*8C{6dnevXd=Slx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr>m4GgVcp_+a(EzE+-j#U+V($*G<$wn{(~^fEJ3tSk)NoSltKOwEi; z-3$#~jV#?z*Q}aq-dQ%X3&2Z`kC57Aqpv^9+MVV!( zDQ-pixe8z}TV>*Qi!n~~pn6kqyTt^jUVWfr^g$7e6wxptVCn%e;mH=rfhYXbJYZ@s z0w(MK?-=;NiIpMc05JP7{=d!8!oUOv%s>`13y@@HVPydURyI~JU}Ixv=U``N1f_T&JXC#f-v0v(f*cG23yh$iR#u#K6qTCcwbN4DtkAhKZSxg;j`6kX=!PL6k#~ z0pviSw_q9>1(}!?Sy&kyg#r_e43(Ue7anB$e~W>KnGt9?vmk>#!{v7`|H|*aYQCHK zX6MZ4rKP9Ev_w}Q`LVI?Xf)rd(A7JIZgBIYmU(Ce#ECOq6S@*mKY6-j=b|aA9XdpU zvL3DI^`FWseECk`)+@fxzf2E^*_oWNJ@fI&BcF<=Z0{DVebUtX_)%YBw!dz8`rhhy z+jnjH^`JERbZY7&AX!Zc3A1nK$YcdQYUjy;%8AZ&~19=vSZ$#_^mzp zmt9T#Uhn#H@x5Nr+tWrCGqx=iS>W|E=Q%U&7Z`&;9*-S8S=_P2Gi$dNY!r zW^H)Nwdl$fvEDM13YJd_Pi@$rKe92NET6B^bgUl~GW_zXz+nG&oS}?a) z`(lRnjg08zwe?=pcW+wHdOhRIiEC$S-apIWOH-{WE%^QAO_J5uwvBHjG7ei9pOlc1 zT2R4MJv*j(6Ys>nUl|L_?iAk5j`g|scr*VQql_iq2~mqDGO|y2_`-8-b=Rf&|8D{S DK@QpO 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 508cc1c..9ce5d6f 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 @@ -59,7 +59,7 @@ public class NotificationsServiceImpl extends RemoteServiceServlet implements No String user = (String) this.getThreadLocalRequest().getSession().getAttribute(ScopeHelper.USERNAME_ATTRIBUTE); if (user == null) { //user = "test.user"; - user = "pasquale.pagano"; + user = "luca.frosini"; _log.warn("USER IS NULL setting "+user+" and Running OUTSIDE PORTAL"); withinPortal = false;