From b80a767da07e3b20b7a3ad661d0899df7d1815da Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 24 Sep 2020 16:55:40 +0200 Subject: [PATCH] updated table already creates users --- .settings/org.eclipse.wst.common.component | 3 - pom.xml | 2 +- .../client/HandleUsersService.java | 2 +- .../client/HandleUsersServiceAsync.java | 2 +- .../client/ui/RegisteredUsersTable.java | 63 +------------------ .../createusers/server/CreateUsersImpl.java | 14 +++-- 6 files changed, 14 insertions(+), 72 deletions(-) diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 63a79ce..91eebdc 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -4,9 +4,6 @@ - - uses - diff --git a/pom.xml b/pom.xml index 04f03a5..404124a 100644 --- a/pom.xml +++ b/pom.xml @@ -84,7 +84,7 @@ org.gcube.portal.mailing email-templates-library - [1.0.0-SNAPSHOT,) + [1.4.3-SNAPSHOT,) org.gcube.dvos diff --git a/src/main/java/org/gcube/portlets/admin/createusers/client/HandleUsersService.java b/src/main/java/org/gcube/portlets/admin/createusers/client/HandleUsersService.java index c2d4bb4..d5e2ea5 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/client/HandleUsersService.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/client/HandleUsersService.java @@ -40,6 +40,6 @@ public interface HandleUsersService extends RemoteService { * Send the registration email to this user * @param email */ - public void sendEmailToUser(String email); + public void sendEmailToUser(String email, String name); } diff --git a/src/main/java/org/gcube/portlets/admin/createusers/client/HandleUsersServiceAsync.java b/src/main/java/org/gcube/portlets/admin/createusers/client/HandleUsersServiceAsync.java index b8896cb..707dd36 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/client/HandleUsersServiceAsync.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/client/HandleUsersServiceAsync.java @@ -19,5 +19,5 @@ public interface HandleUsersServiceAsync { void deleteInvitedUser(String email, AsyncCallback callback); - void sendEmailToUser(String email, AsyncCallback callback); + void sendEmailToUser(String email, String name, AsyncCallback callback); } diff --git a/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java b/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java index e30e7d7..de4b72c 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/client/ui/RegisteredUsersTable.java @@ -120,50 +120,6 @@ public class RegisteredUsersTable extends Composite { surnameCol.setDefaultSortAscending(false); table.addColumnSortHandler(surnameColHandler); - // institution/organization and handler for sorting - Column institutionCol = getColumn(new TextCell(), new GetValue() { - @Override - public String getValue(VreUserBean user) { - return user.getInstitution(); - } - }); - - ListHandler institutionColHandler = new ListHandler(dataProvider.getList()); - institutionColHandler.setComparator(institutionCol, new Comparator() { - @Override - public int compare(VreUserBean o1, VreUserBean o2) { - - return o1.getInstitution().compareTo(o2.getInstitution()); - - } - }); - institutionCol.setSortable(true); - institutionCol.setDefaultSortAscending(false); - table.addColumnSortHandler(institutionColHandler); - - // password and handler for sorting - Column passwordChanged = getColumn(new TextCell(), new GetValue() { - @Override - public String getValue(VreUserBean user) { - return (user.isPasswordChanged() ? "True" : "False"); - } - }); - - ListHandler passwordChangedColHandler = new ListHandler(dataProvider.getList()); - passwordChangedColHandler.setComparator(passwordChanged, new Comparator() { - @Override - public int compare(VreUserBean o1, VreUserBean o2) { - - String o1PasswordChangedString = o1.isPasswordChanged() ? "True" : "False"; - String o2PasswordChangedString = o2.isPasswordChanged() ? "True" : "False"; - return o1PasswordChangedString.compareTo(o2PasswordChangedString); - - } - }); - passwordChanged.setSortable(true); - passwordChanged.setDefaultSortAscending(false); - table.addColumnSortHandler(passwordChangedColHandler); - // registration column plus handler for sorting Column registrationDate = getColumn(new TextCell(), new GetValue() { @Override @@ -292,7 +248,7 @@ public class RegisteredUsersTable extends Composite { // get the button and disable it parent.getFirstChildElement().setPropertyBoolean("disabled", true); - userServices.sendEmailToUser(user.getEmail(), new AsyncCallback() { + userServices.sendEmailToUser(user.getEmail(), user.getName() + " " + user.getSurname(), new AsyncCallback() { @Override public void onSuccess(Void result) { @@ -336,27 +292,12 @@ public class RegisteredUsersTable extends Composite { builder.appendHtmlConstant(""); table.addColumn(surnameCol, builder.toSafeHtml()); builder = new SafeHtmlBuilder(); - builder.appendHtmlConstant(""); - builder.appendEscaped("Institution / Organisation"); - builder.appendHtmlConstant(""); - table.addColumn(institutionCol, builder.toSafeHtml()); - builder = new SafeHtmlBuilder(); - builder.appendHtmlConstant(""); - builder.appendEscaped("Password Changed"); - builder.appendHtmlConstant(""); - table.addColumn(passwordChanged, builder.toSafeHtml()); - builder = new SafeHtmlBuilder(); builder.appendHtmlConstant(""); builder.appendEscaped("Registration date"); builder.appendHtmlConstant(""); table.addColumn(registrationDate, builder.toSafeHtml()); builder = new SafeHtmlBuilder(); - builder.appendHtmlConstant(""); - builder.appendEscaped("Delete"); - builder.appendHtmlConstant(""); - table.addColumn(deleteUser, builder.toSafeHtml()); - builder = new SafeHtmlBuilder(); - builder.appendHtmlConstant(""); + builder.appendHtmlConstant(""); builder.appendEscaped("Send Welcome"); builder.appendHtmlConstant(""); table.addColumn(sendWelcomeMessage, builder.toSafeHtml()); diff --git a/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java b/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java index 7da3d30..c8ca15e 100644 --- a/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java +++ b/src/main/java/org/gcube/portlets/admin/createusers/server/CreateUsersImpl.java @@ -163,7 +163,7 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers } @Override - public void sendEmailToUser(String email) { + public void sendEmailToUser(String email, String nameCreatedUser) { if(isWithinPortal()){ try{ logger.debug("Sending welcome message to user with email " + email); @@ -172,14 +172,18 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers String gatewayURL = context.getGatewayURL(getThreadLocalRequest()); long groupId = context.getCurrentGroupId(getThreadLocalRequest()); GCubeGroup currVRE = new LiferayGroupManager().getGroup(groupId); - UserManager um = new LiferayUserManager(); - GCubeUser theCreatedAccountUser = um.getUserByEmail(email); + GCubeUser theManagerUser =context.getCurrentUser(getThreadLocalRequest()); String subject = "Your user account for " + currVRE.getGroupName() + " VRE has been created"; EmailTemplateService.send( subject, - new TemplateWelcomeCreatedAccount(gatewayName, gatewayURL, theCreatedAccountUser, theManagerUser, currVRE), getThreadLocalRequest(), new Recipient(email)); + new TemplateWelcomeCreatedAccount( + gatewayName, + gatewayURL, + email, + nameCreatedUser, + theManagerUser, currVRE), getThreadLocalRequest(), new Recipient(email)); }catch(Exception e){ logger.error("Error while sending email to user " + email, e); @@ -244,7 +248,7 @@ public class CreateUsersImpl extends RemoteServiceServlet implements HandleUsers new CreateUserAddToVrePublisher().publish( CreateUserAddToVre.newEvent(name, surname, email, INITIAL_PWD, theVRE)); if (sendEmail) - sendEmailToUser(email); + sendEmailToUser(email, name + " " + surname); }catch(Exception e){ // unable to create.. we need to delete it from the list of users